kune-commits

Download

[email protected]

May 2011

2 participants
62 discussions

r1365 - in intro: . war/kuneintro
by Vicente J. Ruiz Jurado 09 May '11

09 May '11

Author: vjrj_ Date: 2011-05-09 15:50:42 +0200 (Mon, 09 May 2011) New Revision: 1365 Added: intro/war/kuneintro/041E0FBF6E2C7F2A5D2226A56B7A2BB5.cache.html intro/war/kuneintro/0B007C778586361861C873794CDF4988.cache.html intro/war/kuneintro/7B389F164AD22DCB88BFA05BCD2FDDDC.cache.html intro/war/kuneintro/807CA58765E639ABAD8AA3A1FE4820F6.cache.html intro/war/kuneintro/A88FCD2648ED9C395A167155D310779A.cache.html Modified: intro/fabfile.py Log: Modified: intro/fabfile.py =================================================================== --- intro/fabfile.py 2011-05-09 13:49:58 UTC (rev 1364) +++ intro/fabfile.py 2011-05-09 13:50:42 UTC (rev 1365) @@ -1,7 +1,7 @@ from fabric.api import * env.hosts = ['scm.ourproject.org'] -kune_path = '/home/groups/kune/htdocs/intro/' +kune_path = '/home/groups/kune/htdocs/introd/' def commit(): "Similar to prepare_deploy" Added: intro/war/kuneintro/041E0FBF6E2C7F2A5D2226A56B7A2BB5.cache.html =================================================================== --- intro/war/kuneintro/041E0FBF6E2C7F2A5D2226A56B7A2BB5.cache.html (rev 0) +++ intro/war/kuneintro/041E0FBF6E2C7F2A5D2226A56B7A2BB5.cache.html 2011-05-09 13:50:42 UTC (rev 1365) @@ -0,0 +1,571 @@ +<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.1.1";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = '041E0FBF6E2C7F2A5D2226A56B7A2BB5';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'kuneintro',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script></script> +<script></script> +<script></script> +<script></script></body></html> \ No newline at end of file Added: intro/war/kuneintro/0B007C778586361861C873794CDF4988.cache.html =================================================================== --- intro/war/kuneintro/0B007C778586361861C873794CDF4988.cache.html (rev 0) +++ intro/war/kuneintro/0B007C778586361861C873794CDF4988.cache.html 2011-05-09 13:50:42 UTC (rev 1365) @@ -0,0 +1,564 @@ +<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.1.1";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = '0B007C778586361861C873794CDF4988';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'kuneintro',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script></script> +<script></script> +<script></script> +<script></script></body></html> \ No newline at end of file Added: intro/war/kuneintro/7B389F164AD22DCB88BFA05BCD2FDDDC.cache.html =================================================================== --- intro/war/kuneintro/7B389F164AD22DCB88BFA05BCD2FDDDC.cache.html (rev 0) +++ intro/war/kuneintro/7B389F164AD22DCB88BFA05BCD2FDDDC.cache.html 2011-05-09 13:50:42 UTC (rev 1365) @@ -0,0 +1,557 @@ +<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.1.1";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = '7B389F164AD22DCB88BFA05BCD2FDDDC';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'kuneintro',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script></script> +<script></script> +<script></script> +<script></script></body></html> \ No newline at end of file Added: intro/war/kuneintro/807CA58765E639ABAD8AA3A1FE4820F6.cache.html =================================================================== --- intro/war/kuneintro/807CA58765E639ABAD8AA3A1FE4820F6.cache.html (rev 0) +++ intro/war/kuneintro/807CA58765E639ABAD8AA3A1FE4820F6.cache.html 2011-05-09 13:50:42 UTC (rev 1365) @@ -0,0 +1,593 @@ +<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.1.1";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = '807CA58765E639ABAD8AA3A1FE4820F6';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'kuneintro',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script></script> +<script></script> +<script></script></body></html> \ No newline at end of file Added: intro/war/kuneintro/A88FCD2648ED9C395A167155D310779A.cache.html =================================================================== --- intro/war/kuneintro/A88FCD2648ED9C395A167155D310779A.cache.html (rev 0) +++ intro/war/kuneintro/A88FCD2648ED9C395A167155D310779A.cache.html 2011-05-09 13:50:42 UTC (rev 1365) @@ -0,0 +1,564 @@ +<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.1.1";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = 'A88FCD2648ED9C395A167155D310779A';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'kuneintro',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script></script> +<script></script> +<script></script> +<script></script></body></html> \ No newline at end of file

1 0

r1364 - in intro: . src/cc/kune/intro/client war/kuneintro
by Vicente J. Ruiz Jurado 09 May '11

09 May '11

Author: vjrj_ Date: 2011-05-09 15:49:58 +0200 (Mon, 09 May 2011) New Revision: 1364 Modified: intro/fabfile.py intro/src/cc/kune/intro/client/IntroTabPanel.ui.xml intro/war/kuneintro/kuneintro.nocache.js Log: Modified: intro/fabfile.py =================================================================== --- intro/fabfile.py 2011-05-09 10:41:51 UTC (rev 1363) +++ intro/fabfile.py 2011-05-09 13:49:58 UTC (rev 1364) @@ -17,7 +17,7 @@ local('svn commit -m ""') def svn_update(): - "Updates MC website with the repository files." + "Updates website with the repository files." run("cd %s; svn up" % kune_path) run("chgrp -R kune %s" % kune_path) Modified: intro/src/cc/kune/intro/client/IntroTabPanel.ui.xml =================================================================== --- intro/src/cc/kune/intro/client/IntroTabPanel.ui.xml 2011-05-09 10:41:51 UTC (rev 1363) +++ intro/src/cc/kune/intro/client/IntroTabPanel.ui.xml 2011-05-09 13:49:58 UTC (rev 1364) @@ -3,7 +3,7 @@ xmlns:g="urn:import:com.google.gwt.user.client.ui"> <ui:style> .parent { - width: 705px; + width: 605px; } .child { @@ -37,21 +37,23 @@ -webkit-border-bottom-left-radius: 0px; -moz-border-radius-bottomleft: 0px; border-bottom-left-radius: 0px; - height: 480px; + height: 380px; } .tab { - line-height: 1em; + line-height: 1.4em; + font-size: 21px; + margin: 2px; } @external .k-home-summary .litext .liimg .tabUsers .tabGroups .tabOrgs .tabPublic .gwt-TabLayoutPanelTab, .gwt-TabLayoutPanelTab, .gwt-TabLayoutPanelTab-selected; .title { - font-size: 44px; + font-size: 31px; color: #69312f; font-weight: bold; text-align: left; - padding: 12px 0 0 32px; - width: 200px; + padding: 22px 0 0 32px; + width: 180px; } .k-home-summary { @@ -62,7 +64,8 @@ .k-home-summary ul { margin: 0; - list-style-image: none; + padding: 0px 21px; + list-style-image: none; list-style-type: none; } @@ -70,7 +73,7 @@ color: #dd8a3d; white-space: nowrap; font-weight: bold; - font-size: 42px; + font-size: 37px; line-height: 55px; } @@ -92,8 +95,8 @@ -moz-border-radius-topleft: 10px; border-top-left-radius: 10px; font-weight: bold; - font-size: 28px; - padding: 6px 5px; + font-size: 2px; + padding: 3px 3px; margin: 0 0 0 10px; cursor: pointer; } @@ -108,13 +111,13 @@ } .tabPanel { - font-size: 28px; - line-height: 1.2em; + font-size: 23px; + line-height: 1.1em; color: #69312f; background-color: #F9EFCB; /* height: 360px; */ height: 84%; - padding: 30px; + padding: 20px; -webkit-border-top-right-radius: 10px; -moz-border-radius-topright: 10px; border-top-right-radius: 10px; @@ -196,7 +199,7 @@ border-top-left-radius: 10px; background-color: #C28D66; width: 67px; - margin-left: 529px; + margin-left: 479px; margin-top: 5px; } @@ -243,7 +246,7 @@ addStyleNames="{style.k-home-summary}" /> </g:SimplePanel> <g:TabLayoutPanel barHeight="56" barUnit="PX" - width="100%" height="480px" ui:field="tabPanel"> + width="100%" height="380px" ui:field="tabPanel"> <g:tab> <g:header> <div class="{style.tab}"> Modified: intro/war/kuneintro/kuneintro.nocache.js =================================================================== --- intro/war/kuneintro/kuneintro.nocache.js 2011-05-09 10:41:51 UTC (rev 1363) +++ intro/war/kuneintro/kuneintro.nocache.js 2011-05-09 13:49:58 UTC (rev 1364) @@ -1,4 +1,4 @@ -function kuneintro(){var Q='',wb='" for "gwt:onLoadErrorFn"',ub='" for "gwt:onPropertyErrorFn"',db='"><\/script>',fb='#',Ub='.cache.html',hb='/',Ob='646EA6635E6B00091F7BD7DB8B7ED723',Pb='7288647188B7FBAF7C723CA9948A1B6A',Tb=':',ob='::',Wb='<script defer="defer">kuneintro.onInjectionDone(\'kuneintro\')<\/script>',cb='<script id="',rb='=',gb='?',Qb='ABC9EFE0679CA6698BBC356D35F42728',Rb='AD77DDEC026A3F14290D40078777587B',tb='Bad handler "',Sb='C090FC3BCE9143D723B3120CBBBD6641',Vb='DOMContentLoaded',eb='SCRIPT',bb='__gwt_marker_kuneintro',ib='base',$='baseUrl',U='begin',T='bootstrap',kb='clear.cache.gif',qb='content',Z='end',Ib='gecko',Jb='gecko1_8',V='gwt.codesvr=',W='gwt.hosted=',X='gwt.hybrid',vb='gwt:onLoadErrorFn',sb='gwt:onPropertyErrorFn',pb='gwt:property',Mb='hosted.html?kuneintro',Hb='ie6',Gb='ie8',xb='iframe',jb='img',yb="javascript:''",R='kuneintro',ab='kuneintro.nocache.js',nb='kuneintro::',Lb='loadExternalRefs',lb='meta',Ab='moduleRequested',Y='moduleStartup',Fb='msie',mb='name',Cb='opera',zb='position:absolute;width:0;height:0;border:none',Eb='safari',_='script',Nb='selectingPermutation',S='startup',Kb='unknown',Bb='user.agent',Db='webkit';var m=window,n=document,o=m.__gwtStatsEvent?function(a){return m.__gwtStatsEvent(a)}:null,p=m.__gwtStatsSessionId?m.__gwtStatsSessionId:null,q,r,s,t=Q,u={},v=[],w=[],x=[],y=0,z,A;o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:T,millis:(new Date).getTime(),type:U});if(!m.__gwt_stylesLoaded){m.__gwt_stylesLoaded={}}if(!m.__gwt_scriptsLoaded){m.__gwt_scriptsLoaded={}}function B(){var b=false;try{var c=m.location.search;return (c.indexOf(V)!=-1||(c.indexOf(W)!=-1||m.external&&m.external.gwtOnLoad))&&c.indexOf(X)==-1}catch(a){}B=function(){return b};return b} +function kuneintro(){var Q='',wb='" for "gwt:onLoadErrorFn"',ub='" for "gwt:onPropertyErrorFn"',db='"><\/script>',fb='#',Ub='.cache.html',hb='/',Ob='041E0FBF6E2C7F2A5D2226A56B7A2BB5',Pb='0B007C778586361861C873794CDF4988',Qb='7B389F164AD22DCB88BFA05BCD2FDDDC',Rb='807CA58765E639ABAD8AA3A1FE4820F6',Tb=':',ob='::',Wb='<script defer="defer">kuneintro.onInjectionDone(\'kuneintro\')<\/script>',cb='<script id="',rb='=',gb='?',Sb='A88FCD2648ED9C395A167155D310779A',tb='Bad handler "',Vb='DOMContentLoaded',eb='SCRIPT',bb='__gwt_marker_kuneintro',ib='base',$='baseUrl',U='begin',T='bootstrap',kb='clear.cache.gif',qb='content',Z='end',Ib='gecko',Jb='gecko1_8',V='gwt.codesvr=',W='gwt.hosted=',X='gwt.hybrid',vb='gwt:onLoadErrorFn',sb='gwt:onPropertyErrorFn',pb='gwt:property',Mb='hosted.html?kuneintro',Hb='ie6',Gb='ie8',xb='iframe',jb='img',yb="javascript:''",R='kuneintro',ab='kuneintro.nocache.js',nb='kuneintro::',Lb='loadExternalRefs',lb='meta',Ab='moduleRequested',Y='moduleStartup',Fb='msie',mb='name',Cb='opera',zb='position:absolute;width:0;height:0;border:none',Eb='safari',_='script',Nb='selectingPermutation',S='startup',Kb='unknown',Bb='user.agent',Db='webkit';var m=window,n=document,o=m.__gwtStatsEvent?function(a){return m.__gwtStatsEvent(a)}:null,p=m.__gwtStatsSessionId?m.__gwtStatsSessionId:null,q,r,s,t=Q,u={},v=[],w=[],x=[],y=0,z,A;o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:T,millis:(new Date).getTime(),type:U});if(!m.__gwt_stylesLoaded){m.__gwt_stylesLoaded={}}if(!m.__gwt_scriptsLoaded){m.__gwt_scriptsLoaded={}}function B(){var b=false;try{var c=m.location.search;return (c.indexOf(V)!=-1||(c.indexOf(W)!=-1||m.external&&m.external.gwtOnLoad))&&c.indexOf(X)==-1}catch(a){}B=function(){return b};return b} function C(){if(q&&r){var b=n.getElementById(R);var c=b.contentWindow;if(B()){c.__gwt_getProperty=function(a){return I(a)}}kuneintro=null;c.gwtOnLoad(z,R,t,y);o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:Y,millis:(new Date).getTime(),type:Z})}} function D(){if(u[$]){t=u[$];return t}var e;var f=n.getElementsByTagName(_);for(var g=0;g<f.length;++g){if(f[g].src.indexOf(ab)!=-1){e=f[g]}}if(!e){var h=bb;var i;n.write(cb+h+db);i=n.getElementById(h);e=i&&i.previousSibling;while(e&&e.tagName!=eb){e=e.previousSibling}}function j(a){var b=a.lastIndexOf(fb);if(b==-1){b=a.length}var c=a.indexOf(gb);if(c==-1){c=a.length}var d=a.lastIndexOf(hb,Math.min(c,b));return d>=0?a.substring(0,d+1):Q} ;if(e&&e.src){t=j(e.src)}if(t==Q){var k=n.getElementsByTagName(ib);if(k.length>0){t=k[k.length-1].href}else{t=j(n.location.href)}}else if(t.match(/^\w+:\/\//)){}else{var l=n.createElement(jb);l.src=t+kb;t=j(l.src)}if(i){i.parentNode.removeChild(i)}return t} @@ -6,6 +6,6 @@ function H(a,b){var c=x;for(var d=0,e=a.length-1;d<e;++d){c=c[a[d]]||(c[a[d]]=[])}c[a[e]]=b} function I(a){var b=w[a](),c=v[a];if(b in c){return b}var d=[];for(var e in c){d[c[e]]=e}if(A){A(a,d,b)}throw null} var J;function K(){if(!J){J=true;var a=n.createElement(xb);a.src=yb;a.id=R;a.style.cssText=zb;a.tabIndex=-1;n.body.appendChild(a);o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:Y,millis:(new Date).getTime(),type:Ab});a.contentWindow.location.replace(t+M)}} -w[Bb]=function(){var b=navigator.userAgent.toLowerCase();var c=function(a){return parseInt(a[1])*1000+parseInt(a[2])};if(b.indexOf(Cb)!=-1){return Cb}else if(b.indexOf(Db)!=-1){return Eb}else if(b.indexOf(Fb)!=-1){if(document.documentMode>=8){return Gb}else{var d=/msie ([0-9]+)\.([0-9]+)/.exec(b);if(d&&d.length==3){var e=c(d);if(e>=6000){return Hb}}}}else if(b.indexOf(Ib)!=-1){return Jb}return Kb};v[Bb]={gecko1_8:0,ie6:1,ie8:2,opera:3,safari:4};kuneintro.onScriptLoad=function(){if(J){r=true;C()}};kuneintro.onInjectionDone=function(){q=true;o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:Lb,millis:(new Date).getTime(),type:Z});C()};E();D();var L;var M;if(B()){if(m.external&&(m.external.initModule&&m.external.initModule(R))){m.location.reload();return}M=Mb;L=Q}o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:T,millis:(new Date).getTime(),type:Nb});if(!B()){try{H([Eb],Ob);H([Hb],Pb);H([Gb],Qb);H([Jb],Rb);H([Cb],Sb);L=x[I(Bb)];var N=L.indexOf(Tb);if(N!=-1){y=Number(L.substring(N+1));L=L.substring(0,N)}M=L+Ub}catch(a){return}}var O;function P(){if(!s){s=true;C();if(n.removeEventListener){n.removeEventListener(Vb,P,false)}if(O){clearInterval(O)}}} +w[Bb]=function(){var b=navigator.userAgent.toLowerCase();var c=function(a){return parseInt(a[1])*1000+parseInt(a[2])};if(b.indexOf(Cb)!=-1){return Cb}else if(b.indexOf(Db)!=-1){return Eb}else if(b.indexOf(Fb)!=-1){if(document.documentMode>=8){return Gb}else{var d=/msie ([0-9]+)\.([0-9]+)/.exec(b);if(d&&d.length==3){var e=c(d);if(e>=6000){return Hb}}}}else if(b.indexOf(Ib)!=-1){return Jb}return Kb};v[Bb]={gecko1_8:0,ie6:1,ie8:2,opera:3,safari:4};kuneintro.onScriptLoad=function(){if(J){r=true;C()}};kuneintro.onInjectionDone=function(){q=true;o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:Lb,millis:(new Date).getTime(),type:Z});C()};E();D();var L;var M;if(B()){if(m.external&&(m.external.initModule&&m.external.initModule(R))){m.location.reload();return}M=Mb;L=Q}o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:T,millis:(new Date).getTime(),type:Nb});if(!B()){try{H([Eb],Ob);H([Jb],Pb);H([Cb],Qb);H([Hb],Rb);H([Gb],Sb);L=x[I(Bb)];var N=L.indexOf(Tb);if(N!=-1){y=Number(L.substring(N+1));L=L.substring(0,N)}M=L+Ub}catch(a){return}}var O;function P(){if(!s){s=true;C();if(n.removeEventListener){n.removeEventListener(Vb,P,false)}if(O){clearInterval(O)}}} if(n.addEventListener){n.addEventListener(Vb,function(){K();P()},false)}var O=setInterval(function(){if(/loaded|complete/.test(n.readyState)){K();P()}},50);o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:T,millis:(new Date).getTime(),type:Z});o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:Lb,millis:(new Date).getTime(),type:U});n.write(Wb)} kuneintro(); \ No newline at end of file

1 0

r1363 - intro/war/kuneintro
by Vicente J. Ruiz Jurado 09 May '11

09 May '11

Author: vjrj_ Date: 2011-05-09 12:41:51 +0200 (Mon, 09 May 2011) New Revision: 1363 Added: intro/war/kuneintro/646EA6635E6B00091F7BD7DB8B7ED723.cache.html intro/war/kuneintro/7288647188B7FBAF7C723CA9948A1B6A.cache.html intro/war/kuneintro/ABC9EFE0679CA6698BBC356D35F42728.cache.html intro/war/kuneintro/AD77DDEC026A3F14290D40078777587B.cache.html intro/war/kuneintro/C090FC3BCE9143D723B3120CBBBD6641.cache.html Modified: intro/war/kuneintro/kuneintro.nocache.js Log: Added: intro/war/kuneintro/646EA6635E6B00091F7BD7DB8B7ED723.cache.html =================================================================== --- intro/war/kuneintro/646EA6635E6B00091F7BD7DB8B7ED723.cache.html (rev 0) +++ intro/war/kuneintro/646EA6635E6B00091F7BD7DB8B7ED723.cache.html 2011-05-09 10:41:51 UTC (rev 1363) @@ -0,0 +1,571 @@ +<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.1.1";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = '646EA6635E6B00091F7BD7DB8B7ED723';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'kuneintro',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script></script> +<script></script> +<script></script> +<script></script></body></html> \ No newline at end of file Added: intro/war/kuneintro/7288647188B7FBAF7C723CA9948A1B6A.cache.html =================================================================== --- intro/war/kuneintro/7288647188B7FBAF7C723CA9948A1B6A.cache.html (rev 0) +++ intro/war/kuneintro/7288647188B7FBAF7C723CA9948A1B6A.cache.html 2011-05-09 10:41:51 UTC (rev 1363) @@ -0,0 +1,593 @@ +<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.1.1";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = '7288647188B7FBAF7C723CA9948A1B6A';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'kuneintro',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script></script> +<script></script> +<script></script></body></html> \ No newline at end of file Added: intro/war/kuneintro/ABC9EFE0679CA6698BBC356D35F42728.cache.html =================================================================== --- intro/war/kuneintro/ABC9EFE0679CA6698BBC356D35F42728.cache.html (rev 0) +++ intro/war/kuneintro/ABC9EFE0679CA6698BBC356D35F42728.cache.html 2011-05-09 10:41:51 UTC (rev 1363) @@ -0,0 +1,564 @@ +<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.1.1";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = 'ABC9EFE0679CA6698BBC356D35F42728';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'kuneintro',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script></script> +<script></script> +<script></script> +<script></script></body></html> \ No newline at end of file Added: intro/war/kuneintro/AD77DDEC026A3F14290D40078777587B.cache.html =================================================================== --- intro/war/kuneintro/AD77DDEC026A3F14290D40078777587B.cache.html (rev 0) +++ intro/war/kuneintro/AD77DDEC026A3F14290D40078777587B.cache.html 2011-05-09 10:41:51 UTC (rev 1363) @@ -0,0 +1,564 @@ +<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.1.1";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = 'AD77DDEC026A3F14290D40078777587B';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'kuneintro',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script></script> +<script></script> +<script></script> +<script></script></body></html> \ No newline at end of file Added: intro/war/kuneintro/C090FC3BCE9143D723B3120CBBBD6641.cache.html =================================================================== --- intro/war/kuneintro/C090FC3BCE9143D723B3120CBBBD6641.cache.html (rev 0) +++ intro/war/kuneintro/C090FC3BCE9143D723B3120CBBBD6641.cache.html 2011-05-09 10:41:51 UTC (rev 1363) @@ -0,0 +1,557 @@ +<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.1.1";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = 'C090FC3BCE9143D723B3120CBBBD6641';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'kuneintro',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script></script> +<script></script> +<script></script> +<script></script></body></html> \ No newline at end of file Modified: intro/war/kuneintro/kuneintro.nocache.js =================================================================== --- intro/war/kuneintro/kuneintro.nocache.js 2011-05-09 10:28:32 UTC (rev 1362) +++ intro/war/kuneintro/kuneintro.nocache.js 2011-05-09 10:41:51 UTC (rev 1363) @@ -1,4 +1,4 @@ -function kuneintro(){var Q='',wb='" for "gwt:onLoadErrorFn"',ub='" for "gwt:onPropertyErrorFn"',db='"><\/script>',fb='#',Ub='.cache.html',hb='/',Ob='19BC1A361F2B7956E2DD818E86A811BD',Pb='2395ED86C3E2109E1C70A54B34EE32A8',Qb='562FC548B41DADF6F2F1ADD57F46ADD9',Rb='7F5A6E1CFA1AA01985107DFB19A18960',Tb=':',ob='::',Wb='<script defer="defer">kuneintro.onInjectionDone(\'kuneintro\')<\/script>',cb='<script id="',rb='=',gb='?',tb='Bad handler "',Sb='C068E077B2DA853B0A008F72CAD53F7E',Vb='DOMContentLoaded',eb='SCRIPT',bb='__gwt_marker_kuneintro',ib='base',$='baseUrl',U='begin',T='bootstrap',kb='clear.cache.gif',qb='content',Z='end',Ib='gecko',Jb='gecko1_8',V='gwt.codesvr=',W='gwt.hosted=',X='gwt.hybrid',vb='gwt:onLoadErrorFn',sb='gwt:onPropertyErrorFn',pb='gwt:property',Mb='hosted.html?kuneintro',Hb='ie6',Gb='ie8',xb='iframe',jb='img',yb="javascript:''",R='kuneintro',ab='kuneintro.nocache.js',nb='kuneintro::',Lb='loadExternalRefs',lb='meta',Ab='moduleRequested',Y='moduleStartup',Fb='msie',mb='name',Cb='opera',zb='position:absolute;width:0;height:0;border:none',Eb='safari',_='script',Nb='selectingPermutation',S='startup',Kb='unknown',Bb='user.agent',Db='webkit';var m=window,n=document,o=m.__gwtStatsEvent?function(a){return m.__gwtStatsEvent(a)}:null,p=m.__gwtStatsSessionId?m.__gwtStatsSessionId:null,q,r,s,t=Q,u={},v=[],w=[],x=[],y=0,z,A;o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:T,millis:(new Date).getTime(),type:U});if(!m.__gwt_stylesLoaded){m.__gwt_stylesLoaded={}}if(!m.__gwt_scriptsLoaded){m.__gwt_scriptsLoaded={}}function B(){var b=false;try{var c=m.location.search;return (c.indexOf(V)!=-1||(c.indexOf(W)!=-1||m.external&&m.external.gwtOnLoad))&&c.indexOf(X)==-1}catch(a){}B=function(){return b};return b} +function kuneintro(){var Q='',wb='" for "gwt:onLoadErrorFn"',ub='" for "gwt:onPropertyErrorFn"',db='"><\/script>',fb='#',Ub='.cache.html',hb='/',Ob='646EA6635E6B00091F7BD7DB8B7ED723',Pb='7288647188B7FBAF7C723CA9948A1B6A',Tb=':',ob='::',Wb='<script defer="defer">kuneintro.onInjectionDone(\'kuneintro\')<\/script>',cb='<script id="',rb='=',gb='?',Qb='ABC9EFE0679CA6698BBC356D35F42728',Rb='AD77DDEC026A3F14290D40078777587B',tb='Bad handler "',Sb='C090FC3BCE9143D723B3120CBBBD6641',Vb='DOMContentLoaded',eb='SCRIPT',bb='__gwt_marker_kuneintro',ib='base',$='baseUrl',U='begin',T='bootstrap',kb='clear.cache.gif',qb='content',Z='end',Ib='gecko',Jb='gecko1_8',V='gwt.codesvr=',W='gwt.hosted=',X='gwt.hybrid',vb='gwt:onLoadErrorFn',sb='gwt:onPropertyErrorFn',pb='gwt:property',Mb='hosted.html?kuneintro',Hb='ie6',Gb='ie8',xb='iframe',jb='img',yb="javascript:''",R='kuneintro',ab='kuneintro.nocache.js',nb='kuneintro::',Lb='loadExternalRefs',lb='meta',Ab='moduleRequested',Y='moduleStartup',Fb='msie',mb='name',Cb='opera',zb='position:absolute;width:0;height:0;border:none',Eb='safari',_='script',Nb='selectingPermutation',S='startup',Kb='unknown',Bb='user.agent',Db='webkit';var m=window,n=document,o=m.__gwtStatsEvent?function(a){return m.__gwtStatsEvent(a)}:null,p=m.__gwtStatsSessionId?m.__gwtStatsSessionId:null,q,r,s,t=Q,u={},v=[],w=[],x=[],y=0,z,A;o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:T,millis:(new Date).getTime(),type:U});if(!m.__gwt_stylesLoaded){m.__gwt_stylesLoaded={}}if(!m.__gwt_scriptsLoaded){m.__gwt_scriptsLoaded={}}function B(){var b=false;try{var c=m.location.search;return (c.indexOf(V)!=-1||(c.indexOf(W)!=-1||m.external&&m.external.gwtOnLoad))&&c.indexOf(X)==-1}catch(a){}B=function(){return b};return b} function C(){if(q&&r){var b=n.getElementById(R);var c=b.contentWindow;if(B()){c.__gwt_getProperty=function(a){return I(a)}}kuneintro=null;c.gwtOnLoad(z,R,t,y);o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:Y,millis:(new Date).getTime(),type:Z})}} function D(){if(u[$]){t=u[$];return t}var e;var f=n.getElementsByTagName(_);for(var g=0;g<f.length;++g){if(f[g].src.indexOf(ab)!=-1){e=f[g]}}if(!e){var h=bb;var i;n.write(cb+h+db);i=n.getElementById(h);e=i&&i.previousSibling;while(e&&e.tagName!=eb){e=e.previousSibling}}function j(a){var b=a.lastIndexOf(fb);if(b==-1){b=a.length}var c=a.indexOf(gb);if(c==-1){c=a.length}var d=a.lastIndexOf(hb,Math.min(c,b));return d>=0?a.substring(0,d+1):Q} ;if(e&&e.src){t=j(e.src)}if(t==Q){var k=n.getElementsByTagName(ib);if(k.length>0){t=k[k.length-1].href}else{t=j(n.location.href)}}else if(t.match(/^\w+:\/\//)){}else{var l=n.createElement(jb);l.src=t+kb;t=j(l.src)}if(i){i.parentNode.removeChild(i)}return t} @@ -6,6 +6,6 @@ function H(a,b){var c=x;for(var d=0,e=a.length-1;d<e;++d){c=c[a[d]]||(c[a[d]]=[])}c[a[e]]=b} function I(a){var b=w[a](),c=v[a];if(b in c){return b}var d=[];for(var e in c){d[c[e]]=e}if(A){A(a,d,b)}throw null} var J;function K(){if(!J){J=true;var a=n.createElement(xb);a.src=yb;a.id=R;a.style.cssText=zb;a.tabIndex=-1;n.body.appendChild(a);o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:Y,millis:(new Date).getTime(),type:Ab});a.contentWindow.location.replace(t+M)}} -w[Bb]=function(){var b=navigator.userAgent.toLowerCase();var c=function(a){return parseInt(a[1])*1000+parseInt(a[2])};if(b.indexOf(Cb)!=-1){return Cb}else if(b.indexOf(Db)!=-1){return Eb}else if(b.indexOf(Fb)!=-1){if(document.documentMode>=8){return Gb}else{var d=/msie ([0-9]+)\.([0-9]+)/.exec(b);if(d&&d.length==3){var e=c(d);if(e>=6000){return Hb}}}}else if(b.indexOf(Ib)!=-1){return Jb}return Kb};v[Bb]={gecko1_8:0,ie6:1,ie8:2,opera:3,safari:4};kuneintro.onScriptLoad=function(){if(J){r=true;C()}};kuneintro.onInjectionDone=function(){q=true;o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:Lb,millis:(new Date).getTime(),type:Z});C()};E();D();var L;var M;if(B()){if(m.external&&(m.external.initModule&&m.external.initModule(R))){m.location.reload();return}M=Mb;L=Q}o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:T,millis:(new Date).getTime(),type:Nb});if(!B()){try{H([Hb],Ob);H([Jb],Pb);H([Eb],Qb);H([Cb],Rb);H([Gb],Sb);L=x[I(Bb)];var N=L.indexOf(Tb);if(N!=-1){y=Number(L.substring(N+1));L=L.substring(0,N)}M=L+Ub}catch(a){return}}var O;function P(){if(!s){s=true;C();if(n.removeEventListener){n.removeEventListener(Vb,P,false)}if(O){clearInterval(O)}}} +w[Bb]=function(){var b=navigator.userAgent.toLowerCase();var c=function(a){return parseInt(a[1])*1000+parseInt(a[2])};if(b.indexOf(Cb)!=-1){return Cb}else if(b.indexOf(Db)!=-1){return Eb}else if(b.indexOf(Fb)!=-1){if(document.documentMode>=8){return Gb}else{var d=/msie ([0-9]+)\.([0-9]+)/.exec(b);if(d&&d.length==3){var e=c(d);if(e>=6000){return Hb}}}}else if(b.indexOf(Ib)!=-1){return Jb}return Kb};v[Bb]={gecko1_8:0,ie6:1,ie8:2,opera:3,safari:4};kuneintro.onScriptLoad=function(){if(J){r=true;C()}};kuneintro.onInjectionDone=function(){q=true;o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:Lb,millis:(new Date).getTime(),type:Z});C()};E();D();var L;var M;if(B()){if(m.external&&(m.external.initModule&&m.external.initModule(R))){m.location.reload();return}M=Mb;L=Q}o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:T,millis:(new Date).getTime(),type:Nb});if(!B()){try{H([Eb],Ob);H([Hb],Pb);H([Gb],Qb);H([Jb],Rb);H([Cb],Sb);L=x[I(Bb)];var N=L.indexOf(Tb);if(N!=-1){y=Number(L.substring(N+1));L=L.substring(0,N)}M=L+Ub}catch(a){return}}var O;function P(){if(!s){s=true;C();if(n.removeEventListener){n.removeEventListener(Vb,P,false)}if(O){clearInterval(O)}}} if(n.addEventListener){n.addEventListener(Vb,function(){K();P()},false)}var O=setInterval(function(){if(/loaded|complete/.test(n.readyState)){K();P()}},50);o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:T,millis:(new Date).getTime(),type:Z});o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:Lb,millis:(new Date).getTime(),type:U});n.write(Wb)} kuneintro(); \ No newline at end of file

1 0

r1362 - in intro: . .settings src/cc/kune/intro/client war war/WEB-INF war/kuneintro
by Vicente J. Ruiz Jurado 09 May '11

09 May '11

Author: vjrj_ Date: 2011-05-09 12:28:32 +0200 (Mon, 09 May 2011) New Revision: 1362 Added: intro/.settings/ intro/.settings/com.google.gdt.eclipse.core.prefs intro/.settings/com.google.gwt.eclipse.core.prefs intro/.settings/org.eclipse.jdt.core.prefs intro/.settings/org.eclipse.jdt.ui.prefs intro/fabfile.py intro/war/about.html intro/war/frame-def.css intro/war/kuneintro/ intro/war/kuneintro/0A9476898799A150D840F0B1C3672921.cache.png intro/war/kuneintro/19BC1A361F2B7956E2DD818E86A811BD.cache.html intro/war/kuneintro/2395ED86C3E2109E1C70A54B34EE32A8.cache.html intro/war/kuneintro/365A1152800FA0737250805ADEAAFABF.cache.png intro/war/kuneintro/396F806CD63ABD414BFBB9D57429F05B.cache.png intro/war/kuneintro/409D47324359E3F14C463CFDFEAE25A4.cache.png intro/war/kuneintro/562FC548B41DADF6F2F1ADD57F46ADD9.cache.html intro/war/kuneintro/7F5A6E1CFA1AA01985107DFB19A18960.cache.html intro/war/kuneintro/C068E077B2DA853B0A008F72CAD53F7E.cache.html intro/war/kuneintro/DF7764EEC1903CD03C9545B354D8D8E4.cache.png intro/war/kuneintro/E44767377485D18D6B6864F65BA8EF73.cache.png intro/war/kuneintro/EDC7827FEEA59EE44AD790B1C6430C45.cache.png intro/war/kuneintro/clear.cache.gif intro/war/kuneintro/hosted.html intro/war/kuneintro/kuneintro.nocache.js Modified: intro/ intro/src/cc/kune/intro/client/IntroTabPanel.java intro/src/cc/kune/intro/client/IntroTabPanel.ui.xml intro/war/WEB-INF/ Log: last changes Property changes on: intro ___________________________________________________________________ Name: svn:ignore + .gwt test-classes Added: intro/.settings/com.google.gdt.eclipse.core.prefs =================================================================== --- intro/.settings/com.google.gdt.eclipse.core.prefs (rev 0) +++ intro/.settings/com.google.gdt.eclipse.core.prefs 2011-05-09 10:28:32 UTC (rev 1362) @@ -0,0 +1,4 @@ +#Sat May 07 23:25:08 CEST 2011 +eclipse.preferences.version=1 +warSrcDir=war +warSrcDirIsOutput=true Added: intro/.settings/com.google.gwt.eclipse.core.prefs =================================================================== --- intro/.settings/com.google.gwt.eclipse.core.prefs (rev 0) +++ intro/.settings/com.google.gwt.eclipse.core.prefs 2011-05-09 10:28:32 UTC (rev 1362) @@ -0,0 +1,4 @@ +#Sat May 07 23:46:00 CEST 2011 +eclipse.preferences.version=1 +filesCopiedToWebInfLib=gwt-servlet.jar +gwtCompileSettings=PGd3dC1jb21waWxlLXNldHRpbmdzPjxsb2ctbGV2ZWw+SU5GTzwvbG9nLWxldmVsPjxvdXRwdXQtc3R5bGU+T0JGVVNDQVRFRDwvb3V0cHV0LXN0eWxlPjxleHRyYS1hcmdzPjwhW0NEQVRBW11dPjwvZXh0cmEtYXJncz48dm0tYXJncz48IVtDREFUQVstWG14NTEybV1dPjwvdm0tYXJncz48ZW50cnktcG9pbnQtbW9kdWxlPmNjLmt1bmUuaW50cm8uS3VuZV9pbnRybzwvZW50cnktcG9pbnQtbW9kdWxlPjwvZ3d0LWNvbXBpbGUtc2V0dGluZ3M+ Added: intro/.settings/org.eclipse.jdt.core.prefs =================================================================== --- intro/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ intro/.settings/org.eclipse.jdt.core.prefs 2011-05-09 10:28:32 UTC (rev 1362) @@ -0,0 +1,270 @@ +#Sat May 07 23:47:31 CEST 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=2 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=0 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=2 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=true +org.eclipse.jdt.core.formatter.join_wrapped_lines=true +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=105 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=2 +org.eclipse.jdt.core.formatter.use_on_off_tags=true +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true Added: intro/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- intro/.settings/org.eclipse.jdt.ui.prefs (rev 0) +++ intro/.settings/org.eclipse.jdt.ui.prefs 2011-05-09 10:28:32 UTC (rev 1362) @@ -0,0 +1,110 @@ +#Sat May 07 23:47:59 CEST 2011 +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=true +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=true +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=true +cleanup.format_source_code_changes_only=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=true +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=true +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=false +cleanup.organize_imports=true +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=true +cleanup.sort_members_all=true +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup_profile=_kune-clean-up +cleanup_settings_version=2 +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_kune-formatter +formatter_settings_version=11 +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=true +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=true +sp_cleanup.correct_indentation=true +sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=true +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=true +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=true +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=true +sp_cleanup.sort_members_all=true +sp_cleanup.use_blocks=true +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true Added: intro/fabfile.py =================================================================== --- intro/fabfile.py (rev 0) +++ intro/fabfile.py 2011-05-09 10:28:32 UTC (rev 1362) @@ -0,0 +1,27 @@ +from fabric.api import * + +env.hosts = ['scm.ourproject.org'] +kune_path = '/home/groups/kune/htdocs/intro/' + +def commit(): + "Similar to prepare_deploy" + prepare_deploy() + +def set_user(): + "Set a different user from your system user to deploy" + # put user = you-ourproject-user in the file ~/.fabricrc (if different from your system user) + env.user = prompt('Type your user in ourproject.org: ') + +def prepare_deploy(): + "Commit last changes to Kune repo" + local('svn commit -m ""') + +def svn_update(): + "Updates MC website with the repository files." + run("cd %s; svn up" % kune_path) + run("chgrp -R kune %s" % kune_path) + +def deploy(): + run('echo Deploying with user: "%(user)s"' % env) + prepare_deploy() + svn_update() Modified: intro/src/cc/kune/intro/client/IntroTabPanel.java =================================================================== --- intro/src/cc/kune/intro/client/IntroTabPanel.java 2011-05-08 21:13:40 UTC (rev 1361) +++ intro/src/cc/kune/intro/client/IntroTabPanel.java 2011-05-09 10:28:32 UTC (rev 1362) @@ -9,12 +9,13 @@ import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.DeckPanel; import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.Frame; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.InlineLabel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.PushButton; -import com.google.gwt.user.client.ui.ScrollPanel; +import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.TabLayoutPanel; import com.google.gwt.user.client.ui.Widget; @@ -23,15 +24,19 @@ interface IntroTabPanelUiBinder extends UiBinder<Widget, IntroTabPanel> { } + private static final String CREDITS_TITLE = "Credits"; + + private static final String PRESENTING = "Presenting"; private static IntroTabPanelUiBinder uiBinder = GWT.create(IntroTabPanelUiBinder.class); - private static final String WHY_DO_WE_NEED = "Why do we need"; @UiField HorizontalPanel btnPanel; @UiField - ScrollPanel credits; + FlowPanel childPanel; @UiField - HTML creditsHtml; + FlowPanel credits; + @UiField + Frame creditsHtml; private int currentSlide; @UiField DeckPanel deck; @@ -40,9 +45,11 @@ @UiField FlowPanel groupsPanel; @UiField + FlowPanel header; + @UiField HTML htmlIntro; @UiField - FlowPanel intro; + SimplePanel intro; @UiField PushButton leftBtn; @UiField @@ -52,6 +59,8 @@ @UiField FlowPanel orgsPanel; @UiField + FlowPanel parentPanel; + @UiField HTML publicField; @UiField FlowPanel publicPanel; @@ -97,11 +106,12 @@ + "boost collaboration among the members" + "</ul>"); currentSlide = 0; deck.setAnimationEnabled(false); - htmlIntro.setHTML("<div class=\"k-home-summary\">" + "<ul>" - + "<li class=\"tabUsers\">Comunicate with others</li>" - + "<li class=\"tabGroups\">Work in collaboration</li>" - + "<li class=\"tabPublic\">And share with the world</li>" + "</ul>" + "</div>"); - creditsHtml.setHTML("alñsidfjaklds"); + htmlIntro.setHTML("<ul>" + + "<li><span class=\"liimg tabUsers\"/><span class=\"litext\">Comunicate with others</span></li>" + + "<li><span class=\"liimg tabGroups\"/><span class=\"litext\">Work in collaboration</span></li>" + + "<li><span class=\"liimg tabPublic\"/><span class=\"litext\">And share with the world</span></li>" + + "</ul>"); + creditsHtml.setUrl("about.html"); showCurrentSlide(); } @@ -126,7 +136,8 @@ switch (currentSlide) { case 0: deck.showWidget(0); - // title.setVisible(false); + title.setVisible(false); + // title.setText(PRESENTING); break; case 1: deck.showWidget(1); @@ -149,12 +160,12 @@ case 4: deck.showWidget(1); tabPanel.selectTab(currentSlide - 1); - // title.setVisible(true); + title.setVisible(true); title.setText(WHY_DO_WE_NEED); break; case 5: deck.showWidget(2); - // title.setText("Credits"); + title.setText(CREDITS_TITLE); title.setVisible(true); break; default: Modified: intro/src/cc/kune/intro/client/IntroTabPanel.ui.xml =================================================================== --- intro/src/cc/kune/intro/client/IntroTabPanel.ui.xml 2011-05-08 21:13:40 UTC (rev 1361) +++ intro/src/cc/kune/intro/client/IntroTabPanel.ui.xml 2011-05-09 10:28:32 UTC (rev 1362) @@ -15,6 +15,10 @@ width: 100%; } + .header { + height: 123px; + } + .tabscontainer { background-color: #F0C6A0; -webkit-border-radius: 10px; @@ -24,7 +28,8 @@ -webkit-border-top-right-radius: 0px; -moz-border-radius-topright: 0px; border-top-right-radius: 0px; - -webkit-border-top-left-radius: 0px; -moz-border-radius-toplright 0px; + -webkit-border-top-left-radius: 0px; + -moz-border-radius-toplright: 0px; border-top-left-radius: 0px; -webkit-border-bottom-right-radius: 0px; -moz-border-radius-bottomright: 0px; @@ -32,37 +37,52 @@ -webkit-border-bottom-left-radius: 0px; -moz-border-radius-bottomleft: 0px; border-bottom-left-radius: 0px; - height: 480px !important; + height: 480px; } .tab { line-height: 1em; } - @external .k-home-summary .tabUsers .tabGroups .tabOrgs .tabPublic .gwt-TabLayoutPanelTab, .gwt-TabLayoutPanelTab, .gwt-TabLayoutPanelTab-selected; + @external .k-home-summary .litext .liimg .tabUsers .tabGroups .tabOrgs .tabPublic .gwt-TabLayoutPanelTab, .gwt-TabLayoutPanelTab, .gwt-TabLayoutPanelTab-selected; .title { font-size: 44px; color: #69312f; font-weight: bold; text-align: left; - margin: 10px 18px; + padding: 12px 0 0 32px; width: 200px; } .k-home-summary { - font-size: 32px; + margin: 0 auto; + position: absolute; + top: 32%; + } + + .k-home-summary ul { + margin: 0; + list-style-image: none; + list-style-type: none; + } + + .k-home-summary li { color: #dd8a3d; + white-space: nowrap; font-weight: bold; - white-space: nowrap; + font-size: 42px; + line-height: 55px; } - .k-home-summary li { - padding-left: 41px; - background-repeat: no-repeat; - background-position: 0 .2em; - line-height: 45px; + .litext { + top: -7px; + position: relative } + .liimg { + padding: 0px 45px !important; + } + .gwt-TabLayoutPanelTab { background-color: #F3D4AE; -webkit-border-top-right-radius: 10px; @@ -185,6 +205,14 @@ padding: 6px 8px 2px; outline: 0; } + + .credits { + border: 0px; + margin: 0px; + width: 100%; + height: 100%; + background-color: #F0C6A0; + } </ui:style> <ui:image field="kuneLogo" src="kune-intro-logo.png"></ui:image> @@ -200,16 +228,20 @@ <ui:image field="arrowLeftHover" src="arrow-left-h.png"></ui:image> <ui:image field="arrowRightHover" src="arrow-right-h.png"></ui:image> - <g:FlowPanel addStyleNames="{style.parent}"> - <g:FlowPanel addStyleNames="{style.child}"> - <g:InlineLabel addStyleNames="{style.logo} {style.right}" - ui:field="logo" /> - <g:Label addStyleNames="{style.title}" ui:field="title">Why do we - need</g:Label> + <g:FlowPanel addStyleNames="{style.parent}" ui:field="parentPanel"> + <g:FlowPanel addStyleNames="{style.child}" ui:field="childPanel"> + <g:FlowPanel addStyleNames="{style.header}" ui:field="header"> + <g:InlineLabel addStyleNames="{style.logo} {style.right}" + ui:field="logo" /> + <g:Label addStyleNames="{style.title}" ui:field="title">Why do + we + need</g:Label> + </g:FlowPanel> <g:DeckPanel ui:field="deck" addStyleNames="{style.tabscontainer}"> - <g:FlowPanel ui:field="intro"> - <g:HTML wordWrap="true" ui:field="htmlIntro" /> - </g:FlowPanel> + <g:SimplePanel ui:field="intro"> + <g:HTML wordWrap="true" ui:field="htmlIntro" + addStyleNames="{style.k-home-summary}" /> + </g:SimplePanel> <g:TabLayoutPanel barHeight="56" barUnit="PX" width="100%" height="480px" ui:field="tabPanel"> <g:tab> @@ -261,9 +293,9 @@ </g:FlowPanel> </g:tab> </g:TabLayoutPanel> - <g:ScrollPanel ui:field="credits"> - <g:HTML wordWrap="true" ui:field="creditsHtml" /> - </g:ScrollPanel> + <g:FlowPanel ui:field="credits"> + <g:Frame ui:field="creditsHtml" addStyleNames="{style.credits}" /> + </g:FlowPanel> </g:DeckPanel> <g:HorizontalPanel ui:field="btnPanel" styleName="{style.arrowbtns} "> Property changes on: intro/war/WEB-INF ___________________________________________________________________ Name: svn:ignore + lib classes Added: intro/war/about.html =================================================================== --- intro/war/about.html (rev 0) +++ intro/war/about.html 2011-05-09 10:28:32 UTC (rev 1362) @@ -0,0 +1,223 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<title></title> +<meta name="generator" content="HTML::TextToHTML v2.51"/> +<link rel="stylesheet" type="text/css" href="frame-def.css"/> +</head> +<body> +<script src="//ajax.googleapis.com/ajax/libs/webfont/1/webfont.js"></script> +<script> + WebFont.load({ + google : { + families : [ 'Ubuntu' ] + } + }); +</script> +<link + href='http://fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold,bolditalic' + rel='stylesheet' type='text/css'> +<h2><a name="section_1_1">Authors</a></h2> + +<p>Daniel Gómez Blasco<br/> +Samer Hassan<br/> +Vicente J. Ruiz Jurado +</p> +<h2><a name="section_1_2">Contributors</a></h2> + +<ul> + <li>Thanks to David Trigo and <a href="http://www.esperanto-es.net/">http://www.esperanto-es.net/</a> for suggesting the name +of 'kune' for our initiative: + <a href="http://ourproject.org/forum/forum.php?thread_id=500&forum_id=469">http://ourproject.org/forum/forum.php?thread_id=500&forum_id=469</a> + </li><li>Antonio Martins, Jéferson Assumção, Moacir Gadotti and the Instituto Paulo +Freire staff + </li><li>Javier Picado Ladrón de Guevara and the <a href="http://iepala.es">http://iepala.es</a> staff for their +support and infrastructure + </li><li>Javier de la Cueva and Leovigildo García-Bobadilla for the legal support + </li><li>Jonathan Araña Cruz, Roxu and all the <a href="http://xsto.info">http://xsto.info</a> staff for their +help with the infrastructure + </li><li>Daniel Jiménez for the initial help and coordination + </li><li>Johnattan Rupire and William Austen Bradbury for their web contributions and +translations + </li><li>and <a href="http://ourproject.org">http://ourproject.org</a> and again <a href="http://xsto.info">http://xsto.info</a> and +<a href="http://iepala.es">http://iepala.es</a> for sharing with us their resources +</li></ul> +<h1><a name="section_2">LICENSES</a></h1> + +<p>All programs are either under the AGPL, GPL, LGPL, Artistic or BSD licenses, see +below for details. +</p> +<p>On Debian systems, the complete text of these licenses can be found in: +</p> +<p>/usr/share/common-licenses/AGPL<br/> +/usr/share/common-licenses/GPL-3<br/> +/usr/share/common-licenses/Artistic<br/> +/usr/share/common-licenses/BSD<br/> +/usr/share/common-licenses/LGPL +</p> +<p>When in doubt, check the individual file, they should all have license +headings and other identifying marks. +</p> +<h2><a name="section_2_1">kune software</a></h2> + +<p>Copyright +</p> +<p>(c) 2007-2011 The kune development team (see CREDITS for details) +</p> +<p>This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. +</p> +<p>This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. +</p> +<p>You should have received a copy of the GNU Affero General Public License +along with this program. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. +</p> +<p>See COPYRIGHT-AGPLv3 for a complete text. +</p> +<h2><a name="section_2_2">kune documentation</a></h2> + +<p>Copyright +</p> +<p>(c) The kune development team (see CREDITS an individual docs for details) +This work is licensed under the Creative Commons Attribution-Share Alike 3.0 +License. To view a copy of this license, visit +<a href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</a> +or send a letter to Creative Commons, 543 Howard Street, 5th Floor, San +Francisco, California, 94105, USA. +</p> +<h2><a name="section_2_3">kune graphics</a></h2> + +<p>Copyright +</p> +<p>(c) Vicente J. Ruiz Jurado <<a href="mailto:[email protected]">vjrj(a)ourproject.org</a>> +This work is licensed under the Creative Commons Attribution-Share Alike 3.0 +License. To view a copy of this license, visit +<a href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</a> +or send a letter to Creative Commons, 543 Howard Street, 5th Floor, San +Francisco, California, 94105, USA. +</p> +<h2><a name="section_2_4">other icons</a></h2> + +<p><strong>some from Tango</strong> +</p> +<p><a href="http://tango.freedesktop.org/">http://tango.freedesktop.org/</a> +</p> +<p>Creative Commons Attribution-ShareAlike 2.5 License Agreement +<a href="http://creativecommons.org/licenses/by-sa/2.5/">http://creativecommons.org/licenses/by-sa/2.5/</a> +</p> +<p><strong>others from famfamfam</strong> +</p> +<p><a href="http://www.famfamfam.com/lab/icons/silk/">http://www.famfamfam.com/lab/icons/silk/</a> +</p> +<p>Creative Commons Attribution 2.5 License Agreement +<a href="http://creativecommons.org/licenses/by/2.5/">http://creativecommons.org/licenses/by/2.5/</a> +</p> +<p><strong>some xmpp icons from pidgin</strong> +</p> +<p>Purple/Pidgin/Finch is the legal property of its developers. +Copyright (C) 1998-2007 under the terms of the GNU General Public License as +published by the Free Software Foundation; either version 2 of +the License, or (at your option) any later version. +</p> +<p><strong>emoticons from Adium and Kopete theme</strong> +</p> +<p>kopete adium theme by robotangel and original "Adiumicons" by Oscar Gruno +under GNU GPL license<br/> +<a href="http://www.gnu.org/copyleft/gpl.html">http://www.gnu.org/copyleft/gpl.html</a> +</p> +<p><strong>and other icons from openoffice.org-style-human debian package</strong> +</p> +<p>Copyright 2002-2007 Sun Microsystems, Inc. +This product is made available subject to the terms of GNU Lesser General +Public License Version 2.1. A copy of the LGPL license can be found +<a href="http://www.openoffice.org/project/www/license.html">http://www.openoffice.org/project/www/license.html</a> +</p> +<h2><a name="section_2_5">other stuff (libraries, etc)</a></h2> + +<p><strong>wave / wave in a box</strong> +</p> +<ul> + <li><a href="http://www.waveprotocol.org">http://www.waveprotocol.org</a> + </li><li><a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a> + </li><li><a href="http://www.waveprotocol.org/patent-license">http://www.waveprotocol.org/patent-license</a> +</li></ul> +<p><strong>emite libray</strong> +</p> +<p><a href="http://emite.googlecode.com">http://emite.googlecode.com</a> +</p> +<p>Copyright: under GNU Lesser General Public License +<a href="http://www.gnu.org/licenses/lgpl.html">http://www.gnu.org/licenses/lgpl.html</a> +</p> +<p><strong>fonts-min.css and reset.css</strong> +</p> +<p>Copyright (c) 2007, Yahoo! Inc. All rights reserved. +Code licensed under the BSD License:<br/> +<a href="http://developer.yahoo.net/yui/license.txt">http://developer.yahoo.net/yui/license.txt</a> +</p> +<p><strong>ext-gwt gxt library</strong> +</p> +<p><a href="http://www.sencha.com/products/extgwt/">http://www.sencha.com/products/extgwt/</a> +</p> +<p>Copyright: under GNU General Public License +<a href="http://www.gnu.org/copyleft/gpl.html">http://www.gnu.org/copyleft/gpl.html</a> +</p> +<p><strong>gwt-ext (use deprecated) library</strong> +</p> +<p><a href="http://code.google.com/p/gwt-ext/">http://code.google.com/p/gwt-ext/</a> +</p> +<p>Copyright under GNU Lesser General Public License +<a href="http://www.gnu.org/licenses/lgpl.html">http://www.gnu.org/licenses/lgpl.html</a> +</p> +<p><strong>google-gin library</strong> +</p> +<p><a href="https://code.google.com/p/google-gin/">https://code.google.com/p/google-gin/</a> +</p> +<p>Copyright under Apache License 2.0<br/> +<a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a> +</p> +<p><strong>gwt-platform library</strong> +</p> +<p><a href="https://code.google.com/p/gwt-platform/">https://code.google.com/p/gwt-platform/</a> +</p> +<p>Copyright under Apache License 2.0<br/> +<a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a> +</p> +<p><strong>dom region library</strong> +</p> +<p>XWiki Platform <a href="http://www.xwiki.org/">http://www.xwiki.org/</a> +</p> +<p>Copyright under GNU Lesser General Public License +<a href="http://www.gnu.org/licenses/lgpl.html">http://www.gnu.org/licenses/lgpl.html</a> +</p> +<p><strong>cortado applet</strong> +</p> +<p>A video player java applet (Ogg Theora, Ogg Vorbis) +<a href="http://www.flumotion.net/cortado/">http://www.flumotion.net/cortado/</a><br/> +Copyright: (C) 2004 Fluendo S.L under GNU General Public License +</p> +<p><strong>video embed dialog</strong> +</p> +<p>Some ideas and embedded video code from +</p><ul> + <li><a href="http://www.jovelstefan.de/embedded-video/">http://www.jovelstefan.de/embedded-video/</a> (GPL) + </li><li><a href="http://www.daburna.de/blog/2006/12/13/wordpress-video-plugin/">http://www.daburna.de/blog/2006/12/13/wordpress-video-plugin/</a> +</li></ul> +<p><strong>some license descriptions</strong> +</p> +<p>from Wikipedia (English) <a href="http://en.wikipedia.org/">http://en.wikipedia.org/</a> +Copyright under GFDL <a href="http://www.gnu.org/copyleft/fdl.html">http://www.gnu.org/copyleft/fdl.html</a> +</p> +<p><strong>some Action classes</strong> +</p> +<p>from GNU Classpath<br/> +Copyright under GNU General Public License +<a href="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</a></p> + +</body> +</html> Added: intro/war/frame-def.css =================================================================== --- intro/war/frame-def.css (rev 0) +++ intro/war/frame-def.css 2011-05-09 10:28:32 UTC (rev 1362) @@ -0,0 +1,28 @@ +/* +Copyright (c) 2007, Yahoo! Inc. All rights reserved. +Code licensed under the BSD License: +http://developer.yahoo.net/yui/license.txt +version: 2.3.1 +*/body{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:400;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:400;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup,sub{line-height:-1px;vertical-align:text-top;}sub{vertical-align:text-bottom;}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;}/* +Copyright (c) 2007, Yahoo! Inc. All rights reserved. +Code licensed under the BSD License: +http://developer.yahoo.net/yui/license.txt +version: 2.3.1 +*/body{font:13px/1.22 arial,helvetica,clean,sans-serif;font-size:small;font:x-small;}table{font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;font-size:108%;line-height:99%;}/* +Copyright (c) 2007, Yahoo! Inc. All rights reserved. +Code licensed under the BSD License: +http://developer.yahoo.net/yui/license.txt +version: 2.4.1 +*/h1{font-size:138.5%;}h2{font-size:123.099998%;}h3{font-size:108%;}h1,h2,h3{margin:1em 0;}h1,h2,h3,h4,h5,h6,strong{font-weight:700;}abbr,acronym{border-bottom:1px dotted #000;cursor:help;}em{font-style:italic;}blockquote,ul,ol,dl{margin:1em;}ol,ul,dl{margin-left:2em;}ol li{list-style:decimal outside;}ul li{list-style:disc outside;}dl dd{margin-left:1em;}th,td{border:1px solid #000;padding:.5em;}th{font-weight:700;text-align:center;}caption{margin-bottom:.5em;text-align:center;}p,fieldset,table,pre{margin-bottom:1em;}input[type=text],input[type=password],textarea{width:12.25em;width:11.9em;}body{font-family:arial, sans;margin:5px;}.k-rte-comment{border:1px dashed silver;line-height:1.4;padding:1px;background-color:#D7FFD7;}blockquote{border:1px dashed #DDD;padding:10px;} + +body { + color: brown; + font-family: 'Ubuntu', Arial; + font-size: 17px; + background-color: transparent; + padding: 0px 15px; +} + +a { + color: #69312F; +} \ No newline at end of file Added: intro/war/kuneintro/0A9476898799A150D840F0B1C3672921.cache.png =================================================================== (Binary files differ) Property changes on: intro/war/kuneintro/0A9476898799A150D840F0B1C3672921.cache.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: intro/war/kuneintro/19BC1A361F2B7956E2DD818E86A811BD.cache.html =================================================================== --- intro/war/kuneintro/19BC1A361F2B7956E2DD818E86A811BD.cache.html (rev 0) +++ intro/war/kuneintro/19BC1A361F2B7956E2DD818E86A811BD.cache.html 2011-05-09 10:28:32 UTC (rev 1362) @@ -0,0 +1,592 @@ +<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.1.1";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = '19BC1A361F2B7956E2DD818E86A811BD';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'kuneintro',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script></script> +<script></script> +<script></script></body></html> \ No newline at end of file Added: intro/war/kuneintro/2395ED86C3E2109E1C70A54B34EE32A8.cache.html =================================================================== --- intro/war/kuneintro/2395ED86C3E2109E1C70A54B34EE32A8.cache.html (rev 0) +++ intro/war/kuneintro/2395ED86C3E2109E1C70A54B34EE32A8.cache.html 2011-05-09 10:28:32 UTC (rev 1362) @@ -0,0 +1,563 @@ +<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.1.1";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = '2395ED86C3E2109E1C70A54B34EE32A8';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'kuneintro',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script></script> +<script></script> +<script></script> +<script></script></body></html> \ No newline at end of file Added: intro/war/kuneintro/365A1152800FA0737250805ADEAAFABF.cache.png =================================================================== (Binary files differ) Property changes on: intro/war/kuneintro/365A1152800FA0737250805ADEAAFABF.cache.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: intro/war/kuneintro/396F806CD63ABD414BFBB9D57429F05B.cache.png =================================================================== (Binary files differ) Property changes on: intro/war/kuneintro/396F806CD63ABD414BFBB9D57429F05B.cache.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: intro/war/kuneintro/409D47324359E3F14C463CFDFEAE25A4.cache.png =================================================================== (Binary files differ) Property changes on: intro/war/kuneintro/409D47324359E3F14C463CFDFEAE25A4.cache.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: intro/war/kuneintro/562FC548B41DADF6F2F1ADD57F46ADD9.cache.html =================================================================== --- intro/war/kuneintro/562FC548B41DADF6F2F1ADD57F46ADD9.cache.html (rev 0) +++ intro/war/kuneintro/562FC548B41DADF6F2F1ADD57F46ADD9.cache.html 2011-05-09 10:28:32 UTC (rev 1362) @@ -0,0 +1,570 @@ +<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.1.1";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = '562FC548B41DADF6F2F1ADD57F46ADD9';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'kuneintro',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script></script> +<script></script> +<script></script> +<script></script></body></html> \ No newline at end of file Added: intro/war/kuneintro/7F5A6E1CFA1AA01985107DFB19A18960.cache.html =================================================================== --- intro/war/kuneintro/7F5A6E1CFA1AA01985107DFB19A18960.cache.html (rev 0) +++ intro/war/kuneintro/7F5A6E1CFA1AA01985107DFB19A18960.cache.html 2011-05-09 10:28:32 UTC (rev 1362) @@ -0,0 +1,556 @@ +<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.1.1";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = '7F5A6E1CFA1AA01985107DFB19A18960';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'kuneintro',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script></script> +<script></script> +<script></script> +<script></script></body></html> \ No newline at end of file Added: intro/war/kuneintro/C068E077B2DA853B0A008F72CAD53F7E.cache.html =================================================================== --- intro/war/kuneintro/C068E077B2DA853B0A008F72CAD53F7E.cache.html (rev 0) +++ intro/war/kuneintro/C068E077B2DA853B0A008F72CAD53F7E.cache.html 2011-05-09 10:28:32 UTC (rev 1362) @@ -0,0 +1,563 @@ +<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.1.1";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = 'C068E077B2DA853B0A008F72CAD53F7E';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'kuneintro',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script></script> +<script></script> +<script></script> +<script></script></body></html> \ No newline at end of file Added: intro/war/kuneintro/DF7764EEC1903CD03C9545B354D8D8E4.cache.png =================================================================== (Binary files differ) Property changes on: intro/war/kuneintro/DF7764EEC1903CD03C9545B354D8D8E4.cache.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: intro/war/kuneintro/E44767377485D18D6B6864F65BA8EF73.cache.png =================================================================== (Binary files differ) Property changes on: intro/war/kuneintro/E44767377485D18D6B6864F65BA8EF73.cache.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: intro/war/kuneintro/EDC7827FEEA59EE44AD790B1C6430C45.cache.png =================================================================== (Binary files differ) Property changes on: intro/war/kuneintro/EDC7827FEEA59EE44AD790B1C6430C45.cache.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: intro/war/kuneintro/clear.cache.gif =================================================================== (Binary files differ) Property changes on: intro/war/kuneintro/clear.cache.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: intro/war/kuneintro/hosted.html =================================================================== --- intro/war/kuneintro/hosted.html (rev 0) +++ intro/war/kuneintro/hosted.html 2011-05-09 10:28:32 UTC (rev 1362) @@ -0,0 +1,350 @@ +<html> +<head><script> +var $wnd = parent; +var $doc = $wnd.document; +var $moduleName, $moduleBase, $entry +,$stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null +,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null; +// Lightweight metrics +if ($stats) { + var moduleFuncName = location.search.substr(1); + var moduleFunc = $wnd[moduleFuncName]; + var moduleName = moduleFunc ? moduleFunc.moduleName : "unknown"; + $stats({moduleName:moduleName,sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'}); +} +var $hostedHtmlVersion="2.1"; + +var gwtOnLoad; +var $hosted = "localhost:9997"; + +function loadIframe(url) { + var topDoc = window.top.document; + + // create an iframe + var iframeDiv = topDoc.createElement("div"); + iframeDiv.innerHTML = "<iframe scrolling=no frameborder=0 src='" + url + "'>"; + var iframe = iframeDiv.firstChild; + + // mess with the iframe style a little + var iframeStyle = iframe.style; + iframeStyle.position = "absolute"; + iframeStyle.borderWidth = "0"; + iframeStyle.left = "0"; + iframeStyle.top = "0"; + iframeStyle.width = "100%"; + iframeStyle.backgroundColor = "#ffffff"; + iframeStyle.zIndex = "1"; + iframeStyle.height = "100%"; + + // update the top window's document's body's style + var hostBodyStyle = window.top.document.body.style; + hostBodyStyle.margin = "0"; + hostBodyStyle.height = iframeStyle.height; + hostBodyStyle.overflow = "hidden"; + + // insert the iframe + topDoc.body.insertBefore(iframe, topDoc.body.firstChild); +} + +var ua = navigator.userAgent.toLowerCase(); +if (ua.indexOf("gecko") != -1) { + // install eval wrapper on FF to avoid EvalError problem + var __eval = window.eval; + window.eval = function(s) { + return __eval(s); + } +} +if (ua.indexOf("chrome") != -1) { + // work around __gwt_ObjectId appearing in JS objects + var hop = Object.prototype.hasOwnProperty; + Object.prototype.hasOwnProperty = function(prop) { + return prop != "__gwt_ObjectId" && hop.call(this, prop); + }; + // do the same in our parent as well -- see issue 4486 + // NOTE: this will have to be changed when we support non-iframe-based DevMode + var hop2 = parent.Object.prototype.hasOwnProperty; + parent.Object.prototype.hasOwnProperty = function(prop) { + return prop != "__gwt_ObjectId" && hop2.call(this, prop); + }; +} + +// wrapper to call JS methods, which we need both to be able to supply a +// different this for method lookup and to get the exception back +function __gwt_jsInvoke(thisObj, methodName) { + try { + var args = Array.prototype.slice.call(arguments, 2); + return [0, window[methodName].apply(thisObj, args)]; + } catch (e) { + return [1, e]; + } +} + +var __gwt_javaInvokes = []; +function __gwt_makeJavaInvoke(argCount) { + return __gwt_javaInvokes[argCount] || __gwt_doMakeJavaInvoke(argCount); +} + +function __gwt_doMakeJavaInvoke(argCount) { + // IE6 won't eval() anonymous functions except as r-values + var argList = ""; + for (var i = 0; i < argCount; i++) { + argList += ",p" + i; + } + var argListNoComma = argList.substring(1); + + return eval( + "__gwt_javaInvokes[" + argCount + "] =\n" + + " function(thisObj, dispId" + argList + ") {\n" + + " var result = __static(dispId, thisObj" + argList + ");\n" + + " if (result[0]) {\n" + + " throw result[1];\n" + + " } else {\n" + + " return result[1];\n" + + " }\n" + + " }\n" + ); +} + +/* + * This is used to create tear-offs of Java methods. Each function corresponds + * to exactly one dispId, and also embeds the argument count. We get the "this" + * value from the context in which the function is being executed. + * Function-object identity is preserved by caching in a sparse array. + */ +var __gwt_tearOffs = []; +var __gwt_tearOffGenerators = []; +function __gwt_makeTearOff(proxy, dispId, argCount) { + return __gwt_tearOffs[dispId] || __gwt_doMakeTearOff(dispId, argCount); +} + +function __gwt_doMakeTearOff(dispId, argCount) { + return __gwt_tearOffs[dispId] = + (__gwt_tearOffGenerators[argCount] || __gwt_doMakeTearOffGenerator(argCount))(dispId); +} + +function __gwt_doMakeTearOffGenerator(argCount) { + // IE6 won't eval() anonymous functions except as r-values + var argList = ""; + for (var i = 0; i < argCount; i++) { + argList += ",p" + i; + } + var argListNoComma = argList.substring(1); + + return eval( + "__gwt_tearOffGenerators[" + argCount + "] =\n" + + " function(dispId) {\n" + + " return function(" + argListNoComma + ") {\n" + + " var result = __static(dispId, this" + argList + ");\n" + + " if (result[0]) {\n" + + " throw result[1];\n" + + " } else {\n" + + " return result[1];\n" + + " }\n" + + " }\n" + + " }\n" + ); +} + +function __gwt_makeResult(isException, result) { + return [isException, result]; +} + +function __gwt_disconnected() { + // Prevent double-invocation. + window.__gwt_disconnected = new Function(); + // Do it in a timeout so we can be sure we have a clean stack. + window.setTimeout(__gwt_disconnected_impl, 1); +} + +function __gwt_disconnected_impl() { + __gwt_displayGlassMessage('GWT Code Server Disconnected', + 'Most likely, you closed GWT Development Mode. Or, you might have lost ' + + 'network connectivity. To fix this, try restarting GWT Development Mode and ' + + '<a style="color: #FFFFFF; font-weight: bold;" href="javascript:location.reload()">' + + 'REFRESH</a> this page.'); +} + +// Note this method is also used by ModuleSpace.java +function __gwt_displayGlassMessage(summary, details) { + var topWin = window.top; + var topDoc = topWin.document; + var outer = topDoc.createElement("div"); + // Do not insert whitespace or outer.firstChild will get a text node. + outer.innerHTML = + '<div style="position:absolute;z-index:2147483646;left:0px;top:0px;right:0px;bottom:0px;filter:alpha(opacity=75);opacity:0.75;background-color:#000000;"></div>' + + '<div style="position:absolute;z-index:2147483647;left:50px;top:50px;width:600px;color:#FFFFFF;font-family:verdana;">' + + '<div style="font-size:30px;font-weight:bold;">' + summary + '</div>' + + '<p style="font-size:15px;">' + details + '</p>' + + '</div>' + ; + topDoc.body.appendChild(outer); + var glass = outer.firstChild; + var glassStyle = glass.style; + + // Scroll to the top and remove scrollbars. + topWin.scrollTo(0, 0); + if (topDoc.compatMode == "BackCompat") { + topDoc.body.style["overflow"] = "hidden"; + } else { + topDoc.documentElement.style["overflow"] = "hidden"; + } + + // Steal focus. + glass.focus(); + + if ((navigator.userAgent.indexOf("MSIE") >= 0) && (topDoc.compatMode == "BackCompat")) { + // IE quirks mode doesn't support right/bottom, but does support this. + glassStyle.width = "125%"; + glassStyle.height = "100%"; + } else if (navigator.userAgent.indexOf("MSIE 6") >= 0) { + // IE6 doesn't have a real standards mode, so we have to use hacks. + glassStyle.width = "125%"; // Get past scroll bar area. + // Nasty CSS; onresize would be better but the outer window won't let us add a listener IE. + glassStyle.setExpression("height", "document.documentElement.clientHeight"); + } + + $doc.title = summary + " [" + $doc.title + "]"; +} + +function findPluginObject() { + try { + return document.getElementById('pluginObject'); + } catch (e) { + return null; + } +} + +function findPluginEmbed() { + try { + return document.getElementById('pluginEmbed') + } catch (e) { + return null; + } +} + +function findPluginXPCOM() { + try { + return __gwt_HostedModePlugin; + } catch (e) { + return null; + } +} + +gwtOnLoad = function(errFn, modName, modBase){ + $moduleName = modName; + $moduleBase = modBase; + + // Note that the order is important + var pluginFinders = [ + findPluginXPCOM, + findPluginObject, + findPluginEmbed, + ]; + var topWin = window.top; + var url = topWin.location.href; + if (!topWin.__gwt_SessionID) { + var ASCII_EXCLAMATION = 33; + var ASCII_TILDE = 126; + var chars = []; + for (var i = 0; i < 16; ++i) { + chars.push(Math.floor(ASCII_EXCLAMATION + + Math.random() * (ASCII_TILDE - ASCII_EXCLAMATION + 1))); + } + topWin.__gwt_SessionID = String.fromCharCode.apply(null, chars); + } + var plugin = null; + for (var i = 0; i < pluginFinders.length; ++i) { + try { + var maybePlugin = pluginFinders[i](); + if (maybePlugin != null && maybePlugin.init(window)) { + plugin = maybePlugin; + break; + } + } catch (e) { + } + } + if (!plugin) { + // try searching for a v1 plugin for backwards compatibility + var found = false; + for (var i = 0; i < pluginFinders.length; ++i) { + try { + plugin = pluginFinders[i](); + if (plugin != null && plugin.connect($hosted, $moduleName, window)) { + return; + } + } catch (e) { + } + } + loadIframe("http://gwt.google.com/missing-plugin"); + } else { + if (plugin.connect(url, topWin.__gwt_SessionID, $hosted, $moduleName, + $hostedHtmlVersion)) { + window.onUnload = function() { + try { + // wrap in try/catch since plugins are not required to supply this + plugin.disconnect(); + } catch (e) { + } + }; + } else { + if (errFn) { + errFn(modName); + } else { + alert("Plugin failed to connect to hosted mode server at " + $hosted); + loadIframe("http://code.google.com/p/google-web-toolkit/wiki/TroubleshootingOOPHM"); + } + } + } +} + +window.onunload = function() { +}; + +// Lightweight metrics +window.fireOnModuleLoadStart = function(className) { + $stats && $stats({moduleName:$moduleName, sessionId:$sessionId, subSystem:'startup', evtGroup:'moduleStartup', millis:(new Date()).getTime(), type:'onModuleLoadStart', className:className}); +}; + +window.__gwt_module_id = 0; +</script></head> +<body> +<font face='arial' size='-1'>This html file is for hosted mode support.</font> +<script></script></body></html> Added: intro/war/kuneintro/kuneintro.nocache.js =================================================================== --- intro/war/kuneintro/kuneintro.nocache.js (rev 0) +++ intro/war/kuneintro/kuneintro.nocache.js 2011-05-09 10:28:32 UTC (rev 1362) @@ -0,0 +1,11 @@ +function kuneintro(){var Q='',wb='" for "gwt:onLoadErrorFn"',ub='" for "gwt:onPropertyErrorFn"',db='"><\/script>',fb='#',Ub='.cache.html',hb='/',Ob='19BC1A361F2B7956E2DD818E86A811BD',Pb='2395ED86C3E2109E1C70A54B34EE32A8',Qb='562FC548B41DADF6F2F1ADD57F46ADD9',Rb='7F5A6E1CFA1AA01985107DFB19A18960',Tb=':',ob='::',Wb='<script defer="defer">kuneintro.onInjectionDone(\'kuneintro\')<\/script>',cb='<script id="',rb='=',gb='?',tb='Bad handler "',Sb='C068E077B2DA853B0A008F72CAD53F7E',Vb='DOMContentLoaded',eb='SCRIPT',bb='__gwt_marker_kuneintro',ib='base',$='baseUrl',U='begin',T='bootstrap',kb='clear.cache.gif',qb='content',Z='end',Ib='gecko',Jb='gecko1_8',V='gwt.codesvr=',W='gwt.hosted=',X='gwt.hybrid',vb='gwt:onLoadErrorFn',sb='gwt:onPropertyErrorFn',pb='gwt:property',Mb='hosted.html?kuneintro',Hb='ie6',Gb='ie8',xb='iframe',jb='img',yb="javascript:''",R='kuneintro',ab='kuneintro.nocache.js',nb='kuneintro::',Lb='loadExternalRefs',lb='meta',Ab='moduleRequested',Y='moduleStartup',Fb='msie',mb='name',Cb='opera',zb='position:absolute;width:0;height:0;border:none',Eb='safari',_='script',Nb='selectingPermutation',S='startup',Kb='unknown',Bb='user.agent',Db='webkit';var m=window,n=document,o=m.__gwtStatsEvent?function(a){return m.__gwtStatsEvent(a)}:null,p=m.__gwtStatsSessionId?m.__gwtStatsSessionId:null,q,r,s,t=Q,u={},v=[],w=[],x=[],y=0,z,A;o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:T,millis:(new Date).getTime(),type:U});if(!m.__gwt_stylesLoaded){m.__gwt_stylesLoaded={}}if(!m.__gwt_scriptsLoaded){m.__gwt_scriptsLoaded={}}function B(){var b=false;try{var c=m.location.search;return (c.indexOf(V)!=-1||(c.indexOf(W)!=-1||m.external&&m.external.gwtOnLoad))&&c.indexOf(X)==-1}catch(a){}B=function(){return b};return b} +function C(){if(q&&r){var b=n.getElementById(R);var c=b.contentWindow;if(B()){c.__gwt_getProperty=function(a){return I(a)}}kuneintro=null;c.gwtOnLoad(z,R,t,y);o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:Y,millis:(new Date).getTime(),type:Z})}} +function D(){if(u[$]){t=u[$];return t}var e;var f=n.getElementsByTagName(_);for(var g=0;g<f.length;++g){if(f[g].src.indexOf(ab)!=-1){e=f[g]}}if(!e){var h=bb;var i;n.write(cb+h+db);i=n.getElementById(h);e=i&&i.previousSibling;while(e&&e.tagName!=eb){e=e.previousSibling}}function j(a){var b=a.lastIndexOf(fb);if(b==-1){b=a.length}var c=a.indexOf(gb);if(c==-1){c=a.length}var d=a.lastIndexOf(hb,Math.min(c,b));return d>=0?a.substring(0,d+1):Q} +;if(e&&e.src){t=j(e.src)}if(t==Q){var k=n.getElementsByTagName(ib);if(k.length>0){t=k[k.length-1].href}else{t=j(n.location.href)}}else if(t.match(/^\w+:\/\//)){}else{var l=n.createElement(jb);l.src=t+kb;t=j(l.src)}if(i){i.parentNode.removeChild(i)}return t} +function E(){var b=document.getElementsByTagName(lb);for(var c=0,d=b.length;c<d;++c){var e=b[c],f=e.getAttribute(mb),g;if(f){f=f.replace(nb,Q);if(f.indexOf(ob)>=0){continue}if(f==pb){g=e.getAttribute(qb);if(g){var h,i=g.indexOf(rb);if(i>=0){f=g.substring(0,i);h=g.substring(i+1)}else{f=g;h=Q}u[f]=h}}else if(f==sb){g=e.getAttribute(qb);if(g){try{A=eval(g)}catch(a){alert(tb+g+ub)}}}else if(f==vb){g=e.getAttribute(qb);if(g){try{z=eval(g)}catch(a){alert(tb+g+wb)}}}}}} +function H(a,b){var c=x;for(var d=0,e=a.length-1;d<e;++d){c=c[a[d]]||(c[a[d]]=[])}c[a[e]]=b} +function I(a){var b=w[a](),c=v[a];if(b in c){return b}var d=[];for(var e in c){d[c[e]]=e}if(A){A(a,d,b)}throw null} +var J;function K(){if(!J){J=true;var a=n.createElement(xb);a.src=yb;a.id=R;a.style.cssText=zb;a.tabIndex=-1;n.body.appendChild(a);o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:Y,millis:(new Date).getTime(),type:Ab});a.contentWindow.location.replace(t+M)}} +w[Bb]=function(){var b=navigator.userAgent.toLowerCase();var c=function(a){return parseInt(a[1])*1000+parseInt(a[2])};if(b.indexOf(Cb)!=-1){return Cb}else if(b.indexOf(Db)!=-1){return Eb}else if(b.indexOf(Fb)!=-1){if(document.documentMode>=8){return Gb}else{var d=/msie ([0-9]+)\.([0-9]+)/.exec(b);if(d&&d.length==3){var e=c(d);if(e>=6000){return Hb}}}}else if(b.indexOf(Ib)!=-1){return Jb}return Kb};v[Bb]={gecko1_8:0,ie6:1,ie8:2,opera:3,safari:4};kuneintro.onScriptLoad=function(){if(J){r=true;C()}};kuneintro.onInjectionDone=function(){q=true;o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:Lb,millis:(new Date).getTime(),type:Z});C()};E();D();var L;var M;if(B()){if(m.external&&(m.external.initModule&&m.external.initModule(R))){m.location.reload();return}M=Mb;L=Q}o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:T,millis:(new Date).getTime(),type:Nb});if(!B()){try{H([Hb],Ob);H([Jb],Pb);H([Eb],Qb);H([Cb],Rb);H([Gb],Sb);L=x[I(Bb)];var N=L.indexOf(Tb);if(N!=-1){y=Number(L.substring(N+1));L=L.substring(0,N)}M=L+Ub}catch(a){return}}var O;function P(){if(!s){s=true;C();if(n.removeEventListener){n.removeEventListener(Vb,P,false)}if(O){clearInterval(O)}}} +if(n.addEventListener){n.addEventListener(Vb,function(){K();P()},false)}var O=setInterval(function(){if(/loaded|complete/.test(n.readyState)){K();P()}},50);o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:T,millis:(new Date).getTime(),type:Z});o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:Lb,millis:(new Date).getTime(),type:U});n.write(Wb)} +kuneintro(); \ No newline at end of file

1 0

r1361 - trunk
by Samer . 08 May '11

08 May '11

Author: shevek Date: 2011-05-08 23:13:40 +0200 (Sun, 08 May 2011) New Revision: 1361 Modified: trunk/DEV-GUIDE Log: Clarified the need of the INSTALL guide in DEV-GUIDE Modified: trunk/DEV-GUIDE =================================================================== --- trunk/DEV-GUIDE 2011-05-08 19:54:34 UTC (rev 1360) +++ trunk/DEV-GUIDE 2011-05-08 21:13:40 UTC (rev 1361) @@ -6,9 +6,13 @@ ==Development Environment== +===Preliminars=== + +This guide will help you to develop in Kune. It deals with the prerrequisites of Kune and the setup of its environment. You should follow each step carefully. Make sure you deal with the following initial steps and only afterwards proceed to the details of the installation of Kune. As mentioned in the subsection "1.7:Install Kune" of this guide, you will need by then the document INSTALL (found in kune/trunk/INSTALL ), where you will find the details of the installation. + ===Initial steps=== -Install some basic tools (if don't have it). In debian and derivatives: +Install some basic tools (if you don't have them). In Ubuntu, Debian and derivatives: sudo apt-get install subversion maven2 mercurial @@ -100,7 +104,7 @@ ===Install Kune=== -Install Kune (follow the trunk/INSTALL file instructions) and run Kune for the first time. This will initialize the database, and configure the XMPP server, for instance. +Only after making sure the previous steps have been finished, you can proceed to the installation of Kune. For doing so, you need to follow the instructions of the document INSTALL, available in kune/trunk/INSTALL. Afterwards you will be able to run Kune for the first time. This will initialize the database, and configure the XMPP server, among other things. ===GWT's Hosted Mode===

1 0

r1360 - / intro intro/src intro/src/cc intro/src/cc/kune intro/src/cc/kune/intro intro/src/cc/kune/intro/client intro/test intro/test/cc intro/test/cc/kune intro/test/cc/kune/intro intro/war intro/war/WEB-INF
by Vicente J. Ruiz Jurado 08 May '11

08 May '11

Author: vjrj_ Date: 2011-05-08 21:54:34 +0200 (Sun, 08 May 2011) New Revision: 1360 Added: intro/ intro/.classpath intro/.project intro/src/ intro/src/cc/ intro/src/cc/kune/ intro/src/cc/kune/intro/ intro/src/cc/kune/intro/Kune_intro.gwt.xml intro/src/cc/kune/intro/client/ intro/src/cc/kune/intro/client/IntroTabPanel.java intro/src/cc/kune/intro/client/IntroTabPanel.ui.xml intro/src/cc/kune/intro/client/KuneIntro.java intro/src/cc/kune/intro/client/arrow-left-g.png intro/src/cc/kune/intro/client/arrow-left-h.png intro/src/cc/kune/intro/client/arrow-left.png intro/src/cc/kune/intro/client/arrow-right-g.png intro/src/cc/kune/intro/client/arrow-right-h.png intro/src/cc/kune/intro/client/arrow-right.png intro/src/cc/kune/intro/client/kune-intro-group.png intro/src/cc/kune/intro/client/kune-intro-logo.png intro/src/cc/kune/intro/client/kune-intro-orgs.png intro/src/cc/kune/intro/client/kune-intro-user.png intro/src/cc/kune/intro/client/kune-intro-world.png intro/test/ intro/test/cc/ intro/test/cc/kune/ intro/test/cc/kune/intro/ intro/test/cc/kune/intro/client/ intro/war/ intro/war/WEB-INF/ intro/war/WEB-INF/web.xml intro/war/kuneintro.css intro/war/kuneintro.html Log: kune intro Added: intro/.classpath =================================================================== --- intro/.classpath (rev 0) +++ intro/.classpath 2011-05-08 19:54:34 UTC (rev 1360) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="src" output="test-classes" path="test"/> + <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="war/WEB-INF/classes"/> +</classpath> Added: intro/.project =================================================================== --- intro/.project (rev 0) +++ intro/.project 2011-05-08 19:54:34 UTC (rev 1360) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>kune-intro</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>com.google.gdt.eclipse.core.webAppProjectValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>com.google.gwt.eclipse.core.gwtProjectValidator</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.google.gwt.eclipse.core.gwtNature</nature> + </natures> +</projectDescription> Added: intro/src/cc/kune/intro/Kune_intro.gwt.xml =================================================================== --- intro/src/cc/kune/intro/Kune_intro.gwt.xml (rev 0) +++ intro/src/cc/kune/intro/Kune_intro.gwt.xml 2011-05-08 19:54:34 UTC (rev 1360) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module rename-to='kuneintro'> +  + <inherits name='com.google.gwt.user.User'/> + +  +  +  + +  +  + +  + +  + <entry-point class='cc.kune.intro.client.KuneIntro'/> + +  + <source path='client'/> + +</module> Added: intro/src/cc/kune/intro/client/IntroTabPanel.java =================================================================== --- intro/src/cc/kune/intro/client/IntroTabPanel.java (rev 0) +++ intro/src/cc/kune/intro/client/IntroTabPanel.java 2011-05-08 19:54:34 UTC (rev 1360) @@ -0,0 +1,164 @@ +package cc.kune.intro.client; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.logical.shared.SelectionEvent; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.uibinder.client.UiHandler; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.DeckPanel; +import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.HTML; +import com.google.gwt.user.client.ui.HorizontalPanel; +import com.google.gwt.user.client.ui.InlineLabel; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.PushButton; +import com.google.gwt.user.client.ui.ScrollPanel; +import com.google.gwt.user.client.ui.TabLayoutPanel; +import com.google.gwt.user.client.ui.Widget; + +public class IntroTabPanel extends Composite { + + interface IntroTabPanelUiBinder extends UiBinder<Widget, IntroTabPanel> { + } + + private static IntroTabPanelUiBinder uiBinder = GWT.create(IntroTabPanelUiBinder.class); + + private static final String WHY_DO_WE_NEED = "Why do we need"; + @UiField + HorizontalPanel btnPanel; + @UiField + ScrollPanel credits; + @UiField + HTML creditsHtml; + private int currentSlide; + @UiField + DeckPanel deck; + @UiField + HTML groupsField; + @UiField + FlowPanel groupsPanel; + @UiField + HTML htmlIntro; + @UiField + FlowPanel intro; + @UiField + PushButton leftBtn; + @UiField + InlineLabel logo; + @UiField + HTML orgsField; + @UiField + FlowPanel orgsPanel; + @UiField + HTML publicField; + @UiField + FlowPanel publicPanel; + @UiField + PushButton rightBtn; + @UiField + TabLayoutPanel tabPanel; + @UiField + Label title; + @UiField + HTML usersField; + @UiField + FlowPanel usersPanel; + + public IntroTabPanel() { + initWidget(uiBinder.createAndBindUi(this)); + usersField.setHTML("You can see Kune as a web tool to:" + + "<ul><li>" + + "create easily your personal web (blogs, photoblog, CV, etc)" + + "</li><li>" + + "create, share & edit your documents simultaneously with your fellows" + + "</li><li>" + + "connect & keep up with your fellows (social network, chat)" + + "</li><li>" + + "integrate rich content (videos, maps, polls...) or functionalities (translation, spelling, twitter...)" + + "</ul>"); + groupsField.setHTML("For your organization (NGO, collective, academic group...) you can:" + + "<ul><li>" + "create easily its website (blog, wiki, video gallery, etc)" + "</li><li>" + + "group chat among the members" + "</li><li>" + "organize meetings and actions" + "</li><li>" + + "create, share & edit documents simultaneously with the members" + "</li><li>" + + "connect with other organizations with common interests" + "</ul>"); + publicField.setHTML("Kune facilitates..." + "<ul><li>" + + "the publication of contents in the web, for the general public" + "</li><li>" + + "using CreativeCommons licences that allow the reuse and modification of contents" + + "</li><li>" + "sharing of knowledge, solutions, researches, experiences with others " + + "</ul>"); + orgsField.setHTML("If you are a big institution, such as a University, Social Forum, or umbrella federation, you can:" + + "<ul><li>" + + "install your own independent Kune server for your members" + + "</li><li>" + + "customize your Kune features and plugins to fit your needs" + + "</li><li>" + + "boost collaboration among the members" + "</ul>"); + currentSlide = 0; + deck.setAnimationEnabled(false); + htmlIntro.setHTML("<div class=\"k-home-summary\">" + "<ul>" + + "<li class=\"tabUsers\">Comunicate with others</li>" + + "<li class=\"tabGroups\">Work in collaboration</li>" + + "<li class=\"tabPublic\">And share with the world</li>" + "</ul>" + "</div>"); + creditsHtml.setHTML("alñsidfjaklds"); + showCurrentSlide(); + } + + @UiHandler("leftBtn") + void onLeftBtnClick(final ClickEvent event) { + currentSlide = Math.max(0, currentSlide - 1); + showCurrentSlide(); + } + + @UiHandler("rightBtn") + void onRightBtnClick(final ClickEvent event) { + currentSlide = Math.min(5, currentSlide + 1); + showCurrentSlide(); + } + + @UiHandler("tabPanel") + void onTabPanelSelection(final SelectionEvent<Integer> event) { + currentSlide = tabPanel.getSelectedIndex() + 1; + } + + private void showCurrentSlide() { + switch (currentSlide) { + case 0: + deck.showWidget(0); + // title.setVisible(false); + break; + case 1: + deck.showWidget(1); + tabPanel.selectTab(currentSlide - 1); + title.setVisible(true); + title.setText(WHY_DO_WE_NEED); + break; + case 2: + deck.showWidget(1); + tabPanel.selectTab(currentSlide - 1); + title.setVisible(true); + title.setText(WHY_DO_WE_NEED); + break; + case 3: + deck.showWidget(1); + tabPanel.selectTab(currentSlide - 1); + title.setVisible(true); + title.setText(WHY_DO_WE_NEED); + break; + case 4: + deck.showWidget(1); + tabPanel.selectTab(currentSlide - 1); + // title.setVisible(true); + title.setText(WHY_DO_WE_NEED); + break; + case 5: + deck.showWidget(2); + // title.setText("Credits"); + title.setVisible(true); + break; + default: + break; + } + } +} Added: intro/src/cc/kune/intro/client/IntroTabPanel.ui.xml =================================================================== --- intro/src/cc/kune/intro/client/IntroTabPanel.ui.xml (rev 0) +++ intro/src/cc/kune/intro/client/IntroTabPanel.ui.xml 2011-05-08 19:54:34 UTC (rev 1360) @@ -0,0 +1,287 @@ +<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> +<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" + xmlns:g="urn:import:com.google.gwt.user.client.ui"> + <ui:style> + .parent { + width: 705px; + } + + .child { + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border-radius: 10px; + border: 4px solid #CEAD97; + background-color: #FFF5ED; + width: 100%; + } + + .tabscontainer { + background-color: #F0C6A0; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border-radius: 10px; + color: #CC6633; + -webkit-border-top-right-radius: 0px; + -moz-border-radius-topright: 0px; + border-top-right-radius: 0px; + -webkit-border-top-left-radius: 0px; -moz-border-radius-toplright 0px; + border-top-left-radius: 0px; + -webkit-border-bottom-right-radius: 0px; + -moz-border-radius-bottomright: 0px; + border-bottom-right-radius: 0px; + -webkit-border-bottom-left-radius: 0px; + -moz-border-radius-bottomleft: 0px; + border-bottom-left-radius: 0px; + height: 480px !important; + } + + .tab { + line-height: 1em; + } + + @external .k-home-summary .tabUsers .tabGroups .tabOrgs .tabPublic .gwt-TabLayoutPanelTab, .gwt-TabLayoutPanelTab, .gwt-TabLayoutPanelTab-selected; + .title { + font-size: 44px; + color: #69312f; + font-weight: bold; + text-align: left; + margin: 10px 18px; + width: 200px; + } + + .k-home-summary { + font-size: 32px; + color: #dd8a3d; + font-weight: bold; + white-space: nowrap; + } + + .k-home-summary li { + padding-left: 41px; + background-repeat: no-repeat; + background-position: 0 .2em; + line-height: 45px; + } + + .gwt-TabLayoutPanelTab { + background-color: #F3D4AE; + -webkit-border-top-right-radius: 10px; + -moz-border-radius-topright: 10px; + border-top-right-radius: 10px; + -webkit-border-top-left-radius: 10px; + -moz-border-radius-topleft: 10px; + border-top-left-radius: 10px; + font-weight: bold; + font-size: 28px; + padding: 6px 5px; + margin: 0 0 0 10px; + cursor: pointer; + } + + .gwt-TabLayoutPanelTab { /* background-color: #ffccaa; */ + color: #dd8a3d; + } + + .gwt-TabLayoutPanelTab-selected { + background-color: #F9EFCB; + color: #69312f; + } + + .tabPanel { + font-size: 28px; + line-height: 1.2em; + color: #69312f; + background-color: #F9EFCB; + /* height: 360px; */ + height: 84%; + padding: 30px; + -webkit-border-top-right-radius: 10px; + -moz-border-radius-topright: 10px; + border-top-right-radius: 10px; + -webkit-border-top-left-radius: 0px; + -moz-border-radius-topleft: 0px; + border-top-left-radius: 0px; + -webkit-border-bottom-right-radius: 5px; + -moz-border-radius-bottomright: 5px; + border-bottom-right-radius: 5px; + -webkit-border-bottom-left-radius: 5px; + -moz-border-radius-bottomleft: 5px; + border-bottom-left-radius: 5px; + margin: 0px 10px 10px; + } + + .tabPanel li { + margin-left: -12px; + } + + .left { + float: left; + } + + .right { + float: right; + } + + @sprite .logo { + gwt-image: "kuneLogo"; + margin: 23px 23px; + } + + @sprite .tabUsers { + gwt-image: "usersLogo"; + padding: 1px 3px; + } + + @sprite .tabGroups { + gwt-image: "groupsLogo"; + padding: 1px 3px; + } + + @sprite .tabPublic { + gwt-image: "publicLogo"; + padding: 1px 3px; + } + + @sprite .tabOrgs { + gwt-image: "orgsLogo"; + padding: 1px 3px; + } + + @sprite .arrowLeft { + gwt-image: "arrowLeft"; + } + + @sprite .arrowLeftDown { + gwt-image: "arrowLeftDown"; + } + + @sprite .arrowRightDown { + gwt-image: "arrowRightDown"; + } + + @sprite .arrowLeftHover { + gwt-image: "arrowLeftHover"; + } + + @sprite .arrowRightHover { + gwt-image: "arrowRightHover"; + } + + .arrowbtns { + -webkit-border-top-right-radius: 10px; + -moz-border-radius-topright: 10px; + border-top-right-radius: 10px; + -webkit-border-top-left-radius: 10px; + -moz-border-radius-topleft: 10px; + border-top-left-radius: 10px; + background-color: #C28D66; + width: 67px; + margin-left: 529px; + margin-top: 5px; + } + + .arrowbtn { + cursor: pointer; + padding: 6px 8px 2px; + outline: 0; + } + </ui:style> + + <ui:image field="kuneLogo" src="kune-intro-logo.png"></ui:image> + <ui:image field="usersLogo" src="kune-intro-user.png"></ui:image> + <ui:image field="groupsLogo" src="kune-intro-group.png"></ui:image> + <ui:image field="publicLogo" src="kune-intro-world.png"></ui:image> + <ui:image field="orgsLogo" src="kune-intro-orgs.png"></ui:image> + + <ui:image field="arrowLeft" src="arrow-left.png"></ui:image> + <ui:image field="arrowRight" src="arrow-right.png"></ui:image> + <ui:image field="arrowLeftDown" src="arrow-left-g.png"></ui:image> + <ui:image field="arrowRightDown" src="arrow-right-g.png"></ui:image> + <ui:image field="arrowLeftHover" src="arrow-left-h.png"></ui:image> + <ui:image field="arrowRightHover" src="arrow-right-h.png"></ui:image> + + <g:FlowPanel addStyleNames="{style.parent}"> + <g:FlowPanel addStyleNames="{style.child}"> + <g:InlineLabel addStyleNames="{style.logo} {style.right}" + ui:field="logo" /> + <g:Label addStyleNames="{style.title}" ui:field="title">Why do we + need</g:Label> + <g:DeckPanel ui:field="deck" addStyleNames="{style.tabscontainer}"> + <g:FlowPanel ui:field="intro"> + <g:HTML wordWrap="true" ui:field="htmlIntro" /> + </g:FlowPanel> + <g:TabLayoutPanel barHeight="56" barUnit="PX" + width="100%" height="480px" ui:field="tabPanel"> + <g:tab> + <g:header> + <div class="{style.tab}"> + <span class="{style.tabUsers} {style.left}"></span> + <span>Users</span> + </div> + </g:header> + <g:FlowPanel ui:field="usersPanel" + addStyleNames="{style.tabPanel}"> + <g:HTML wordWrap="true" ui:field="usersField" /> + </g:FlowPanel> + </g:tab> + <g:tab> + <g:header> + <div class="{style.tab}"> + <span class="{style.tabGroups} {style.left}"></span> + <span>Groups</span> + </div> + </g:header> + <g:FlowPanel ui:field="groupsPanel"> + <g:HTML wordWrap="true" ui:field="groupsField" + addStyleNames="{style.tabPanel}" /> + </g:FlowPanel> + </g:tab> + <g:tab> + <g:header> + <div class="{style.tab}"> + <span class="{style.tabPublic} {style.left}"></span> + <span>Public</span> + </div> + </g:header> + <g:FlowPanel ui:field="publicPanel"> + <g:HTML wordWrap="true" ui:field="publicField" + addStyleNames="{style.tabPanel}" /> + </g:FlowPanel> + </g:tab> + <g:tab> + <g:header> + <div class="{style.tab}"> + <span class="{style.tabOrgs} {style.left}"></span> + <span>Institutions</span> + </div> + </g:header> + <g:FlowPanel ui:field="orgsPanel"> + <g:HTML wordWrap="true" ui:field="orgsField" + addStyleNames="{style.tabPanel}" /> + </g:FlowPanel> + </g:tab> + </g:TabLayoutPanel> + <g:ScrollPanel ui:field="credits"> + <g:HTML wordWrap="true" ui:field="creditsHtml" /> + </g:ScrollPanel> + </g:DeckPanel> + <g:HorizontalPanel ui:field="btnPanel" + styleName="{style.arrowbtns} "> + <g:PushButton ui:field='leftBtn' enabled='true' + addStyleNames="{style.arrowbtn}"> + <g:upFace image='{arrowLeft}' /> + <g:upHoveringFace image='{arrowLeftHover}' /> + <g:downFace image='{arrowLeftDown}' /> + <g:downHoveringFace image='{arrowLeftDown}' /> + </g:PushButton> + <g:PushButton ui:field='rightBtn' enabled='true' + addStyleNames="{style.arrowbtn}"> + <g:upFace image='{arrowRight}' /> + <g:upHoveringFace image='{arrowRightHover}' /> + <g:downFace image='{arrowRightDown}' /> + <g:downHoveringFace image='{arrowRightDown}' /> + </g:PushButton> + </g:HorizontalPanel> + </g:FlowPanel> + </g:FlowPanel> +</ui:UiBinder> \ No newline at end of file Added: intro/src/cc/kune/intro/client/KuneIntro.java =================================================================== --- intro/src/cc/kune/intro/client/KuneIntro.java (rev 0) +++ intro/src/cc/kune/intro/client/KuneIntro.java 2011-05-08 19:54:34 UTC (rev 1360) @@ -0,0 +1,19 @@ +package cc.kune.intro.client; + +import com.google.gwt.core.client.EntryPoint; +import com.google.gwt.user.client.ui.RootPanel; + +/** + * Entry point classes define <code>onModuleLoad()</code>. + */ +public class KuneIntro implements EntryPoint { + + /** + * This is the entry point method. + */ + @Override + public void onModuleLoad() { + final IntroTabPanel tabPanel = new IntroTabPanel(); + RootPanel.get().add(tabPanel); + } +} Added: intro/src/cc/kune/intro/client/arrow-left-g.png =================================================================== (Binary files differ) Property changes on: intro/src/cc/kune/intro/client/arrow-left-g.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: intro/src/cc/kune/intro/client/arrow-left-h.png =================================================================== (Binary files differ) Property changes on: intro/src/cc/kune/intro/client/arrow-left-h.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: intro/src/cc/kune/intro/client/arrow-left.png =================================================================== (Binary files differ) Property changes on: intro/src/cc/kune/intro/client/arrow-left.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: intro/src/cc/kune/intro/client/arrow-right-g.png =================================================================== (Binary files differ) Property changes on: intro/src/cc/kune/intro/client/arrow-right-g.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: intro/src/cc/kune/intro/client/arrow-right-h.png =================================================================== (Binary files differ) Property changes on: intro/src/cc/kune/intro/client/arrow-right-h.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: intro/src/cc/kune/intro/client/arrow-right.png =================================================================== (Binary files differ) Property changes on: intro/src/cc/kune/intro/client/arrow-right.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: intro/src/cc/kune/intro/client/kune-intro-group.png =================================================================== (Binary files differ) Property changes on: intro/src/cc/kune/intro/client/kune-intro-group.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: intro/src/cc/kune/intro/client/kune-intro-logo.png =================================================================== (Binary files differ) Property changes on: intro/src/cc/kune/intro/client/kune-intro-logo.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: intro/src/cc/kune/intro/client/kune-intro-orgs.png =================================================================== (Binary files differ) Property changes on: intro/src/cc/kune/intro/client/kune-intro-orgs.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: intro/src/cc/kune/intro/client/kune-intro-user.png =================================================================== (Binary files differ) Property changes on: intro/src/cc/kune/intro/client/kune-intro-user.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: intro/src/cc/kune/intro/client/kune-intro-world.png =================================================================== (Binary files differ) Property changes on: intro/src/cc/kune/intro/client/kune-intro-world.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: intro/war/WEB-INF/web.xml =================================================================== --- intro/war/WEB-INF/web.xml (rev 0) +++ intro/war/WEB-INF/web.xml 2011-05-08 19:54:34 UTC (rev 1360) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE web-app + PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> + +<web-app> + +  + <welcome-file-list> + <welcome-file>kuneintro.html</welcome-file> + </welcome-file-list> + +</web-app> Added: intro/war/kuneintro.css =================================================================== --- intro/war/kuneintro.css (rev 0) +++ intro/war/kuneintro.css 2011-05-08 19:54:34 UTC (rev 1360) @@ -0,0 +1,4 @@ +body { + font-family: 'Ubuntu', Arial; +} + Added: intro/war/kuneintro.html =================================================================== --- intro/war/kuneintro.html (rev 0) +++ intro/war/kuneintro.html 2011-05-08 19:54:34 UTC (rev 1360) @@ -0,0 +1,51 @@ +<!doctype html> + + + + + + +<html> +<head> +<meta http-equiv="content-type" content="text/html; charset=UTF-8"> + + + + +<link type="text/css" rel="stylesheet" href="kuneintro.css"> +<script src="//ajax.googleapis.com/ajax/libs/webfont/1/webfont.js"></script> +<script> + WebFont.load({ + google : { + families : [ 'Ubuntu' ] + } + }); +</script> + +<title></title> + + + + + + +<script type="text/javascript" language="javascript" + src="kuneintro/kuneintro.nocache.js"></script> +</head> + +<body> + +  + <iframe src="javascript:''" id="__gwt_historyFrame" tabIndex='-1' + style="position: absolute; width: 0; height: 0; border: 0"></iframe> + +  + <noscript> + <div + style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif"> + Your web browser must have JavaScript enabled in order for this + application to display correctly.</div> + </noscript> + +</body> +</html>

1 0

r1359 - trunk
by Samer . 08 May '11

08 May '11

Author: shevek Date: 2011-05-08 19:00:35 +0200 (Sun, 08 May 2011) New Revision: 1359 Modified: trunk/COPYRIGHT trunk/CREDITS Log: Credits and Copyright revisited Modified: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2011-05-07 18:46:51 UTC (rev 1358) +++ trunk/COPYRIGHT 2011-05-08 17:00:35 UTC (rev 1359) @@ -1,11 +1,12 @@ LICENSES -------------------------------------------------------------------------------- -All programs are either under the GPL, LGPL, Artistic or BSD licenses, see +All programs are either under the AGPL, GPL, LGPL, Artistic or BSD licenses, see below for details. On Debian systems, the complete text of these licenses can be found in: +/usr/share/common-licenses/AGPL /usr/share/common-licenses/GPL-3 /usr/share/common-licenses/Artistic /usr/share/common-licenses/BSD @@ -56,12 +57,12 @@ some icons -------------------------------------------------------------------------------- -It was downloaded from http://tango.freedesktop.org/ +Some were downloaded from http://tango.freedesktop.org/ Copyright: Creative Commons Attribution-ShareAlike 2.5 License Agreement http://creativecommons.org/licenses/by-sa/2.5/ -other from: http://www.famfamfam.com/lab/icons/silk/ +others from: http://www.famfamfam.com/lab/icons/silk/ Copyright: Creative Commons Attribution 2.5 License Agreement http://creativecommons.org/licenses/by/2.5/ @@ -72,13 +73,13 @@ published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. -and others icons from openoffice.org-style-human debian package +and other icons from openoffice.org-style-human debian package Copyright 2002-2007 Sun Microsystems, Inc. This product is made available subject to the terms of GNU Lesser General Public License Version 2.1. A copy of the LGPL license can be found http://www.openoffice.org/project/www/license.html -others +other stuff (libraries, etc) -------------------------------------------------------------------------------- wave / wave in a box @@ -124,6 +125,7 @@ emoticons from Adium and Kopete theme kopete adium theme by robotangel and original "Adiumicons" by Oscar Gruno under GNU GPL license + http://www.gnu.org/copyleft/gpl.html dom region library: XWiki Platform @@ -137,12 +139,12 @@ Copyright: (C) 2004 Fluendo S.L under GNU General Public License video embed dialog: - Some ideas and embeded video code from: + Some ideas and embedded video code from: http://www.jovelstefan.de/embedded-video/ (GPL) http://www.daburna.de/blog/2006/12/13/wordpress-video-plugin/ -some license description: - from Wikipedia +some license descriptions: + from Wikipedia (English) http://en.wikipedia.org/ Copyright: under GFDL http://www.gnu.org/copyleft/fdl.html some Action classes: Modified: trunk/CREDITS =================================================================== --- trunk/CREDITS 2011-05-07 18:46:51 UTC (rev 1358) +++ trunk/CREDITS 2011-05-08 17:00:35 UTC (rev 1359) @@ -11,14 +11,12 @@ Contributors -------------------------------------------------------------------------------- -* Thanks to David Trigo and http://www.esperanto-es.net/ for suggest the name of -'kune' for our initiative: +* Thanks to David Trigo and http://www.esperanto-es.net/ for suggesting the name of 'kune' for our initiative: http://ourproject.org/forum/forum.php?thread_id=500&forum_id=469 -* Antonio Martins, Jéferson Assumção, Moacir Gadotti and the Instituto Paulo -Freire staff. -* Javier Picado Ladrón de Guevara and the <URL:http://iepala.es> staff for their support and infraestructure +* Antonio Martins, Jéferson Assumção, Moacir Gadotti and the Instituto Paulo Freire staff +* Javier Picado Ladrón de Guevara and the <URL:http://iepala.es> staff for their support and infrastructure * Javier de la Cueva and Leovigildo García-Bobadilla for the legal support -* Jonathan Araña Cruz, Roxu and all the <URL:http://xsto.info> staff for help with the infraestructure +* Jonathan Araña Cruz, Roxu and all the <URL:http://xsto.info> staff for their help with the infrastructure * Daniel Jiménez for the initial help and coordination -* Johnattan Rupire and William Austen Bradbury for web contributions and translations. +* Johnattan Rupire and William Austen Bradbury for their web contributions and translations * and <URL:http://ourproject.org> and again <URL:http://xsto.info> and <URL:http://iepala.es> for sharing with us their resources

1 0

r1358 - in trunk: . img src/main/java/cc/kune/core/client src/main/java/cc/kune/core/client/init src/main/java/cc/kune/core/public src/main/java/cc/kune/core/public/images
by Vicente J. Ruiz Jurado 07 May '11

07 May '11

Author: vjrj_ Date: 2011-05-07 20:46:51 +0200 (Sat, 07 May 2011) New Revision: 1358 Added: trunk/img/kune-intro-group.png trunk/img/kune-intro-user.png trunk/img/kune-intro-world.png trunk/src/main/java/cc/kune/core/public/images/kune-anim-g.gif trunk/src/main/java/cc/kune/core/public/images/kune-intro-group.png trunk/src/main/java/cc/kune/core/public/images/kune-intro-user.png trunk/src/main/java/cc/kune/core/public/images/kune-intro-world.png Removed: trunk/HOWTO_ADD_A_NEW_TOOL Modified: trunk/img/kune-intro.svg trunk/src/main/java/cc/kune/core/client/CoreParts.java trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java trunk/src/main/java/cc/kune/core/public/ws.html Log: kune intro Deleted: trunk/HOWTO_ADD_A_NEW_TOOL =================================================================== --- trunk/HOWTO_ADD_A_NEW_TOOL 2011-05-07 15:55:38 UTC (rev 1357) +++ trunk/HOWTO_ADD_A_NEW_TOOL 2011-05-07 18:46:51 UTC (rev 1358) @@ -1,32 +0,0 @@ -Here we try to describe a easy way to add a new Tool of type "Foldeable", that is, a tool with a folder/files structure. For other kind of tools (like, for instance a rich Web Calendar tool), better start from scratch creating the NewTool{ClientTool|ClientActions|ServerTool} classes and implementing the specific functionality. - -The steps (substitute 'wiki' and 'Wiki' for the new tool name): - -cd src/main/java/org/ourproject/kune/ -rsync -r -C docs/ wiki -cd wiki/ -find . -name '*.java' | xargs rename 's/Document/Wiki/g' -find . -name '*.java' | xargs rename 's/Docs/Wiki/g' -find . -name '*.java' | xargs rename 's/Doc/Wiki/g' -find . -name '*.xml' | xargs rename 's/Docs/Wiki/g' -find . -name *java | xargs perl -p -i -e 's/Documents/Wiki/g' -find . -name *java | xargs perl -p -i -e 's/Document/Wiki/g' -find . -name *java | xargs perl -p -i -e 's/Docs/Wiki/g' -find . -name *java | xargs perl -p -i -e 's/Doc/Wiki/g' -find . -name *java | xargs perl -p -i -e 's/\.docs\./\.wiki\./g' -find . -name *java | xargs perl -p -i -e 's/documents/wiki/g' -find . -name *java | xargs perl -p -i -e 's/docs/wiki/g' - -Edit WikiClientTool and WikiServerTool and WikiClientActions with the specific actions and types the tool will have. - -Add - <inherits name='org.ourproject.kune.wiki.Kune-Wiki' /> -to Kune.gwt.xml - -Add - builder.use(new WikiServerModule()); -to KuneRackModule.java. - -Add the WikiClientModule to KuneEntryPoint. - - Added: trunk/img/kune-intro-group.png =================================================================== (Binary files differ) Property changes on: trunk/img/kune-intro-group.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/kune-intro-user.png =================================================================== (Binary files differ) Property changes on: trunk/img/kune-intro-user.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/kune-intro-world.png =================================================================== (Binary files differ) Property changes on: trunk/img/kune-intro-world.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/img/kune-intro.svg =================================================================== --- trunk/img/kune-intro.svg 2011-05-07 15:55:38 UTC (rev 1357) +++ trunk/img/kune-intro.svg 2011-05-07 18:46:51 UTC (rev 1358) @@ -22,10 +22,10 @@ pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" - inkscape:pageopacity="0.0" + inkscape:pageopacity="1" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="124.2033" + inkscape:cx="433.15576" inkscape:cy="320.54641" inkscape:document-units="px" inkscape:current-layer="layer1" @@ -433,8 +433,8 @@ </g> <g id="g8699-2" - transform="matrix(0.69032837,0,0,0.69032837,66.145968,308.75342)" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro-min.png" + transform="matrix(0.68695614,0,0,0.68695614,66.346124,311.85587)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro-group.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> <path @@ -892,8 +892,8 @@ style="font-size:32px;font-weight:bold;fill:#dd8a3d;fill-opacity:1;-inkscape-font-specification:Ubuntu Bold">Public</tspan></text> <g id="g8695-4" - transform="matrix(0.69032837,0,0,0.69032837,102.02122,263.35464)" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro-min.png" + transform="matrix(0.68695614,0,0,0.68695614,102.04613,266.67887)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro-user.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> <path @@ -924,9 +924,9 @@ transform="matrix(4.9493694,0,0,4.9493694,-42.107891,748.42974)" /> </g> <g - transform="matrix(0.69032837,0,0,0.69032837,30.270728,354.20632)" + transform="matrix(0.68695614,0,0,0.68695614,30.646132,357.08674)" id="g3297" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro-min.png" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro-world.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> <path Modified: trunk/src/main/java/cc/kune/core/client/CoreParts.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreParts.java 2011-05-07 15:55:38 UTC (rev 1357) +++ trunk/src/main/java/cc/kune/core/client/CoreParts.java 2011-05-07 18:46:51 UTC (rev 1358) @@ -14,20 +14,21 @@ public class CoreParts { - @Inject - public CoreParts(final Session session, final Provider<GroupSNPresenter> groupMembersPresenter, - final Provider<UserSNPresenter> buddiesAndParticipationPresenter, - final Provider<GroupSNConfActions> groupMembersConfActions, - final Provider<UserSNConfActions> userSNConfActions, final Provider<SiteUserOptionsPresenter> userOptions) { - session.onAppStart(true, new AppStartHandler() { - @Override - public void onAppStart(final AppStartEvent event) { - groupMembersConfActions.get(); - userSNConfActions.get(); - groupMembersPresenter.get(); - buddiesAndParticipationPresenter.get(); - userOptions.get(); - } - }); - } + @Inject + public CoreParts(final Session session, final Provider<GroupSNPresenter> groupMembersPresenter, + final Provider<UserSNPresenter> buddiesAndParticipationPresenter, + final Provider<GroupSNConfActions> groupMembersConfActions, + final Provider<UserSNConfActions> userSNConfActions, + final Provider<SiteUserOptionsPresenter> userOptions) { + session.onAppStart(true, new AppStartHandler() { + @Override + public void onAppStart(final AppStartEvent event) { + groupMembersConfActions.get(); + userSNConfActions.get(); + groupMembersPresenter.get(); + buddiesAndParticipationPresenter.get(); + userOptions.get(); + } + }); + } } Modified: trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2011-05-07 15:55:38 UTC (rev 1357) +++ trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2011-05-07 18:46:51 UTC (rev 1358) @@ -35,68 +35,70 @@ import com.google.gwt.user.client.Window.ClosingEvent; import com.google.gwt.user.client.Window.ClosingHandler; import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.ui.RootPanel; import com.google.inject.Inject; public class AppStarterDefault implements AppStarter { - private final EventBus eventBus; - private final PrefetchUtilities prefetchUtilities; - private final Session session; - private final SiteServiceAsync siteService; + private final EventBus eventBus; + private final PrefetchUtilities prefetchUtilities; + private final Session session; + private final SiteServiceAsync siteService; - @Inject - public AppStarterDefault(final Session session, final SiteServiceAsync siteService, final EventBus eventBus, - final PrefetchUtilities prefetchUtilities) { - this.session = session; - this.siteService = siteService; - this.eventBus = eventBus; - this.prefetchUtilities = prefetchUtilities; - Window.addWindowClosingHandler(new ClosingHandler() { - @Override - public void onWindowClosing(final ClosingEvent event) { - eventBus.fireEvent(new AppStopEvent()); - } - }); - } + @Inject + public AppStarterDefault(final Session session, final SiteServiceAsync siteService, + final EventBus eventBus, final PrefetchUtilities prefetchUtilities) { + this.session = session; + this.siteService = siteService; + this.eventBus = eventBus; + this.prefetchUtilities = prefetchUtilities; + Window.addWindowClosingHandler(new ClosingHandler() { + @Override + public void onWindowClosing(final ClosingEvent event) { + eventBus.fireEvent(new AppStopEvent()); + } + }); + } - private void getInitData() { - siteService.getInitData(session.getUserHash(), new AsyncCallback<InitDataDTO>() { - private void hideInitialPanels() { - } + private void getInitData() { + siteService.getInitData(session.getUserHash(), new AsyncCallback<InitDataDTO>() { + private void hideInitialPanels() { + RootPanel.get("kuneloading").setVisible(false); + } - @Override - public void onFailure(final Throwable error) { - eventBus.fireEvent(new ProgressHideEvent()); - eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, - "Error fetching initial data from Kune server")); - Log.debug(error.getMessage()); - hideInitialPanels(); - } + @Override + public void onFailure(final Throwable error) { + eventBus.fireEvent(new ProgressHideEvent()); + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, + "Error fetching initial data from Kune server")); + Log.debug(error.getMessage()); + hideInitialPanels(); + } - @Override - public void onSuccess(final InitDataDTO initData) { - session.setInitData(initData); - session.setCurrentUserInfo(initData.getUserInfo()); - eventBus.fireEvent(new AppStartEvent(initData)); - Scheduler.get().scheduleDeferred(new ScheduledCommand() { - @Override - public void execute() { - hideInitialPanels(); - } - }); - } + @Override + public void onSuccess(final InitDataDTO initData) { + session.setInitData(initData); + session.setCurrentUserInfo(initData.getUserInfo()); + eventBus.fireEvent(new AppStartEvent(initData)); + Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override + public void execute() { + hideInitialPanels(); + } }); - } + } + }); + } - @Override - public void start() { - prefetchUtilities.preFetchImpImages(); - getInitData(); - final Timer prefetchTimer = new Timer() { - @Override - public void run() { - prefetchUtilities.doTasksDeferred(); - } - }; - prefetchTimer.schedule(20000); - } + @Override + public void start() { + prefetchUtilities.preFetchImpImages(); + getInitData(); + final Timer prefetchTimer = new Timer() { + @Override + public void run() { + prefetchUtilities.doTasksDeferred(); + } + }; + prefetchTimer.schedule(20000); + } } Added: trunk/src/main/java/cc/kune/core/public/images/kune-anim-g.gif =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/public/images/kune-anim-g.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/public/images/kune-intro-group.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/public/images/kune-intro-group.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/public/images/kune-intro-user.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/public/images/kune-intro-user.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/public/images/kune-intro-world.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/public/images/kune-intro-world.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/core/public/ws.html =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.html 2011-05-07 15:55:38 UTC (rev 1357) +++ trunk/src/main/java/cc/kune/core/public/ws.html 2011-05-07 18:46:51 UTC (rev 1358) @@ -54,56 +54,122 @@ <link type="text/css" rel="stylesheet" href="ws.css"> <style type="text/css"> body { - background-color: white; - color: black; - font-family: 'Ubuntu', Arial; - font-size: small; - overflow: hidden; - } + background-color: white; + color: black; + font-family: 'Ubuntu', Arial; + font-size: small; + overflow: hidden; +} + +#kuneloading { + position: absolute; + left: 2%; + top: 2%; + z-index: 20001; + height: auto; + border: solid 2px #ccc; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + border-radius: 10px; + background-color: white; +} + +#kuneloading a { + color: #225588; +} + +#kuneloading .kuneloading-indicator { + color: #444; + font: bold 13px tahoma, arial, helvetica; + padding: 3px 3px 8px; + margin: 0; + height: auto; +} + +#kuneloading-msg { + font: normal 10px arial, tahoma, sans-serif; +} + #k-home-prewrap { - margin-top: -22px; + margin-top: -22px; } #k-home-wrapper { - margin-left: auto; - margin-right: auto; - position: relative; - width: 665px; - min-width: 320px; + margin-left: auto; + margin-right: auto; + position: relative; + width: 665px; + min-width: 320px; } -#k-home-logo { -float: right; -margin-top: 50px; -} - #k-home-ini { -clear: both; -font-size: 28px; -color: #69312f; -text-align: justify; -padding: 50px 0; -line-height: 1.3em; + clear: both; + font-size: 28px; + color: #69312f; + text-align: justify; + padding: 27px 0; + line-height: 1.3em; } #k-home-ini a { -color: #803000; -font-weight: bold; + color: #803000; + font-weight: bold; } #k-home-ini strong { -font-weight: bold; + font-weight: bold; } - #k-home-stats { -font-size: 22px; -color: #c87137; -font-weight: bold; + font-size: 22px; + color: #c87137; + font-weight: bold; } +#k-home-table { + display: table; +} + +#k-home-header { + display: table-row; +} + +#k-home-logo { + display: table-cell; + margin: 50px 0 22px 0; + float: right; +} + +#k-home-summary { + display: table-cell; + font-size: 32px; + color: #dd8a3d; + font-weight: bold; + white-space: nowrap; + float: left; +} + +#k-home-summary li { + padding-left: 41px; + background-repeat: no-repeat; + background-position: 0 .2em; + line-height: 45px; +} + +#k-home-row { + display: table-row; +} + +#k-home-left { + display: table-cell; +} + +#k-home-right { + display: table-cell; +} + .banner { - margin: 30px; + margin: 30px; } </style>  </head> <body> - -<div class="banner" id="banner"></div> - -<form method="post" action="javascript:void(0)" style="display: none"> -<input type="text" id="address" name="address" value="" /> <input - type="password" id="password" name="password" value="" /> <input - type="submit" value="Login" id="login" /> <input type="submit" - class="wiab le button" name="signIn" id="signIn" value="Sign in"> -</form> - -<noscript> -<div - style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif"> -Your web browser must have JavaScript enabled in order for this -application to display correctly.</div> -</noscript> -<iframe id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe> -<iframe src="" id="__download" style="width: 0; height: 0; border: 0"></iframe> - - - - - - - -<div id="k-home-prewrap"> -<div id="k-home-wrapper"> -<div id="k-home-logo"><img src="logo-big-home.png" alt="" /></div> -<div id="k-home-ini">Welcome! This site is a Kune node. Kune, -which means "together" in esperanto, it's a network of interconnected -sites like this one, where you can <strong>communicate, share, collaborate with -others and create your web spaces easily</strong>. <a href="#signin">Join!</a> -</div> -<div id="k-home-stats" style="display: none;"> -Latests groups created -</div> -</div> -</div> +  + <div class="banner" id="banner"></div> +  + <form method="post" action="javascript:void(0)" style="display: none"> + <input type="text" id="address" name="address" value="" /> <input + type="password" id="password" name="password" value="" /> <input + type="submit" value="Login" id="login" /> <input type="submit" + class="wiab le button" name="signIn" id="signIn" value="Sign in"> + </form> +  + <noscript> + <div + style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif"> + Your web browser must have JavaScript enabled in order for this + application to display correctly.</div> + </noscript> + <iframe id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe> + <iframe src="" id="__download" style="width: 0; height: 0; border: 0"></iframe> + <div id="kuneinitialcurtain"></div> + <div id="kuneloading"> + <div class="kuneloading-indicator"> + <img src="images/kune-anim-g.gif" width="35" height="35" + alt="kune-loading" + style="margin-right: 3px; float: left; vertical-align: top;" />kune         <br /> + <span id="kuneloading-msg">Starting...</span> + </div> + </div> + <div id="k-home-prewrap"> + <div id="k-home-wrapper"> + <div id="k-home-table"> + <div id="k-home-header"> + <div id="k-home-logo"> + <img src="logo-big-home.png" alt="" /> + </div> + <div id="k-home-summary"> + <ul> + <li style="background-image: url(images/kune-intro-user.png);">Comunicate with others</li> + <li style="background-image: url(images/kune-intro-group.png);">Work in collaboration</li> + <li style="background-image: url(images/kune-intro-world.png);">And share with the world</li> + </ul> + </div> +  + </div> +  + <div id="k-home-row"> + <div id="k-home-left"> + <div id="k-home-ini"> + Welcome! This site is a Kune node. Kune, which means + "together" in esperanto, it's a network of interconnected + sites like this one, where you can <strong>communicate, + share, collaborate with others and create your web + spaces easily</strong>. <a href="#signin">Join!</a> + </div> +  + <div id="k-home-stats" style="display: none;">Latests + groups created</div> + </div> +  + <div id="k-home-right"> +  + </div> +  + </div> +  + </div> +  + </div> +  + </div> +  </body> </html>

1 0

r1357 - in trunk/src: main/java/cc/kune/common/client/notify main/java/cc/kune/common/client/ui/dialogs main/java/cc/kune/common/client/ui/dialogs/tabbed main/java/cc/kune/common/client/ui/dialogs/wizard main/java/cc/kune/common/client/utils main/java/cc/kune/core/client/services main/java/cc/kune/core/client/ui main/java/cc/kune/core/client/ws/entheader main/java/cc/kune/core/public main/java/cc/kune/core/shared/dto main/java/cc/kune/gspace/client main/java/cc/kune/gspace/client/licensewizar
by Vicente J. Ruiz Jurado 07 May '11

07 May '11

Author: vjrj_ Date: 2011-05-07 17:55:38 +0200 (Sat, 07 May 2011) New Revision: 1357 Added: trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/ trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialog.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialogView.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardListener.java trunk/src/main/java/cc/kune/common/client/utils/SimpleResponseCallback.java trunk/src/main/java/cc/kune/core/client/ui/ContentPosition.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/ trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseChangeAction.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseChooseCallback.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizard.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardPanel.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardPresenter.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardView.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/ trunk/src/test/java/cc/kune/gspace/client/licensewizard/ Removed: trunk/src/main/java/cc/kune/core/client/ui/utils/ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizard.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardView.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/ trunk/src/test/java/org/ourproject/kune/wiki/ trunk/src/test/java/org/ourproject/kune/workspace/client/licensewizard/ Modified: trunk/src/main/java/cc/kune/common/client/notify/ConfirmAskEvent.java trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicTopDialog.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java trunk/src/main/java/cc/kune/common/client/utils/OnAcceptCallback.java trunk/src/main/java/cc/kune/common/client/utils/SimpleCallback.java trunk/src/main/java/cc/kune/core/client/services/MediaUtils.java trunk/src/main/java/cc/kune/core/client/ui/DefaultFormUtils.java trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityTextLogo.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/core/shared/dto/LicenseDTO.java trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java trunk/src/main/java/cc/kune/gspace/client/GSpaceGinjector.java trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFirstForm.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFirstFormView.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFlags.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFrdForm.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFrdFormView.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardSndForm.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardSndFormView.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardTrdForm.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardTrdFormView.java trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePanel.java trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePresenter.java trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicensePresenter.java trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicensePresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/WizardDialog.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ImageInfo.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertElementAbstractPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertImageAbstractPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java trunk/src/test/java/cc/kune/gspace/client/licensewizard/LicenseWizardPresenterTest.java trunk/src/test/java/cc/kune/gspace/client/licensewizard/MockProvider.java Log: License widget Modified: trunk/src/main/java/cc/kune/common/client/notify/ConfirmAskEvent.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/notify/ConfirmAskEvent.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/cc/kune/common/client/notify/ConfirmAskEvent.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -43,7 +43,7 @@ public static void fire(final HasHandlers source, final java.lang.String title, final java.lang.String message, final java.lang.String acceptBtnMsg, final java.lang.String cancelBtnMsg, final java.lang.String acceptBtnTooltip, final java.lang.String cancelBtnTooltip, - final cc.kune.common.client.utils.SimpleCallback callback) { + final cc.kune.common.client.utils.SimpleResponseCallback callback) { source.fireEvent(new ConfirmAskEvent(title, message, acceptBtnMsg, cancelBtnMsg, acceptBtnTooltip, cancelBtnTooltip, callback)); } @@ -54,7 +54,7 @@ java.lang.String acceptBtnMsg; java.lang.String acceptBtnTooltip; - cc.kune.common.client.utils.SimpleCallback callback; + cc.kune.common.client.utils.SimpleResponseCallback callback; java.lang.String cancelBtnMsg; java.lang.String cancelBtnTooltip; java.lang.String message; @@ -70,7 +70,7 @@ public ConfirmAskEvent(final java.lang.String title, final java.lang.String message, final java.lang.String acceptBtnMsg, final java.lang.String cancelBtnMsg, - final cc.kune.common.client.utils.SimpleCallback callback) { + final cc.kune.common.client.utils.SimpleResponseCallback callback) { this.title = title; this.message = message; this.acceptBtnMsg = acceptBtnMsg; @@ -81,7 +81,7 @@ public ConfirmAskEvent(final java.lang.String title, final java.lang.String message, final java.lang.String acceptBtnMsg, final java.lang.String cancelBtnMsg, final java.lang.String acceptBtnTooltip, final java.lang.String cancelBtnTooltip, - final cc.kune.common.client.utils.SimpleCallback callback) { + final cc.kune.common.client.utils.SimpleResponseCallback callback) { this.title = title; this.message = message; this.acceptBtnMsg = acceptBtnMsg; @@ -173,7 +173,7 @@ return TYPE; } - public cc.kune.common.client.utils.SimpleCallback getCallback() { + public cc.kune.common.client.utils.SimpleResponseCallback getCallback() { return callback; } Modified: trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -19,7 +19,7 @@ */ package cc.kune.common.client.notify; -import cc.kune.common.client.utils.SimpleCallback; +import cc.kune.common.client.utils.SimpleResponseCallback; import cc.kune.core.client.notify.msgs.UserNotifyEvent; import cc.kune.core.client.notify.spiner.ProgressHideEvent; import cc.kune.core.client.notify.spiner.ProgressShowEvent; @@ -30,9 +30,9 @@ public class NotifyUser { private static EventBus eventBus; private static I18nTranslationService i18n; - private static SimpleCallback onOk; + private static SimpleResponseCallback onOk; - public static void askConfirmation(final String tittle, final String message, final SimpleCallback callback) { + public static void askConfirmation(final String tittle, final String message, final SimpleResponseCallback callback) { eventBus.fireEvent(new ConfirmAskEvent(tittle, message, i18n.t("Yes"), i18n.t("No"), callback)); } @@ -73,7 +73,7 @@ public static void init(final EventBus eventBus, final I18nTranslationService i18n) { NotifyUser.eventBus = eventBus; NotifyUser.i18n = i18n; - onOk = new SimpleCallback() { + onOk = new SimpleResponseCallback() { @Override public void onCancel() { @@ -96,7 +96,7 @@ showAlertMessage(title, message, onOk); } - public static void showAlertMessage(final String title, final String message, final SimpleCallback callback) { + public static void showAlertMessage(final String title, final String message, final SimpleResponseCallback callback) { eventBus.fireEvent(new ConfirmAskEvent(title, message, i18n.t("Ok"), "", callback)); } Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -74,6 +74,10 @@ return bottomPanel; } + public FlowPanel getBtnPanel() { + return btnPanel; + } + @Override public HasClickHandlers getFirstBtn() { return firstBtn; @@ -94,6 +98,10 @@ return title; } + public void setFirstBtnEnabled(final boolean enabled) { + firstBtn.setEnabled(enabled); + } + public void setFirstBtnId(final String id) { firstBtn.ensureDebugId(id); } @@ -126,6 +134,10 @@ vp.setWidth(width); } + public void setSecondBtnEnabled(final boolean enabled) { + secondBtn.setEnabled(enabled); + } + public void setSecondBtnId(final String id) { secondBtn.ensureDebugId(id); } Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicTopDialog.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicTopDialog.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicTopDialog.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -74,7 +74,8 @@ } public Builder height(final int height) { - this.height = String.valueOf(height); + // FIXME + this.height = String.valueOf(height); // + "px"; return this; } @@ -109,7 +110,8 @@ } public Builder width(final int width) { - this.width = String.valueOf(width); + // FIXME + this.width = String.valueOf(width); // + "px"; return this; } Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -37,39 +37,40 @@ private final String errorLabelId; private final String firstBtnId; private final String firstBtnTitle; - private final int height; + private int height; private String iconCls; private final NotifyLevelImages images; private MessageToolbar messageErrorBar; - private final int minHeight; - private final int minWidth; private final boolean modal; private final String sndBtnId; private final String sndBtnTitle; private DecoratedTabPanel tabPanel; private String title; - private final int width; + private int width; - public AbstractTabbedDialogPanel(final String dialogId, final String title, final int width, - final int height, final int minWidth, final int minHeight, final boolean modal, + public AbstractTabbedDialogPanel(final String dialogId, final String title, final boolean modal, final NotifyLevelImages images, final String errorLabelId, final String firstBtnTitle, final String firstBtnId, final String sndBtnTitle, final String sndBtnId) { this.dialogId = dialogId; this.title = title; - this.width = width; - this.height = height; this.modal = modal; this.images = images; this.errorLabelId = errorLabelId; - // Not used: - this.minWidth = minWidth; - this.minHeight = minHeight; this.firstBtnTitle = firstBtnTitle; this.firstBtnId = firstBtnId; this.sndBtnTitle = sndBtnTitle; this.sndBtnId = sndBtnId; } + public AbstractTabbedDialogPanel(final String dialogId, final String title, final int width, + final int height, final boolean modal, final NotifyLevelImages images, final String errorLabelId, + final String firstBtnTitle, final String firstBtnId, final String sndBtnTitle, + final String sndBtnId) { + this(dialogId, title, modal, images, errorLabelId, firstBtnTitle, firstBtnId, sndBtnTitle, sndBtnId); + this.width = width; + this.height = height; + } + @Override public void activateTab(final int index) { createDialogIfNecessary(); @@ -91,7 +92,7 @@ private void createDialog() { dialog = new BasicTopDialog.Builder(dialogId, true, modal).autoscroll(true).width(width).height( height).icon(iconCls).firstButtonId(firstBtnId).firstButtonTitle(firstBtnTitle).sndButtonId( - dialogId).sndButtonTitle(sndBtnTitle).title(title).build(); + dialogId).sndButtonTitle(sndBtnTitle).sndButtonId(sndBtnId).title(title).build(); messageErrorBar = new MessageToolbar(images, errorLabelId); tabPanel = new DecoratedTabPanel(); tabPanel.getDeckPanel().setSize(String.valueOf(width), String.valueOf(height)); Added: trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialog.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialog.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialog.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -0,0 +1,285 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.common.client.ui.dialogs.wizard; + +import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.client.ui.MaskWidget; +import cc.kune.common.client.ui.dialogs.BasicTopDialog; +import cc.kune.common.client.ui.dialogs.BasicTopDialog.Builder; +import cc.kune.core.client.ui.DefaultForm; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.logical.shared.CloseEvent; +import com.google.gwt.event.logical.shared.CloseHandler; +import com.google.gwt.resources.client.ImageResource; +import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.ui.DeckPanel; +import com.google.gwt.user.client.ui.IsWidget; +import com.google.gwt.user.client.ui.PopupPanel; +import com.google.gwt.user.client.ui.Widget; + +public class WizardDialog implements WizardDialogView { + + private final Button cancelButton; + private final DeckPanel deck; + private final BasicTopDialog dialog; + private final I18nTranslationService i18n; + private WizardListener listener; + private final MaskWidget maskWidget; + private final Button nextButton; + + public WizardDialog(final String dialogId, final String header, final boolean modal, + final boolean minimizable, final String width, final String height, final String backId, + final String nextId, final String finishId, final String cancelId, final String closeId, + final I18nTranslationService i18n, final MaskWidget maskWidget) { + this(dialogId, header, modal, minimizable, width, height, backId, nextId, finishId, cancelId, + closeId, i18n, maskWidget, null); + } + + public WizardDialog(final String dialogId, final String header, final boolean modal, + final boolean minimizable, final String width, final String height, final String backId, + final String nextId, final String finishId, final String cancelId, final String closeId, + final I18nTranslationService i18n, final MaskWidget maskWidget, final WizardListener listener) { + this.maskWidget = maskWidget; + this.listener = listener; + final Builder dialogBuilder = new BasicTopDialog.Builder(dialogId, false, modal).width(width).height( + height).firstButtonId(backId).sndButtonId(finishId).title(header); + + dialog = dialogBuilder.build(); + this.i18n = i18n; + + nextButton = new Button(i18n.tWithNT("Next »", "used in button"), new ClickHandler() { + + @Override + public void onClick(final ClickEvent event) { + WizardDialog.this.listener.onNext(); + } + }); + + nextButton.ensureDebugId(nextId); + nextButton.addStyleName("k-dialog-btn"); + nextButton.addStyleName("k-dialog-firstBtn"); + nextButton.addStyleName("k-5corners"); + nextButton.addStyleName("k-button"); + nextButton.addStyleName("kune-Margin-Medium-l"); + dialog.getBtnPanel().add(nextButton); + + dialog.setFirstBtnText(i18n.tWithNT("« Back", "used in button")); + dialog.getFirstBtn().addClickHandler(new ClickHandler() { + + @Override + public void onClick(final ClickEvent event) { + WizardDialog.this.listener.onBack(); + } + }); + + cancelButton = new Button(i18n.tWithNT("Cancel", "used in button"), new ClickHandler() { + + @Override + public void onClick(final ClickEvent event) { + WizardDialog.this.listener.onCancel(); + } + }); + cancelButton.ensureDebugId(cancelId); + cancelButton.addStyleName("k-dialog-btn"); + cancelButton.addStyleName("k-dialog-secondBtn"); + cancelButton.addStyleName("k-5corners"); + cancelButton.addStyleName("k-button"); + cancelButton.addStyleName("kune-Margin-Medium-l"); + dialog.getBtnPanel().add(cancelButton); + + dialog.setSecondBtnId(finishId); + dialog.setSecondBtnText(i18n.tWithNT("Finish", "used in button")); + dialog.getSecondBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + WizardDialog.this.listener.onFinish(); + } + }); + + dialog.getClose().addCloseHandler(new CloseHandler<PopupPanel>() { + + @Override + public void onClose(final CloseEvent<PopupPanel> event) { + WizardDialog.this.listener.onClose(); + } + }); + + deck = new DeckPanel(); + } + + @Override + public void add(final IsWidget view) { + deck.add(toWidget(view)); + } + + @Override + public void clear() { + } + + private int getWidgetCount(final IsWidget view) { + if (view instanceof Widget) { + return deck.getWidgetIndex((Widget) view); + } else if (view instanceof DefaultForm) { + return deck.getWidgetIndex(((DefaultForm) view).getFormPanel()); + } + return -1; + } + + @Override + public void hide() { + dialog.hide(); + } + + @Override + public boolean isCurrentPage(final IsWidget view) { + final int visibleWidgetIndex = deck.getVisibleWidget(); + if (visibleWidgetIndex == -1) { + return false; + } else { + return deck.getWidget(visibleWidgetIndex).equals(toWidget(view)); + } + } + + @Override + public void mask(final String message) { + maskWidget.mask(dialog, message); + } + + @Override + public void maskProcessing() { + maskWidget.mask(dialog, i18n.t("Processing")); + } + + @Override + public void remove(final IsWidget view) { + final int count = getWidgetCount(view); + if (count != -1) { + deck.remove(count); + } + } + + @Override + public void setEnabled(final boolean back, final boolean next, final boolean cancel, + final boolean finish) { + setEnabledBackButton(back); + setEnabledNextButton(next); + setEnabledCancelButton(cancel); + setEnabledFinishButton(finish); + } + + @Override + public void setEnabledBackButton(final boolean enabled) { + dialog.setFirstBtnEnabled(enabled); + } + + @Override + public void setEnabledCancelButton(final boolean enabled) { + cancelButton.setEnabled(enabled); + } + + @Override + public void setEnabledFinishButton(final boolean enabled) { + dialog.setSecondBtnEnabled(enabled); + } + + @Override + public void setEnabledNextButton(final boolean enabled) { + nextButton.setEnabled(enabled); + } + + @Override + public void setFinishText(final String text) { + dialog.setSecondBtnText(text); + } + + public void setIcon(final ImageResource icon) { + dialog.setTitleIcon(icon); + } + + @Override + public void setListener(final WizardListener listener) { + this.listener = listener; + } + + @Override + public void setVisible(final boolean back, final boolean next, final boolean cancel, + final boolean finish) { + setVisibleBackButton(back); + setVisibleNextButton(next); + setVisibleCancelButton(cancel); + setVisibleFinishButton(finish); + } + + @Override + public void setVisibleBackButton(final boolean visible) { + dialog.setFirstBtnVisible(visible); + } + + @Override + public void setVisibleCancelButton(final boolean visible) { + cancelButton.setVisible(visible); + } + + @Override + public void setVisibleFinishButton(final boolean visible) { + dialog.setSecondBtnVisible(visible); + } + + @Override + public void setVisibleNextButton(final boolean visible) { + nextButton.setVisible(visible); + } + + @Override + public void show() { + dialog.showCentered(); + } + + @Override + public void show(final IsWidget view) { + final int count = getWidgetCount(view); + if (count != -1) { + deck.showWidget(count); + dialog.getInnerPanel().add(deck); + } else { + NotifyUser.error("Widget not found in deck of WizardDialog"); + } + + } + + private Widget toWidget(final IsWidget view) { + if (view instanceof Widget) { + return (Widget) view; + } else if (view instanceof DefaultForm) { + return ((DefaultForm) view).getFormPanel(); + } else { + NotifyUser.error("Trying to add a unknown element in WizardDialog"); + return null; + } + } + + @Override + public void unMask() { + maskWidget.unMask(); + } +} Property changes on: trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialog.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialogView.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialogView.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialogView.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -0,0 +1,70 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.common.client.ui.dialogs.wizard; + +import com.google.gwt.user.client.ui.IsWidget; + +public interface WizardDialogView { + + void add(IsWidget view); + + void clear(); + + void hide(); + + boolean isCurrentPage(IsWidget view); + + void mask(final String message); + + void maskProcessing(); + + void remove(IsWidget view); + + void setEnabled(boolean back, boolean next, boolean cancel, boolean finish); + + void setEnabledBackButton(final boolean enabled); + + void setEnabledCancelButton(final boolean enabled); + + void setEnabledFinishButton(final boolean enabled); + + void setEnabledNextButton(final boolean enabled); + + void setFinishText(final String text); + + void setListener(WizardListener listener); + + void setVisible(boolean back, boolean next, boolean cancel, boolean finish); + + void setVisibleBackButton(final boolean visible); + + void setVisibleCancelButton(final boolean visible); + + void setVisibleFinishButton(final boolean visible); + + void setVisibleNextButton(final boolean visible); + + void show(); + + void show(IsWidget view); + + void unMask(); + +} Property changes on: trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialogView.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardListener.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardListener.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardListener.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -0,0 +1,34 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.common.client.ui.dialogs.wizard; + +public interface WizardListener { + + void onBack(); + + void onNext(); + + void onFinish(); + + void onCancel(); + + void onClose(); + +} Property changes on: trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardListener.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/common/client/utils/OnAcceptCallback.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/utils/OnAcceptCallback.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/cc/kune/common/client/utils/OnAcceptCallback.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -2,7 +2,7 @@ import cc.kune.common.client.log.Log; -public abstract class OnAcceptCallback implements SimpleCallback { +public abstract class OnAcceptCallback implements SimpleResponseCallback { @Override public void onCancel() { Modified: trunk/src/main/java/cc/kune/common/client/utils/SimpleCallback.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/utils/SimpleCallback.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/cc/kune/common/client/utils/SimpleCallback.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -20,13 +20,8 @@ package cc.kune.common.client.utils; public interface SimpleCallback { - /** - * Notifies this callback of an accept response. - */ - void onSuccess(); - - /** - * Notifies this callback of a cancel. - */ - void onCancel(); + /** + * Notifies this callback + */ + void onCallback(); } Copied: trunk/src/main/java/cc/kune/common/client/utils/SimpleResponseCallback.java (from rev 1355, trunk/src/main/java/cc/kune/common/client/utils/SimpleCallback.java) =================================================================== --- trunk/src/main/java/cc/kune/common/client/utils/SimpleResponseCallback.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/utils/SimpleResponseCallback.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -0,0 +1,32 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.common.client.utils; + +public interface SimpleResponseCallback { + /** + * Notifies this callback of an accept response. + */ + void onSuccess(); + + /** + * Notifies this callback of a cancel. + */ + void onCancel(); +} Modified: trunk/src/main/java/cc/kune/core/client/services/MediaUtils.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/services/MediaUtils.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/cc/kune/core/client/services/MediaUtils.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -21,7 +21,7 @@ import cc.kune.core.client.state.Session; -import cc.kune.core.client.ui.utils.ContentPosition; +import cc.kune.core.client.ui.ContentPosition; import cc.kune.core.shared.domain.utils.StateToken; public class MediaUtils { Copied: trunk/src/main/java/cc/kune/core/client/ui/ContentPosition.java (from rev 1355, trunk/src/main/java/cc/kune/core/client/ui/utils/ContentPosition.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/ContentPosition.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/ui/ContentPosition.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -0,0 +1,79 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.core.client.ui; + +import org.cobogw.gwt.user.client.CSS; + +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.gwt.dom.client.Element; +import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.ui.HTML; +import com.google.inject.Inject; + +public class ContentPosition { + + public static final String CENTER = "center"; + public static final String LEFT = "left"; + public static final String RIGHT = "right"; + private static I18nTranslationService i18n; + private static Object[][] positionObjs; + public static final String[][] POSITIONS = { new String[] { LEFT }, new String[] { CENTER }, new String[] { RIGHT } }; + + public synchronized static Object[][] getPositions() { + if (positionObjs == null) { + final String[][] values = POSITIONS; + positionObjs = new Object[values.length][1]; + int i = 0; + for (final String[] position : values) { + final Object[] obj = new Object[] { position[0], i18n.t(position[0]) }; + positionObjs[i++] = obj; + } + } + return positionObjs; + } + + public static String setCenterPosition(final String elementCode) { + return setPosition(elementCode, false, CENTER); + } + + public static Element setPosition(final Element element, final boolean wraptext, final String position) { + if (!wraptext || position.equals(ContentPosition.CENTER)) { + final com.google.gwt.user.client.Element divEl = DOM.createDiv(); + CSS.setProperty(divEl, CSS.A.TEXT_ALIGN, position); + divEl.setInnerHTML(element.getString()); + return divEl; + } else { + CSS.setProperty(element, CSS.A.FLOAT, position); + return element; + } + } + + public static String setPosition(final String elementCode, final boolean wraptext, final String position) { + final HTML html = new HTML(elementCode); + html.removeStyleName("gwt-HTML"); + return setPosition(html.getElement(), wraptext, position).getString(); + } + + @Inject + public ContentPosition(final I18nTranslationService i18n) { + ContentPosition.i18n = i18n; + } +} Modified: trunk/src/main/java/cc/kune/core/client/ui/DefaultFormUtils.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/DefaultFormUtils.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/cc/kune/core/client/ui/DefaultFormUtils.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -25,20 +25,18 @@ import com.extjs.gxt.ui.client.widget.form.Radio; public class DefaultFormUtils { - public static Radio createRadio(final FieldSet fieldSet, final String radioLabel, final String radioFieldName, - final String radioTip, final String id) { - final Radio radio = new Radio(); - radio.setName(radioFieldName); - radio.setHideLabel(true); - radio.setId(id); - fieldSet.add(radio); + public static Radio createRadio(final FieldSet fieldSet, final String radioLabel, + final String radioFieldName, final String radioTip, final String id) { + final Radio radio = new Radio(); + radio.setName(radioFieldName); + radio.setHideLabel(true); + radio.setId(id); + fieldSet.add(radio); - if (radioTip != null) { - Tooltip.to(radio, radioTip); - radio.setBoxLabel(radioLabel); - } else { - radio.setBoxLabel(radioLabel); - } - return radio; + if (radioTip != null) { + Tooltip.to(radio, radioTip); } + radio.setBoxLabel(radioLabel); + return radio; + } } Modified: trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityTextLogo.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityTextLogo.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityTextLogo.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -27,91 +27,92 @@ public class EntityTextLogo extends VerticalPanel { - public static final String LOGO_NAME = "k-elogop-ln"; - public static final String LOGO_IMAGE = "k-elogop-image"; + private static final String _100 = "100%"; + public static final String LOGO_IMAGE = "k-elogop-image"; - private static final String _100 = "100%"; - private static final String LOGO_MEDIUM_FONT_STYLE = "k-elogo-l-m"; - private static final String LOGO_SMALL_FONT_STYLE = "k-elogo-l-s"; - private static final String LOGO_LARGE_FONT_STYLE = "k-elogo-l-l"; - private final Label logoLabel; - private final Image logoImage; + private static final String LOGO_LARGE_FONT_STYLE = "k-elogo-l-l"; + private static final String LOGO_MEDIUM_FONT_STYLE = "k-elogo-l-m"; + public static final String LOGO_NAME = "k-elogop-ln"; + private static final String LOGO_SMALL_FONT_STYLE = "k-elogo-l-s"; + private final Image logoImage; + private final Label logoLabel; - public EntityTextLogo() { - // Initialize - super(); - final HorizontalPanel generalHP = new HorizontalPanel(); - final VerticalPanel logoTextVP = new VerticalPanel(); - logoImage = new Image(); - logoLabel = new Label(); - final Label expandCell = new Label(""); + public EntityTextLogo() { + // Initialize + super(); + final HorizontalPanel generalHP = new HorizontalPanel(); + final VerticalPanel logoTextVP = new VerticalPanel(); + logoImage = new Image(); + logoLabel = new Label(); + final Label expandCell = new Label(""); - logoImage.ensureDebugId(LOGO_IMAGE); - logoLabel.ensureDebugId(LOGO_NAME); + logoImage.ensureDebugId(LOGO_IMAGE); + logoLabel.ensureDebugId(LOGO_NAME); - // Layout - add(generalHP); - generalHP.add(logoImage); - generalHP.add(logoTextVP); - logoTextVP.add(logoLabel); + // Layout + add(generalHP); + generalHP.add(logoImage); + generalHP.add(logoTextVP); + logoTextVP.add(logoLabel); - // Set properties + // Set properties - expandCell.setStyleName("k-elogop-expand"); - generalHP.setWidth(_100); - generalHP.setHeight(_100); - generalHP.setCellWidth(logoTextVP, _100); - generalHP.setCellHeight(logoTextVP, _100); - logoTextVP.setWidth(_100); - logoTextVP.setCellWidth(logoLabel, _100); - super.setVerticalAlignment(ALIGN_MIDDLE); - logoTextVP.setVerticalAlignment(ALIGN_MIDDLE); - generalHP.setVerticalAlignment(ALIGN_MIDDLE); - setStylePrimaryName("k-entitytextlogo"); - addStyleName("k-entitytextlogo-no-border"); - logoImage.setVisible(false); - setLogoTextImpl(""); - } + expandCell.setStyleName("k-elogop-expand"); + generalHP.setWidth(_100); + generalHP.setHeight(_100); + generalHP.setCellWidth(logoTextVP, _100); + generalHP.setCellHeight(logoTextVP, _100); + logoTextVP.setWidth(_100); + logoTextVP.setCellWidth(logoLabel, _100); + super.setVerticalAlignment(ALIGN_MIDDLE); + logoTextVP.setVerticalAlignment(ALIGN_MIDDLE); + generalHP.setVerticalAlignment(ALIGN_MIDDLE); + setStylePrimaryName("k-entitytextlogo"); + addStyleName("k-entitytextlogo-no-border"); + logoImage.setVisible(false); + setLogoTextImpl(""); + } - public void setLargeFont() { - resetFontSize(); - logoLabel.addStyleName(LOGO_LARGE_FONT_STYLE); - } + private void resetFontSize() { + logoLabel.removeStyleName(LOGO_LARGE_FONT_STYLE); + logoLabel.removeStyleName(LOGO_SMALL_FONT_STYLE); + logoLabel.removeStyleName(LOGO_MEDIUM_FONT_STYLE); + } - public void setLogoImage(final AbstractImagePrototype imageProto) { - imageProto.applyTo(logoImage); - } + public void setLargeFont() { + resetFontSize(); + logoLabel.addStyleName(LOGO_LARGE_FONT_STYLE); + } - public void setLogoImage(final String url) { - Image.prefetch(url); - logoImage.setUrl(url); - } + public void setLogoImage(final AbstractImagePrototype imageProto) { + imageProto.applyTo(logoImage); + } - public void setLogoText(final String text) { - setLogoTextImpl(text); - } + public void setLogoImage(final String url) { + logoImage.setUrl("images/clear.gif"); + Image.prefetch(url); + logoImage.setUrl(url); + } - public void setLogoVisible(final boolean visible) { - logoImage.setVisible(visible); - } + public void setLogoText(final String text) { + setLogoTextImpl(text); + } - public void setMediumFont() { - resetFontSize(); - logoLabel.addStyleName(LOGO_MEDIUM_FONT_STYLE); - } + private void setLogoTextImpl(final String text) { + logoLabel.setText(text); + } - public void setSmallFont() { - resetFontSize(); - logoLabel.addStyleName(LOGO_SMALL_FONT_STYLE); - } + public void setLogoVisible(final boolean visible) { + logoImage.setVisible(visible); + } - private void resetFontSize() { - logoLabel.removeStyleName(LOGO_LARGE_FONT_STYLE); - logoLabel.removeStyleName(LOGO_SMALL_FONT_STYLE); - logoLabel.removeStyleName(LOGO_MEDIUM_FONT_STYLE); - } + public void setMediumFont() { + resetFontSize(); + logoLabel.addStyleName(LOGO_MEDIUM_FONT_STYLE); + } - private void setLogoTextImpl(final String text) { - logoLabel.setText(text); - } + public void setSmallFont() { + resetFontSize(); + logoLabel.addStyleName(LOGO_SMALL_FONT_STYLE); + } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-05-07 15:55:38 UTC (rev 1357) @@ -1,6 +1,4 @@ -CHARSET "UTF-8 "; - -body { +CHARSET "UTF-8 "; body { background-color: white; color: black; font-family: 'Ubuntu', Arial; @@ -797,7 +795,8 @@ white-space: nowrap; } */ -.k-sn-mainpanel .x-btn button,.k-sn-mainpanel button,button.k-button, .gwt-FileUpload { +.k-sn-mainpanel .x-btn button,.k-sn-mainpanel button,button.k-button,.gwt-FileUpload + { font: 13px 'Ubuntu', arial; border: 2px solid #CCCCCC; cursor: pointer; @@ -832,8 +831,7 @@ } .k-sn-mainpanel .x-btn button:active,.k-sn-mainpanel button:active,button.k-button:active - { - border-top-color: #ffffff; + { /* border-top-color: #ffffff; */ background: #ffffff; } @@ -888,6 +886,8 @@ button[disabled]:active,button[disabled],input[type="reset"][disabled]:active,input[type="reset"][disabled],input[type="button"][disabled]:active,input[type="button"][disabled],select[disabled]>input[type="button"],select[disabled]>input[type="button"]:active,input[type="submit"][disabled]:active,input[type="submit"][disabled],.k-button-disabled { color: gray !important; + border-color: #CCCCCC !important; + background: inherits !important; } /* end buttons */ @@ -1156,7 +1156,7 @@ -webkit-border-bottom-left-radius: 5px; -moz-border-radius-bottomleft: 5px; border-bottom-left-radius: 5px; - kfilter: alpha(opacity = 90); + kfilter: alpha(opacity = 90); -moz-opacity: 0.90; -khtml-opacity: 0.90; opacity: 0.90; @@ -1309,7 +1309,6 @@ } /* end Decorated tabbar */ - .k-waveHolder { position: absolute; top: 0; @@ -1318,7 +1317,18 @@ right: 0; } -.GWTUpld, table.GWTUpld td { - font-family: inherits !important; - font-size: 14px !important; +.GWTUpld,table.GWTUpld td { + font-family: inherits !important; + font-size: 14px !important; } + +.x-form-check-wrap { + height: inherit;; + line-height: inherit; +} + +.k-info-links { + text-decoration: underline; + color: gray; + cursor: pointer; +} Modified: trunk/src/main/java/cc/kune/core/shared/dto/LicenseDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/LicenseDTO.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/cc/kune/core/shared/dto/LicenseDTO.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -23,112 +23,112 @@ public class LicenseDTO implements IsSerializable { - private String shortName; + private String description; - private String longName; + private String imageUrl; - private String description; + private boolean isCC; - private String url; + private boolean isCopyleft; - private boolean isCC; + private boolean isDeprecated; - private boolean isCopyleft; + private String longName; - private boolean isDeprecated; + private String rdf; - private String rdf; + private String shortName; - private String imageUrl; + private String url; - public LicenseDTO() { - this(null, null, null, null, false, false, false, null, null); - } + public LicenseDTO() { + this(null, null, null, null, false, false, false, null, null); + } - public LicenseDTO(final String shortName, final String longName, final String description, final String url, - final boolean isCC, final boolean isCopyleft, final boolean isDeprecated, final String rdf, - final String imageUrl) { - this.shortName = shortName; - this.longName = longName; - this.description = description; - this.url = url; - this.isCC = isCC; - this.isCopyleft = isCopyleft; - this.isDeprecated = isDeprecated; - this.rdf = rdf; - this.imageUrl = imageUrl; - } + public LicenseDTO(final String shortName, final String longName, final String description, + final String url, final boolean isCC, final boolean isCopyleft, final boolean isDeprecated, + final String rdf, final String imageUrl) { + this.shortName = shortName; + this.longName = longName; + this.description = description; + this.url = url; + this.isCC = isCC; + this.isCopyleft = isCopyleft; + this.isDeprecated = isDeprecated; + this.rdf = rdf; + this.imageUrl = imageUrl; + } - public String getShortName() { - return shortName; - } + public String getDescription() { + return description; + } - public void setShortName(final String shortName) { - this.shortName = shortName; - } + public String getImageUrl() { + return imageUrl; + } - public String getLongName() { - return longName; - } + public String getLongName() { + return longName; + } - public void setLongName(final String longName) { - this.longName = longName; - } + public String getRdf() { + return rdf; + } - public String getDescription() { - return description; - } + public String getShortName() { + return shortName; + } - public void setDescription(final String description) { - this.description = description; - } + public String getUrl() { + return url; + } - public String getImageUrl() { - return imageUrl; - } + public boolean isCC() { + return isCC; + } - public void setImageUrl(final String imageUrl) { - this.imageUrl = imageUrl; - } + public boolean isCopyleft() { + return isCopyleft; + } - public String getRdf() { - return rdf; - } + public boolean isDeprecated() { + return isDeprecated; + } - public void setRdf(final String rdf) { - this.rdf = rdf; - } + public void setCC(final boolean isCC) { + this.isCC = isCC; + } - public String getUrl() { - return url; - } + public void setCopyleft(final boolean isCopyleft) { + this.isCopyleft = isCopyleft; + } - public void setUrl(final String url) { - this.url = url; - } + public void setDeprecated(final boolean isDeprecated) { + this.isDeprecated = isDeprecated; + } - public boolean isCC() { - return isCC; - } + public void setDescription(final String description) { + this.description = description; + } - public boolean isCopyleft() { - return isCopyleft; - } + public void setImageUrl(final String imageUrl) { + this.imageUrl = imageUrl; + } - public boolean isDeprecated() { - return isDeprecated; - } + public void setLongName(final String longName) { + this.longName = longName; + } - public void setCC(final boolean isCC) { - this.isCC = isCC; - } + public void setRdf(final String rdf) { + this.rdf = rdf; + } - public void setCopyleft(final boolean isCopyleft) { - this.isCopyleft = isCopyleft; - } + public void setShortName(final String shortName) { + this.shortName = shortName; + } - public void setDeprecated(final boolean isDeprecated) { - this.isDeprecated = isDeprecated; - } + public void setUrl(final String url) { + this.url = url; + } } Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -24,6 +24,19 @@ import cc.kune.core.client.sitebar.search.SitebarSearchPresenter; import cc.kune.gspace.client.actions.ContentViewerOptionsMenu; import cc.kune.gspace.client.actions.RenameAction; +import cc.kune.gspace.client.licensewizard.LicenseChangeAction; +import cc.kune.gspace.client.licensewizard.LicenseWizard; +import cc.kune.gspace.client.licensewizard.LicenseWizardPanel; +import cc.kune.gspace.client.licensewizard.LicenseWizardPresenter; +import cc.kune.gspace.client.licensewizard.LicenseWizardView; +import cc.kune.gspace.client.licensewizard.pages.LicenseWizardFirstForm; +import cc.kune.gspace.client.licensewizard.pages.LicenseWizardFirstFormView; +import cc.kune.gspace.client.licensewizard.pages.LicenseWizardFrdForm; +import cc.kune.gspace.client.licensewizard.pages.LicenseWizardFrdFormView; +import cc.kune.gspace.client.licensewizard.pages.LicenseWizardSndForm; +import cc.kune.gspace.client.licensewizard.pages.LicenseWizardSndFormView; +import cc.kune.gspace.client.licensewizard.pages.LicenseWizardTrdForm; +import cc.kune.gspace.client.licensewizard.pages.LicenseWizardTrdFormView; import cc.kune.gspace.client.options.GroupOptions; import cc.kune.gspace.client.options.GroupOptionsCollection; import cc.kune.gspace.client.options.GroupOptionsPanel; @@ -142,5 +155,15 @@ // Actions s(ContentViewerOptionsMenu.class); s(RenameAction.class); + + // LicenseWizard + bindPresenter(LicenseWizardPresenter.class, LicenseWizardView.class, LicenseWizardPanel.class, + LicenseWizardPresenter.LicenseWizardProxy.class); + s(LicenseWizard.class, LicenseWizardPresenter.class); + s(LicenseWizardFirstFormView.class, LicenseWizardFirstForm.class); + s(LicenseWizardSndFormView.class, LicenseWizardSndForm.class); + s(LicenseWizardTrdFormView.class, LicenseWizardTrdForm.class); + s(LicenseWizardFrdFormView.class, LicenseWizardFrdForm.class); + s(LicenseChangeAction.class); } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceGinjector.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceGinjector.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -1,6 +1,7 @@ package cc.kune.gspace.client; import cc.kune.core.client.sitebar.search.SitebarSearchPresenter; +import cc.kune.gspace.client.licensewizard.LicenseWizardPresenter; import cc.kune.gspace.client.tags.TagsSummaryPresenter; import cc.kune.gspace.client.tool.ContentViewerSelector; import cc.kune.gspace.client.tool.selector.ToolSelectorPresenter; @@ -23,6 +24,8 @@ GSpaceParts getGSpaceParts(); + AsyncProvider<LicenseWizardPresenter> getLicenseWizardPresenter(); + AsyncProvider<SitebarSearchPresenter> getSitebarSearchPresenter(); AsyncProvider<TagsSummaryPresenter> getTagsSummaryPresenter(); Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -39,16 +39,6 @@ final Provider<GroupOptionsToolsConf> gtc, final Provider<UserOptionsDefLicense> udl, final Provider<UserOptionsPublicSpaceConf> ups, final Provider<UserOptionsLogo> ul, final Provider<UserOptionsToolsConf> utc, final Provider<SitebarSearchPresenter> siteSearch) { - // , final Provider<GroupOptionsPanel> gop, - // , final Provider<UserOptionsPanel> uop, - // final Provider<GroupOptionsPublicSpaceConfPanel> gpsp, - // final Provider<GroupOptionsDefLicensePanel> gdlp, - // final Provider<GroupOptionsLogoPanel> glp, - // final Provider<GroupOptionsToolsConfPanel> gtcp, - // final Provider<UserOptionsLogoPanel> ulp, - // final Provider<UserOptionsDefLicensePanel> udlp, - // final Provider<UserOptionsPublicSpaceConfPanel> upsp, - // final Provider<UserOptionsToolsConfPanel> utcp session.onAppStart(true, new AppStartHandler() { @Override Copied: trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseChangeAction.java (from rev 1355, trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseChangeAction.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseChangeAction.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -0,0 +1,70 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.licensewizard; + +import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.client.utils.SimpleResponseCallback; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class LicenseChangeAction { + private final Provider<GroupServiceAsync> groupService; + private final I18nTranslationService i18n; + private final Session session; + private final StateManager stateManager; + + @Inject + public LicenseChangeAction(final Provider<GroupServiceAsync> groupService, final Session session, + final I18nTranslationService i18n, final StateManager stateManager) { + this.groupService = groupService; + this.session = session; + this.i18n = i18n; + this.stateManager = stateManager; + } + + public void changeLicense(final StateToken token, final LicenseDTO license, + final SimpleResponseCallback callback) { + NotifyUser.showProgressProcessing(); + groupService.get().changeDefLicense(session.getUserHash(), token, license, + new AsyncCallbackSimple<Void>() { + @Override + public void onFailure(final Throwable caught) { + super.onFailure(caught); + NotifyUser.hideProgress(); + NotifyUser.error(i18n.t("Error changing license")); + callback.onCancel(); + } + + @Override + public void onSuccess(final Void result) { + stateManager.reload(); + callback.onSuccess(); + } + }); + } +} Added: trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseChooseCallback.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseChooseCallback.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseChooseCallback.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -0,0 +1,9 @@ +package cc.kune.gspace.client.licensewizard; + +import cc.kune.core.shared.dto.LicenseDTO; + +public interface LicenseChooseCallback { + + void onSelected(LicenseDTO license); + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseChooseCallback.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizard.java (from rev 1355, trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizard.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizard.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizard.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -0,0 +1,26 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.licensewizard; + +public interface LicenseWizard { + + void start(LicenseChooseCallback callback); + +} Copied: trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardPanel.java (from rev 1355, trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPanel.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardPanel.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -0,0 +1,69 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.licensewizard; + +import cc.kune.common.client.ui.MaskWidget; +import cc.kune.common.client.ui.dialogs.wizard.WizardDialog; +import cc.kune.common.client.ui.dialogs.wizard.WizardListener; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; + +public class LicenseWizardPanel extends WizardDialog implements LicenseWizardView { + + public static final String BACK_BTN_ID = "k-lwp-back-btn"; + public static final String CANCEL_BTN_ID = "k-lwp-cancel-btn"; + public static final String CLOSE_BTN_ID = "k-lwp-close-btn"; + public static final String FINISH_BTN_ID = "k-lwp-finish-btn"; + public static final String LIC_WIZ_DIALOG = "k-lwp-diag"; + public static final String NEXT_BTN_ID = "k-lwp-next-btn"; + + @Inject + public LicenseWizardPanel(final MaskWidget maskWidget, final I18nTranslationService i18n, + final CoreResources res) { + super(LIC_WIZ_DIALOG, i18n.t("License wizard"), true, false, WIDTH, null, BACK_BTN_ID, NEXT_BTN_ID, + FINISH_BTN_ID, CANCEL_BTN_ID, CLOSE_BTN_ID, i18n, maskWidget); + super.setFinishText(i18n.t("Select")); + super.setIcon(res.copyleft()); + } + + @Override + public void addToSlot(final Object slot, final Widget content) { + } + + @Override + public Widget asWidget() { + return null; + } + + @Override + public void removeFromSlot(final Object slot, final Widget content) { + } + + @Override + public void setInSlot(final Object slot, final Widget content) { + } + + public void setWizardListener(final WizardListener listener) { + super.setListener(listener); + } +} Copied: trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardPresenter.java (from rev 1355, trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenter.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardPresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardPresenter.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -0,0 +1,267 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.licensewizard; + +import java.util.List; + +import cc.kune.common.client.log.Log; +import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.client.ui.dialogs.wizard.WizardListener; +import cc.kune.common.client.utils.SimpleCallback; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.gspace.client.licensewizard.pages.LicenseWizardFirstFormView; +import cc.kune.gspace.client.licensewizard.pages.LicenseWizardFrdFormView; +import cc.kune.gspace.client.licensewizard.pages.LicenseWizardSndFormView; +import cc.kune.gspace.client.licensewizard.pages.LicenseWizardTrdFormView; + +import com.google.gwt.event.shared.EventBus; +import com.google.gwt.user.client.ui.IsWidget; +import com.google.inject.Inject; +import com.gwtplatform.mvp.client.Presenter; +import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; +import com.gwtplatform.mvp.client.proxy.Proxy; +import com.gwtplatform.mvp.client.proxy.RevealRootContentEvent; + +public class LicenseWizardPresenter extends + Presenter<LicenseWizardView, LicenseWizardPresenter.LicenseWizardProxy> implements LicenseWizard { + + @ProxyCodeSplit + public interface LicenseWizardProxy extends Proxy<LicenseWizardPresenter> { + } + + private final String ccVers; + private final LicenseWizardFrdFormView frdForm; + private final LicenseWizardFirstFormView fstForm; + private LicenseChooseCallback selectLicenseListener; + private final Session session; + private final LicenseWizardSndFormView sndForm; + + private final LicenseWizardTrdFormView trdForm; + + @Inject + public LicenseWizardPresenter(final EventBus eventBus, final LicenseWizardView view, + final LicenseWizardProxy proxy, final LicenseWizardFirstFormView firstForm, + final LicenseWizardSndFormView sndForm, final LicenseWizardTrdFormView trdForm, + final LicenseWizardFrdFormView frdForm, final Session session) { + super(eventBus, view, proxy); + this.fstForm = firstForm; + this.sndForm = sndForm; + this.trdForm = trdForm; + this.frdForm = frdForm; + this.session = session; + ccVers = "-" + session.getCurrentCCversion(); + } + + private LicenseDTO getLicenseFromShortName(final String shortName) { + final List<LicenseDTO> licenses = session.getLicenses(); + for (int i = 0; i < licenses.size(); i++) { + final LicenseDTO licenseDTO = licenses.get(i); + if (licenseDTO.getShortName().equals(shortName)) { + return licenseDTO; + } + } + Log.error("Internal error: License not found"); + throw new IndexOutOfBoundsException("License not found"); + } + + private boolean in(final IsWidget page) { + return getView().isCurrentPage(page); + } + + void onAnotherLicenseSelecterd() { + getView().setEnabled(false, true, true, false); + } + + public void onBack() { + if (getView().isCurrentPage(sndForm)) { + showFst(); + } else if (in(trdForm)) { + showSnd(); + } else if (in(frdForm)) { + showSnd(); + } else { + Log.error("Programatic error in LicenseWizardPresenter"); + } + } + + @Override + protected void onBind() { + super.onBind(); + fstForm.onChange(new SimpleCallback() { + @Override + public void onCallback() { + if (fstForm.isCopyleft()) { + onCopyLeftLicenseSelected(); + } else { + onAnotherLicenseSelecterd(); + } + } + }); + trdForm.onChange(new SimpleCallback() { + @Override + public void onCallback() { + onCreativeCommonsChanged(); + } + }); + frdForm.onChange(new SimpleCallback() { + @Override + public void onCallback() { + if (frdForm.getSelectedLicense().length() > 0) { + getView().setEnabled(true, false, true, true); + } + } + }); + getView().add(fstForm); + getView().add(sndForm); + getView().add(trdForm); + getView().add(frdForm); + final WizardListener listener = new WizardListener() { + + @Override + public void onBack() { + LicenseWizardPresenter.this.onBack(); + + } + + @Override + public void onCancel() { + LicenseWizardPresenter.this.onCancel(); + + } + + @Override + public void onClose() { + LicenseWizardPresenter.this.onClose(); + } + + @Override + public void onFinish() { + LicenseWizardPresenter.this.onChange(); + } + + @Override + public void onNext() { + LicenseWizardPresenter.this.onNext(); + } + }; + getView().setListener(listener); + reset(); + } + + public void onCancel() { + getView().hide(); + } + + public void onChange() { + String licenseShortName; + if (in(fstForm)) { + licenseShortName = "by-sa" + ccVers; + } else if (in(trdForm)) { + if (trdForm.isAllowComercial()) { + licenseShortName = trdForm.isAllowModif() ? "by" + ccVers + : trdForm.isAllowModifShareAlike() ? "by-sa" + ccVers : "by-nd" + ccVers; + } else { + licenseShortName = trdForm.isAllowModif() ? "by-nc" + ccVers + : trdForm.isAllowModifShareAlike() ? "by-nc-sa" + ccVers : "by-nc-nd" + ccVers; + } + } else if (in(sndForm)) { + licenseShortName = "by-sa" + ccVers; + NotifyUser.error("Programatic error in LicenseWizardPresenter"); + } else { + licenseShortName = frdForm.getSelectedLicense(); + } + getView().hide(); + selectLicenseListener.onSelected(getLicenseFromShortName(licenseShortName)); + } + + public void onClose() { + getView().hide(); + } + + void onCopyLeftLicenseSelected() { + getView().setEnabled(false, false, true, true); + } + + private void onCreativeCommonsChanged() { + final boolean isCopyleft = trdForm.isAllowComercial() && trdForm.isAllowModifShareAlike(); + final boolean isAppropiateForCulturalWorks = trdForm.isAllowComercial() + && (trdForm.isAllowModif() || trdForm.isAllowModifShareAlike()); + trdForm.setFlags(isCopyleft, isAppropiateForCulturalWorks, !trdForm.isAllowComercial()); + } + + public void onNext() { + if (in(fstForm)) { + getView().clear(); + showSnd(); + } else if (in(sndForm)) { + if (sndForm.isCommonLicensesSelected()) { + showTrd(); + } else { + showFrd(); + } + } else { + Log.error("Programatic error in LicenseWizardPresenter"); + } + } + + private void reset() { + getView().clear(); + getView().setEnabled(false, false, true, true); + getView().show(fstForm); + fstForm.reset(); + sndForm.reset(); + trdForm.reset(); + frdForm.reset(); + } + + @Override + protected void revealInParent() { + RevealRootContentEvent.fire(this, this); + } + + private void showFrd() { + getView().show(frdForm); + getView().setEnabled(true, false, true, false); + } + + private void showFst() { + getView().clear(); + getView().show(fstForm); + getView().setEnabled(false, true, true, true); + } + + private void showSnd() { + getView().show(sndForm); + getView().setEnabled(true, true, true, false); + } + + private void showTrd() { + getView().show(trdForm); + getView().setEnabled(true, false, true, true); + } + + @Override + public void start(final LicenseChooseCallback selectLicenseListener) { + this.selectLicenseListener = selectLicenseListener; + reset(); + getView().show(); + } +} Copied: trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardView.java (from rev 1355, trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardView.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardView.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -0,0 +1,31 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.licensewizard; + +import cc.kune.common.client.ui.dialogs.wizard.WizardDialogView; + +import com.gwtplatform.mvp.client.View; + +public interface LicenseWizardView extends WizardDialogView, View { + + String HEIGHT = "350px"; + String WIDTH = "400px"; + +} Copied: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages (from rev 1355, trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages) Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFirstForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFirstForm.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -17,110 +17,112 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.licensewizard.pages; +package cc.kune.gspace.client.licensewizard.pages; -import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; -import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils; -import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardView; - +import cc.kune.common.client.utils.SimpleCallback; import cc.kune.common.client.utils.TextUtils; +import cc.kune.core.client.ui.DefaultForm; +import cc.kune.core.client.ui.DefaultFormUtils; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.calclab.suco.client.events.Listener0; -import com.gwtext.client.widgets.form.Checkbox; -import com.gwtext.client.widgets.form.FieldSet; -import com.gwtext.client.widgets.form.Label; -import com.gwtext.client.widgets.form.Radio; -import com.gwtext.client.widgets.form.event.CheckboxListenerAdapter; +import com.extjs.gxt.ui.client.Style.Orientation; +import com.extjs.gxt.ui.client.event.BaseEvent; +import com.extjs.gxt.ui.client.event.Events; +import com.extjs.gxt.ui.client.event.Listener; +import com.extjs.gxt.ui.client.widget.form.FieldSet; +import com.extjs.gxt.ui.client.widget.form.Radio; +import com.extjs.gxt.ui.client.widget.form.RadioGroup; +import com.google.gwt.user.client.ui.HTML; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; public class LicenseWizardFirstForm extends DefaultForm implements LicenseWizardFirstFormView { - private static final String POINT = "» "; - public static final String RADIO_ANOTHER_ID = "k-lwff-another"; - public static final String RADIO_COPYLEFT_ID = "k-lwff-copyleft"; - private static final String RADIO_FIELD_NAME = "k-lwff-radio"; - private final Radio anotherLicenseRadio; - // private final Event0 onCopyLeftLicenseSelected; - // private final Event0 onAnotherLicenseSelected; - private final Radio copyleftRadio; + private static final String POINT = "» "; + public static final String RADIO_ANOTHER_ID = "k-lwff-another"; + public static final String RADIO_COPYLEFT_ID = "k-lwff-copyleft"; + private static final String RADIO_FIELD_NAME = "k-lwff-radio"; + private final Radio anotherLicenseRadio; + private final Radio copyleftRadio; + private SimpleCallback onChange; - public LicenseWizardFirstForm(final I18nTranslationService i18n) { - // this.onCopyLeftLicenseSelected = new - // Event0("onCopyLeftLicenseSelected"); - // this.onAnotherLicenseSelected = new - // Event0("onAnotherLicenseSelected"); - super.setFrame(true); - super.setPaddings(10); - super.setHeight(LicenseWizardView.HEIGHT); + @Inject + public LicenseWizardFirstForm(final I18nTranslationService i18n) { + super.setFrame(true); + super.setPadding(10); + super.setAutoHeight(true); + // super.setHeight(LicenseWizardView.HEIGHT); - final Label intro = new Label(); - intro.setHtml(i18n.t("Select a license to share your group contents with other people:") - + DefaultFormUtils.brbr()); + final Label intro = new Label(); + intro.setText(i18n.t("Select a license to share your group contents with other people:")); - final FieldSet fieldSet = new FieldSet("license recommended"); - fieldSet.setStyle("margin-left: 105px"); - fieldSet.setWidth(250); - copyleftRadio = DefaultFormUtils.createRadio(fieldSet, i18n.t("Use a copyleft license (recommended)"), - RADIO_FIELD_NAME, null, RADIO_COPYLEFT_ID); - anotherLicenseRadio = DefaultFormUtils.createRadio(fieldSet, i18n.t("Use another kind of license (advanced)"), - RADIO_FIELD_NAME, null, RADIO_ANOTHER_ID); - copyleftRadio.addListener(new CheckboxListenerAdapter() { - @Override - public void onCheck(final Checkbox field, final boolean checked) { - if (checked) { - // onCopyLeftLicenseSelected.fire(); - } - } - }); - anotherLicenseRadio.addListener(new CheckboxListenerAdapter() { - @Override - public void onCheck(final Checkbox field, final boolean checked) { - if (checked) { - // onAnotherLicenseSelected.fire(); - } - } - }); + final FieldSet fieldSet = new FieldSet(); + // fieldSet.setTitle(i18n.t("license recommended")); + fieldSet.addStyleName("margin-left: 105px"); + fieldSet.setWidth(250); + copyleftRadio = DefaultFormUtils.createRadio(fieldSet, + i18n.t("Use a copyleft license (recommended)"), RADIO_FIELD_NAME, null, RADIO_COPYLEFT_ID); + anotherLicenseRadio = DefaultFormUtils.createRadio(fieldSet, + i18n.t("Use another kind of license (advanced)"), RADIO_FIELD_NAME, null, RADIO_ANOTHER_ID); - final FieldSet infoFS = new FieldSet("Info"); - infoFS.setFrame(false); - infoFS.setIconCls("k-info-icon"); - infoFS.setCollapsible(false); - infoFS.setAutoHeight(true); + final RadioGroup radioGroup = new RadioGroup(); + radioGroup.add(copyleftRadio); + radioGroup.add(anotherLicenseRadio); + radioGroup.setOrientation(Orientation.VERTICAL); + radioGroup.setHideLabel(true); + radioGroup.addListener(Events.Change, new Listener<BaseEvent>() { + @Override + public void handleEvent(final BaseEvent be) { + onChange.onCallback(); + } + }); - final Label recommendCopyleft = new Label(); - final Label whyALicense = new Label(); - final Label youCanChangeTheLicenseLater = new Label(); - recommendCopyleft.setHtml(POINT - + i18n.t("We recommend [%s] licenses, specially for practical works", - TextUtils.generateHtmlLink("http://en.wikipedia.org/wiki/Copyleft", i18n.t("copyleft"))) - + DefaultFormUtils.br()); - whyALicense.setHtml(POINT - + TextUtils.generateHtmlLink("http://mirrors.creativecommons.org/getcreative/", - i18n.t("Why do we need a license?")) + DefaultFormUtils.br()); - youCanChangeTheLicenseLater.setHtml(POINT + i18n.t("You can change this license later") + DefaultFormUtils.br()); + final FieldSet infoFS = new FieldSet(); + infoFS.setHeading("Info"); + // infoFS.setFrame(false); + // infoFS.setIcon("k-info-icon"); + infoFS.setCollapsible(false); + infoFS.setAutoHeight(true); - infoFS.addStyleName("kune-Margin-20-t"); - add(intro); - add(copyleftRadio); - add(anotherLicenseRadio); - infoFS.add(recommendCopyleft); - infoFS.add(whyALicense); - infoFS.add(youCanChangeTheLicenseLater); - add(infoFS); - } + final HTML recommendCopyleft = new HTML(); + final HTML whyALicense = new HTML(); + final HTML youCanChangeTheLicenseLater = new HTML(); + recommendCopyleft.setHTML(POINT + + i18n.t("We recommend [%s] licenses, specially for practical works", + TextUtils.generateHtmlLink("http://en.wikipedia.org/wiki/Copyleft", i18n.t("copyleft")))); + whyALicense.setHTML(POINT + + TextUtils.generateHtmlLink("http://mirrors.creativecommons.org/getcreative/", + i18n.t("Why do we need a license?"))); + youCanChangeTheLicenseLater.setHTML(POINT + i18n.t("You can change this license later")); - @Override - public void onAnotherLicenseSelected(final Listener0 slot) { - // onAnotherLicenseSelected.add(slot); - } + infoFS.addStyleName("kune-Margin-20-t"); + add(intro); + add(radioGroup); + infoFS.add(recommendCopyleft); + infoFS.add(whyALicense); + infoFS.add(youCanChangeTheLicenseLater); + add(infoFS); + } - @Override - public void onCopyLeftLicenseSelected(final Listener0 slot) { - // onCopyLeftLicenseSelected.add(slot); - } + @Override + public Widget asWidget() { + return this.getFormPanel(); + } - @Override - public void reset() { - super.reset(); - copyleftRadio.setChecked(true); - } + @Override + public boolean isCopyleft() { + return copyleftRadio.getValue(); + } + + @Override + public void onChange(final SimpleCallback onChange) { + this.onChange = onChange; + } + + @Override + public void reset() { + super.reset(); + copyleftRadio.setValue(true); + } + } Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFirstFormView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstFormView.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFirstFormView.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -17,16 +17,18 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.licensewizard.pages; +package cc.kune.gspace.client.licensewizard.pages; -import org.ourproject.kune.platf.client.View; +import cc.kune.common.client.utils.SimpleCallback; -import com.calclab.suco.client.events.Listener0; +import com.google.gwt.user.client.ui.IsWidget; -public interface LicenseWizardFirstFormView extends View { - void onAnotherLicenseSelected(Listener0 slot); +public interface LicenseWizardFirstFormView extends IsWidget { - void onCopyLeftLicenseSelected(Listener0 slot); + boolean isCopyleft(); - void reset(); + void onChange(SimpleCallback onChange); + + void reset(); + } Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFlags.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFlags.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFlags.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -17,74 +17,78 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.licensewizard.pages; +package cc.kune.gspace.client.licensewizard.pages; -import org.ourproject.kune.platf.client.services.Images; -import org.ourproject.kune.platf.client.ui.IconLabel; - +import cc.kune.common.client.ui.IconLabel; import cc.kune.common.client.ui.KuneWindowUtils; +import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; -import com.gwtext.client.widgets.Panel; +import com.google.gwt.user.client.ui.FlowPanel; -public class LicenseWizardFlags extends Panel { - private final IconLabel copyleft; - private final IconLabel nonCopyleft; - private final IconLabel culturalWorks; - private final IconLabel nonCulturalWorks; - private final IconLabel nonCommercialReasons; +public class LicenseWizardFlags extends FlowPanel { + private final IconLabel copyleft; + private final IconLabel culturalWorks; + private final IconLabel nonCommercialReasons; + private final IconLabel nonCopyleft; + private final IconLabel nonCulturalWorks; - public LicenseWizardFlags(final Images images, final I18nTranslationService i18n) { - copyleft = new IconLabel(images.copyleft(), i18n.t("This is a copyleft license.")); - nonCopyleft = new IconLabel(images.noCopyleft(), i18n.t("This is not a copyleft license.")); - culturalWorks = new IconLabel(images.info(), i18n.t("This is appropriate for free cultural works.")); - nonCulturalWorks = new IconLabel(images.alert(), i18n.t("This is not appropriate for free cultural works.")); - nonCommercialReasons = new IconLabel(images.alert(), i18n.t("Reasons not to use a non commercial license.")); - addLink(copyleft, "http://en.wikipedia.org/wiki/Copyleft"); - addLink(nonCopyleft, "http://en.wikipedia.org/wiki/Copyleft"); - addLink(culturalWorks, "http://freedomdefined.org/"); - addLink(nonCulturalWorks, "http://freedomdefined.org/"); - addLink(nonCommercialReasons, "http://freedomdefined.org/Licenses/NC"); - add(copyleft); - add(nonCopyleft); - add(culturalWorks); - add(nonCulturalWorks); - add(nonCommercialReasons); - } + public LicenseWizardFlags(final CoreResources images, final I18nTranslationService i18n) { + copyleft = new IconLabel(images.copyleft(), i18n.t("This is a copyleft license.")); + nonCopyleft = new IconLabel(images.noCopyleft(), i18n.t("This is not a copyleft license.")); + culturalWorks = new IconLabel(images.info(), i18n.t("This is appropriate for free cultural works.")); + nonCulturalWorks = new IconLabel(images.alert(), + i18n.t("This is not appropriate for free cultural works.")); + nonCommercialReasons = new IconLabel(images.alert(), + i18n.t("Reasons not to use a non commercial license.")); + addLink(copyleft, "http://en.wikipedia.org/wiki/Copyleft"); + addLink(nonCopyleft, "http://en.wikipedia.org/wiki/Copyleft"); + addLink(culturalWorks, "http://freedomdefined.org/"); + addLink(nonCulturalWorks, "http://freedomdefined.org/"); + addLink(nonCommercialReasons, "http://freedomdefined.org/Licenses/NC"); + add(copyleft); + add(nonCopyleft); + add(culturalWorks); + add(nonCulturalWorks); + add(nonCommercialReasons); + } - public void setCopyleft(final boolean isCopyleft) { - copyleft.setVisible(isCopyleft); - nonCopyleft.setVisible(!isCopyleft); - } + private void addLink(final IconLabel label, final String url) { + label.addDomHandler(new ClickHandler() { - public void setCulturalWorks(final boolean isAppropiateForCulturalWorks) { - culturalWorks.setVisible(isAppropiateForCulturalWorks); - nonCulturalWorks.setVisible(!isAppropiateForCulturalWorks); - } + @Override + public void onClick(final ClickEvent event) { + openWindow(url); + } - public void setNonComercial(final boolean isNonComercial) { - nonCommercialReasons.setVisible(isNonComercial); - } + private void openWindow(final String url) { + KuneWindowUtils.open(url); + } + }, ClickEvent.getType()); - public void setVisible(final boolean isCopyleft, final boolean isAppropiateForCulturalWorks, - final boolean isNonComercial) { - setCopyleft(isCopyleft); - setCulturalWorks(isAppropiateForCulturalWorks); - setNonComercial(isNonComercial); - } + label.addStyleName("k-info-links"); + } - private void addLink(final IconLabel label, final String url) { - label.addClickHandler(new ClickHandler() { - public void onClick(final ClickEvent event) { - openWindow(url); - } + public void setCopyleft(final boolean isCopyleft) { + copyleft.setVisible(isCopyleft); + nonCopyleft.setVisible(!isCopyleft); + } - private void openWindow(final String url) { - KuneWindowUtils.open(url); - } - }); - label.setStyleNameToText("k-info-links"); - } + public void setCulturalWorks(final boolean isAppropiateForCulturalWorks) { + culturalWorks.setVisible(isAppropiateForCulturalWorks); + nonCulturalWorks.setVisible(!isAppropiateForCulturalWorks); + } + + public void setNonComercial(final boolean isNonComercial) { + nonCommercialReasons.setVisible(isNonComercial); + } + + public void setVisible(final boolean isCopyleft, final boolean isAppropiateForCulturalWorks, + final boolean isNonComercial) { + setCopyleft(isCopyleft); + setCulturalWorks(isAppropiateForCulturalWorks); + setNonComercial(isNonComercial); + } } Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFrdForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFrdForm.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFrdForm.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -17,117 +17,149 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.licensewizard.pages; +package cc.kune.gspace.client.licensewizard.pages; -import java.util.ArrayList; -import java.util.List; - -import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; -import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils; -import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardView; - +import cc.kune.common.client.utils.SimpleCallback; import cc.kune.core.client.state.Session; +import cc.kune.core.client.ui.DefaultForm; import cc.kune.core.shared.dto.LicenseDTO; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.calclab.suco.client.events.Listener0; -import com.gwtext.client.core.Template; -import com.gwtext.client.data.Record; -import com.gwtext.client.data.SimpleStore; -import com.gwtext.client.data.Store; -import com.gwtext.client.widgets.form.ComboBox; -import com.gwtext.client.widgets.form.Label; -import com.gwtext.client.widgets.form.event.ComboBoxListenerAdapter; +import com.extjs.gxt.ui.client.data.BaseModel; +import com.extjs.gxt.ui.client.event.BaseEvent; +import com.extjs.gxt.ui.client.event.Events; +import com.extjs.gxt.ui.client.event.Listener; +import com.extjs.gxt.ui.client.store.ListStore; +import com.extjs.gxt.ui.client.widget.form.ComboBox; +import com.extjs.gxt.ui.client.widget.form.ComboBox.TriggerAction; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; public class LicenseWizardFrdForm extends DefaultForm implements LicenseWizardFrdFormView { - public static final String COMMON_LICENSES_ID = "k-lwsf-common"; - public static final String OTHER_LICENSES_ID = "k-lwsf-other"; - public static final String RADIO_FIELD_NAME = "k-lwsf-radio"; - private final ComboBox cb; - // private final Event0 onChange; - private final Session session; - public LicenseWizardFrdForm(final I18nTranslationService i18n, final Session session) { - this.session = session; - // this.onChange = new Event0("onChange"); - setFrame(true); - super.setPaddings(10); - super.setHeight(LicenseWizardView.HEIGHT); + public class LicenseData extends BaseModel { - final Label intro = new Label(); - intro.setHtml(i18n.t("Select other kind of licenses:") + DefaultFormUtils.brbr()); + private static final String LONGNAME = "longname"; + private static final String SHORTNAME = "shortname"; + private static final String URL = "url"; - final Store store = new SimpleStore(new String[] { "shortname", "longname", "url" }, getNonCCLicenses()); - store.load(); + public LicenseData(final LicenseDTO license) { + this(license.getShortName(), license.getLongName(), license.getUrl()); + } - final Template template = new Template("<div class=\"x-combo-list-item\">" + "<img src=\"{url}\"> " - + "{longname}<div class=\"x-clear\"></div></div>"); - - super.setHideLabels(true); - - cb = new ComboBox(); - cb.setMinChars(1); - // cb.setFieldLabel("Other licenses"); - cb.setLabelSeparator(""); - cb.setStore(store); - cb.setDisplayField("longname"); - cb.setValueField("shortname"); - cb.setMode(ComboBox.LOCAL); - cb.setTriggerAction(ComboBox.ALL); - cb.setEmptyText(i18n.t("Select license")); - cb.setTypeAhead(true); - cb.setSelectOnFocus(true); - cb.setEditable(false); - cb.setWidth(300); - cb.setResizable(true); - cb.setTpl(template); - cb.setTitle("Licenses"); - cb.addListener(new ComboBoxListenerAdapter() { - @Override - public void onSelect(final ComboBox comboBox, final Record record, final int index) { - // onChange.fire(); - } - }); - add(intro); - add(cb); + public LicenseData(final String shortname, final String longname, final String url) { + set(SHORTNAME, shortname); + set(LONGNAME, longname); + set(URL, url); } - private String[][] getNonCCLicenses() { - final ArrayList<LicenseDTO> licensesNonCCList = new ArrayList<LicenseDTO>(); - final List<LicenseDTO> licenses = session.getLicenses(); - for (final LicenseDTO license : licenses) { - if (!license.isCC()) { - licensesNonCCList.add(license); - } - } - final String[][] licensesArray = new String[licensesNonCCList.size()][3]; - for (int i = 0; i < licensesNonCCList.size(); i++) { - final LicenseDTO license = licensesNonCCList.get(i); - licensesArray[i][0] = license.getShortName(); - licensesArray[i][1] = license.getLongName(); - licensesArray[i][2] = license.getImageUrl(); - } - return licensesArray; + public String getLongname() { + return get(LONGNAME); } - @Override - public String getSelectedLicense() { - return cb.getValueAsString(); + public String getShortname() { + return get(SHORTNAME); } - @Override - public void onChange(final Listener0 slot) { - // onChange.add(slot); + public String getUrl() { + return get(URL); } + } - @Override - public void reset() { - super.reset(); + public static final String COMMON_LICENSES_ID = "k-lwsf-common"; + public static final String OTHER_LICENSES_ID = "k-lwsf-other"; + public static final String RADIO_FIELD_NAME = "k-lwsf-radio"; + private final ComboBox<LicenseData> cb; + + private SimpleCallback onChange; + private final Session session; + + @Inject + public LicenseWizardFrdForm(final I18nTranslationService i18n, final Session session) { + this.session = session; + + // this.onChange = new Event0("onChange"); + setFrame(true); + super.setPadding(10); + // super.setHeight(LicenseWizardView.HEIGHT); + super.setAutoHeight(true); + final Label intro = new Label(); + intro.setText(i18n.t("Select other kind of licenses:")); + + // final ListStore<LicenseDTO> store = new ListStore<LicenseDTO>(); + // store.add( Arrays.asList( new String[] { "shortname", "longname", "url" + // }); + // getNonCCLicenses()); + // store.load(); + + // final Template template = new + // Template("<div class=\"x-combo-list-item\">" + "<img src=\"{url}\"> " + // + "{longname}<div class=\"x-clear\"></div></div>"); + + super.setHideLabels(true); + + cb = new ComboBox<LicenseData>(); + cb.setMinChars(1); + // cb.setFieldLabel("Other licenses"); + cb.setLabelSeparator(""); + cb.setStore(createStore()); + cb.setDisplayField(LicenseData.LONGNAME); + cb.setValueField(LicenseData.SHORTNAME); + // cb.setMode(Mode.LOCAL); + cb.setTriggerAction(TriggerAction.ALL); + cb.setEmptyText(i18n.t("Select license")); + cb.setTypeAhead(true); + cb.setSelectOnFocus(true); + cb.setEditable(false); + cb.setWidth(300); + // cb.setResizable(true); + // cb.setTpl(template); + cb.setTitle("Licenses"); + cb.addListener(Events.Select, new Listener<BaseEvent>() { + @Override + public void handleEvent(final BaseEvent be) { + onChange.onCallback(); + } + }); + add(intro); + add(cb); + } + + @Override + public Widget asWidget() { + return this.getFormPanel(); + } + + private ListStore<LicenseData> createStore() { + final ListStore<LicenseData> list = new ListStore<LicenseData>(); + + for (final LicenseDTO license : session.getLicenses()) { + if (!license.isCC()) { + list.add(new LicenseData(license)); + } } + return list; + } - @Override - public void setFlags(final boolean isCopyleft, final boolean isAppropiateForCulturalWorks, - final boolean isNonComercial) { - // TODO Auto-generated method stub - } + @Override + public String getSelectedLicense() { + return cb.getValue().getShortname(); + } + + @Override + public void onChange(final SimpleCallback onChange) { + this.onChange = onChange; + } + + @Override + public void reset() { + super.reset(); + } + + @Override + public void setFlags(final boolean isCopyleft, final boolean isAppropiateForCulturalWorks, + final boolean isNonComercial) { + + } } Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFrdFormView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFrdFormView.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFrdFormView.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -17,19 +17,19 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.licensewizard.pages; +package cc.kune.gspace.client.licensewizard.pages; -import org.ourproject.kune.platf.client.View; +import cc.kune.common.client.utils.SimpleCallback; -import com.calclab.suco.client.events.Listener0; +import com.google.gwt.user.client.ui.IsWidget; -public interface LicenseWizardFrdFormView extends View { +public interface LicenseWizardFrdFormView extends IsWidget { - String getSelectedLicense(); + String getSelectedLicense(); - void onChange(Listener0 slot); + void onChange(SimpleCallback callback); - void reset(); + void reset(); - void setFlags(boolean isCopyleft, boolean isAppropiateForCulturalWorks, boolean isNonComercial); + void setFlags(boolean isCopyleft, boolean isAppropiateForCulturalWorks, boolean isNonComercial); } Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardSndForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardSndForm.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardSndForm.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -17,54 +17,64 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.licensewizard.pages; +package cc.kune.gspace.client.licensewizard.pages; -import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; -import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils; -import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardView; - +import cc.kune.core.client.ui.DefaultForm; +import cc.kune.core.client.ui.DefaultFormUtils; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.gwtext.client.widgets.form.FieldSet; -import com.gwtext.client.widgets.form.Label; -import com.gwtext.client.widgets.form.Radio; +import com.extjs.gxt.ui.client.widget.form.FieldSet; +import com.extjs.gxt.ui.client.widget.form.Radio; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; public class LicenseWizardSndForm extends DefaultForm implements LicenseWizardSndFormView { - public static final String COMMON_LICENSES_ID = "k-lwsf-common"; - public static final String OTHER_LICENSES_ID = "k-lwsf-other"; - public static final String RADIO_FIELD_NAME = "k-lwsf-radio"; - private final Radio commonLicensesRadio; - private final Radio otherLicensesRadio; + public static final String COMMON_LICENSES_ID = "k-lwsf-common"; + public static final String OTHER_LICENSES_ID = "k-lwsf-other"; + public static final String RADIO_FIELD_NAME = "k-lwsf-radio"; + private final Radio commonLicensesRadio; + private final Radio otherLicensesRadio; - public LicenseWizardSndForm(I18nTranslationService i18n) { - setFrame(true); - super.setPaddings(10); - super.setHeight(LicenseWizardView.HEIGHT); + @Inject + public LicenseWizardSndForm(final I18nTranslationService i18n) { + setFrame(true); + super.setPadding(10); + // super.setHeight(LicenseWizardView.HEIGHT); + super.setAutoHeight(true); + final Label intro = new Label(); + intro.setText(i18n.t("Select the license type:")); - Label intro = new Label(); - intro.setHtml(i18n.t("Select the license type:") + DefaultFormUtils.brbr()); + final FieldSet fieldSet = new FieldSet(); + // fieldSet.setTitle("license type"); + fieldSet.addStyleName("margin-left: 105px"); + fieldSet.setWidth(250); + commonLicensesRadio = DefaultFormUtils.createRadio(fieldSet, + i18n.t("Common licenses for cultural works"), RADIO_FIELD_NAME, + i18n.t("Select a Creative Commons license (recommended for cultural works)"), COMMON_LICENSES_ID); + otherLicensesRadio = DefaultFormUtils.createRadio(fieldSet, i18n.t("Other kind of licenses"), + RADIO_FIELD_NAME, + i18n.t("Use the GNU licenses (recommended for free software works) and other kind of licenses"), + OTHER_LICENSES_ID); + add(intro); + add(commonLicensesRadio); + add(otherLicensesRadio); - final FieldSet fieldSet = new FieldSet("license type"); - fieldSet.setStyle("margin-left: 105px"); - fieldSet.setWidth(250); - commonLicensesRadio = DefaultFormUtils.createRadio(fieldSet, i18n.t("Common licenses for cultural works"), - RADIO_FIELD_NAME, i18n.t("Select a Creative Commons license (recommended for cultural works)"), - COMMON_LICENSES_ID); - otherLicensesRadio = DefaultFormUtils.createRadio(fieldSet, i18n.t("Other kind of licenses"), RADIO_FIELD_NAME, - i18n.t("Use the GNU licenses (recommended for free software works) and other kind of licenses"), - OTHER_LICENSES_ID); - add(intro); - add(commonLicensesRadio); - add(otherLicensesRadio); - } + } - public boolean isCommonLicensesSelected() { - return commonLicensesRadio.getValue(); - } + @Override + public Widget asWidget() { + return null; + } - @Override - public void reset() { - super.reset(); - commonLicensesRadio.setChecked(true); - } + @Override + public boolean isCommonLicensesSelected() { + return commonLicensesRadio.getValue(); + } + + @Override + public void reset() { + super.reset(); + commonLicensesRadio.setValue(true); + } } Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardSndFormView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardSndFormView.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardSndFormView.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -17,13 +17,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.licensewizard.pages; +package cc.kune.gspace.client.licensewizard.pages; -import org.ourproject.kune.platf.client.View; +import com.google.gwt.user.client.ui.IsWidget; -public interface LicenseWizardSndFormView extends View { +public interface LicenseWizardSndFormView extends IsWidget { - boolean isCommonLicensesSelected(); + boolean isCommonLicensesSelected(); - void reset(); + void reset(); } Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardTrdForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardTrdForm.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardTrdForm.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -17,158 +17,179 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.licensewizard.pages; +package cc.kune.gspace.client.licensewizard.pages; -import org.ourproject.kune.platf.client.services.Images; -import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; -import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils; -import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardView; - +import cc.kune.common.client.tooltip.Tooltip; +import cc.kune.common.client.utils.SimpleCallback; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.ui.DefaultForm; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.calclab.suco.client.events.Listener0; -import com.gwtext.client.widgets.PaddedPanel; -import com.gwtext.client.widgets.form.Checkbox; -import com.gwtext.client.widgets.form.Field; -import com.gwtext.client.widgets.form.FieldSet; -import com.gwtext.client.widgets.form.Label; -import com.gwtext.client.widgets.form.Radio; -import com.gwtext.client.widgets.form.event.CheckboxListenerAdapter; +import com.extjs.gxt.ui.client.Style.Orientation; +import com.extjs.gxt.ui.client.event.BaseEvent; +import com.extjs.gxt.ui.client.event.Events; +import com.extjs.gxt.ui.client.event.Listener; +import com.extjs.gxt.ui.client.widget.form.FieldSet; +import com.extjs.gxt.ui.client.widget.form.Radio; +import com.extjs.gxt.ui.client.widget.form.RadioGroup; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; public class LicenseWizardTrdForm extends DefaultForm implements LicenseWizardTrdFormView { - public static final String RADIO_COMMERCIAL_FIELD_NAME = "k-lwtf-comm-radio"; - public static final String RADIO_MODIF_FIELD_NAME = "k-lwtf-mod-radio"; - public static final String RADIO_NOT_COMM_ID = "k-lwtf-not-perm-comm"; - public static final String RADIO_NOT_PERMIT_MOD_ID = "k-lwtf-not-mod"; - public static final String RADIO_PERMIT_COMMERCIAL_ID = "k-lwtf-perm-comm"; - public static final String RADIO_PERMIT_MOD_ID = "k-lwtf-mod-perm"; - public static final String RADIO_PERMIT_MOD_SA_ID = "k-lwtf-mod-perm-sa"; - private final LicenseWizardFlags info; - private Radio notPermitComercialLicenseRadio; - // private final Event0 onChange; - private Radio notPermitModRadio; - private Radio permitComercialRadio; - private Radio permitModRadio; - private Radio permitModSaRadio; + public static final String RADIO_COMMERCIAL_FIELD_NAME = "k-lwtf-comm-radio"; + public static final String RADIO_MODIF_FIELD_NAME = "k-lwtf-mod-radio"; + public static final String RADIO_NOT_COMM_ID = "k-lwtf-not-perm-comm"; + public static final String RADIO_NOT_PERMIT_MOD_ID = "k-lwtf-not-mod"; + public static final String RADIO_PERMIT_COMMERCIAL_ID = "k-lwtf-perm-comm"; + public static final String RADIO_PERMIT_MOD_ID = "k-lwtf-mod-perm"; + public static final String RADIO_PERMIT_MOD_SA_ID = "k-lwtf-mod-perm-sa"; + private RadioGroup commertialGroup; + private final LicenseWizardFlags info; - public LicenseWizardTrdForm(final Images images, final I18nTranslationService i18n) { - super.setFrame(true); - super.setHeight(LicenseWizardView.HEIGHT); - super.setPaddings(10); + private RadioGroup modificationsGroup; + private Radio notPermitComercialLicenseRadio; + private Radio notPermitModRadio; + private SimpleCallback onChange; + private Radio permitComercialRadio; + private Radio permitModRadio; + private Radio permitModSaRadio; - // this.onChange = new Event0("onChange"); + @Inject + public LicenseWizardTrdForm(final I18nTranslationService i18n, final CoreResources res) { + super.setFrame(true); + super.setPadding(10); + super.setAutoHeight(true); - final Label intro = new Label(); - intro.setHtml(i18n.t("With a Creative Commons license, you keep your copyright but allow people to copy and distribute your work provided they give you credit — and only on the conditions you specify here. What do you want to do?") - + DefaultFormUtils.brbr()); + final Label intro = new Label(); + intro.setText(i18n.t("With a Creative Commons license, you keep your copyright but allow people to copy and distribute your work provided they give you credit — and only on the conditions you specify here. What do you want to do?")); - final Label commercialQuestion = new Label(); - commercialQuestion.setHtml(i18n.t("Allow any uses of your work, including commercial?") + DefaultFormUtils.br()); - final Label modificationsQuestion = new Label(); - modificationsQuestion.setHtml(i18n.t("Allow modifications of your work?") + DefaultFormUtils.br()); + final FieldSet commercialfieldSet = new FieldSet(); + commercialfieldSet.setHeading(i18n.t("Allow any uses of your work, including commercial?")); + commercialfieldSet.setCollapsible(false); + commercialfieldSet.setAutoHeight(true); + final FieldSet modificationsfieldSet = new FieldSet(); + modificationsfieldSet.setHeading(i18n.t("Allow modifications of your work?")); + modificationsfieldSet.setCollapsible(false); + modificationsfieldSet.setAutoHeight(true); - final FieldSet commercialfieldSet = new FieldSet(i18n.t("Allow any uses of your work, including commercial?")); - commercialfieldSet.setFrame(false); - commercialfieldSet.setCollapsible(false); - commercialfieldSet.setAutoHeight(true); - final FieldSet modificationsfieldSet = new FieldSet(i18n.t("Allow modifications of your work?")); - modificationsfieldSet.setFrame(false); - modificationsfieldSet.setCollapsible(false); - modificationsfieldSet.setAutoHeight(true); + createRadios(i18n, commercialfieldSet, modificationsfieldSet); + createRadioListeners(); - createRadios(i18n, commercialfieldSet, modificationsfieldSet); - createRadioListeners(); + info = new LicenseWizardFlags(res, i18n); - info = new LicenseWizardFlags(images, i18n); + add(intro); + add(commercialfieldSet); + add(modificationsfieldSet); + add(info); + } - add(intro); - add(commercialfieldSet); - add(modificationsfieldSet); - add(new PaddedPanel(info, 0, 0, 0, 0)); - } + @Override + public Widget asWidget() { + return super.getFormPanel(); + } - private void createRadioListeners() { - final Radio[] radios = { permitModRadio, permitModSaRadio, notPermitModRadio, permitComercialRadio, - notPermitComercialLicenseRadio }; - for (final Radio radio : radios) { - radio.addListener(new CheckboxListenerAdapter() { - @Override - public void onChange(final Field field, final Object newVal, final Object oldVal) { - // onChange.fire(); - } + private Radio createRadio(final RadioGroup radioGroup, final String radioLabel, + final String radioFieldName, final String radioTip, final String id) { + final Radio radio = new Radio(); + radio.setName(radioFieldName); + radio.setHideLabel(true); + radio.setId(id); + radioGroup.add(radio); - @Override - public void onCheck(final Checkbox field, final boolean checked) { - // onChange.fire(); - } - }); - } + if (radioTip != null) { + Tooltip.to(radio, radioTip); } + radio.setBoxLabel(radioLabel); + return radio; + } - private void createRadios(final I18nTranslationService i18n, final FieldSet commercialfieldSet, - final FieldSet modificationsfieldSet) { - permitComercialRadio = DefaultFormUtils.createRadio( - commercialfieldSet, - i18n.t("Yes"), - RADIO_COMMERCIAL_FIELD_NAME, - i18n.t("The licensor permits others to copy, distribute, display, and perform the work, including for commercial purposes"), - RADIO_PERMIT_COMMERCIAL_ID); - notPermitComercialLicenseRadio = DefaultFormUtils.createRadio( - commercialfieldSet, - i18n.t("No"), - RADIO_COMMERCIAL_FIELD_NAME, - i18n.t("The licensor permits others to copy, distribute, display, and perform the work for non-commercial purposes only"), - RADIO_NOT_COMM_ID); - permitModRadio = DefaultFormUtils.createRadio( - modificationsfieldSet, - i18n.t("Yes"), - RADIO_MODIF_FIELD_NAME, - i18n.t("The licensor permits others to copy, distribute, display and perform the work, as well as make derivative works based on it"), - RADIO_PERMIT_MOD_ID); - permitModSaRadio = DefaultFormUtils.createRadio( - modificationsfieldSet, - i18n.t("Yes, as long as other share alike"), - RADIO_MODIF_FIELD_NAME, - i18n.t("The licensor permits others to distribute derivative works only under the same license or one compatible with the one that governs the licensor's work"), - RADIO_PERMIT_MOD_SA_ID); - notPermitModRadio = DefaultFormUtils.createRadio( - modificationsfieldSet, - i18n.t("No"), - RADIO_MODIF_FIELD_NAME, - i18n.t("The licensor permits others to copy, distribute, display and perform only unaltered copies of the work — not derivative works based on it"), - RADIO_NOT_PERMIT_MOD_ID); - } + private void createRadioListeners() { + final Listener<BaseEvent> listener = new Listener<BaseEvent>() { + @Override + public void handleEvent(final BaseEvent be) { + onChange.onCallback(); + } + }; + commertialGroup.addListener(Events.Change, listener); + modificationsGroup.addListener(Events.Change, listener); + } - @Override - public boolean isAllowComercial() { - return permitComercialRadio.getValue(); - } + private void createRadios(final I18nTranslationService i18n, final FieldSet commercialfieldSet, + final FieldSet modificationsfieldSet) { + commertialGroup = new RadioGroup(); + modificationsGroup = new RadioGroup(); + commertialGroup.setOrientation(Orientation.VERTICAL); + modificationsGroup.setOrientation(Orientation.VERTICAL); + permitComercialRadio = createRadio( + commertialGroup, + i18n.t("Yes"), + RADIO_COMMERCIAL_FIELD_NAME, + i18n.t("The licensor permits others to copy, distribute, display, and perform the work, including for commercial purposes"), + RADIO_PERMIT_COMMERCIAL_ID); + notPermitComercialLicenseRadio = createRadio( + commertialGroup, + i18n.t("No"), + RADIO_COMMERCIAL_FIELD_NAME, + i18n.t("The licensor permits others to copy, distribute, display, and perform the work for non-commercial purposes only"), + RADIO_NOT_COMM_ID); + permitModRadio = createRadio( + modificationsGroup, + i18n.t("Yes"), + RADIO_MODIF_FIELD_NAME, + i18n.t("The licensor permits others to copy, distribute, display and perform the work, as well as make derivative works based on it"), + RADIO_PERMIT_MOD_ID); + permitModSaRadio = createRadio( + modificationsGroup, + i18n.t("Yes, as long as other share alike"), + RADIO_MODIF_FIELD_NAME, + i18n.t("The licensor permits others to distribute derivative works only under the same license or one compatible with the one that governs the licensor's work"), + RADIO_PERMIT_MOD_SA_ID); + notPermitModRadio = createRadio( + modificationsGroup, + i18n.t("No"), + RADIO_MODIF_FIELD_NAME, + i18n.t("The licensor permits others to copy, distribute, display and perform only unaltered copies of the work — not derivative works based on it"), + RADIO_NOT_PERMIT_MOD_ID); + commertialGroup.add(permitComercialRadio); + commertialGroup.add(notPermitComercialLicenseRadio); + modificationsGroup.add(permitModRadio); + modificationsGroup.add(permitModSaRadio); + modificationsGroup.add(notPermitModRadio); + commercialfieldSet.add(commertialGroup); + modificationsfieldSet.add(modificationsGroup); + } - @Override - public boolean isAllowModif() { - return permitModRadio.getValue(); - } + @Override + public boolean isAllowComercial() { + return permitComercialRadio.getValue(); + } - @Override - public boolean isAllowModifShareAlike() { - return permitModSaRadio.getValue(); - } + @Override + public boolean isAllowModif() { + return permitModRadio.getValue(); + } - @Override - public void onChange(final Listener0 slot) { - // onChange.add(slot); - } + @Override + public boolean isAllowModifShareAlike() { + return permitModSaRadio.getValue(); + } - @Override - public void reset() { - super.reset(); - permitComercialRadio.setChecked(true); - permitModSaRadio.setChecked(true); - } + @Override + public void onChange(final SimpleCallback onChange) { + this.onChange = onChange; + } - @Override - public void setFlags(final boolean isCopyleft, final boolean isAppropiateForCulturalWorks, - final boolean isNonComercial) { - info.setVisible(isCopyleft, isAppropiateForCulturalWorks, isNonComercial); - } + @Override + public void reset() { + super.reset(); + permitComercialRadio.setValue(true); + permitModSaRadio.setValue(true); + } + + @Override + public void setFlags(final boolean isCopyleft, final boolean isAppropiateForCulturalWorks, + final boolean isNonComercial) { + info.setVisible(isCopyleft, isAppropiateForCulturalWorks, isNonComercial); + } } Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardTrdFormView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardTrdFormView.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardTrdFormView.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -17,22 +17,22 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.licensewizard.pages; +package cc.kune.gspace.client.licensewizard.pages; -import org.ourproject.kune.platf.client.View; +import cc.kune.common.client.utils.SimpleCallback; -import com.calclab.suco.client.events.Listener0; +import com.google.gwt.user.client.ui.IsWidget; -public interface LicenseWizardTrdFormView extends View { - boolean isAllowComercial(); +public interface LicenseWizardTrdFormView extends IsWidget { + boolean isAllowComercial(); - boolean isAllowModif(); + boolean isAllowModif(); - boolean isAllowModifShareAlike(); + boolean isAllowModifShareAlike(); - void onChange(Listener0 slot); + void onChange(SimpleCallback callback); - void reset(); + void reset(); - void setFlags(boolean isCopyleft, boolean isAppropiateForCulturalWorks, boolean isNonComercial); + void setFlags(boolean isCopyleft, boolean isAppropiateForCulturalWorks, boolean isNonComercial); } Modified: trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -22,7 +22,6 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; -import cc.kune.common.client.utils.TextUtils; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.ws.entheader.EntityHeader; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -42,12 +41,12 @@ @Inject public GroupOptionsPanel(final EntityHeader entityHeader, final I18nTranslationService i18n, final NotifyLevelImages images, final GroupOptionsCollection entityOptionsGroup) { - super(GROUP_OP_PANEL_ID, "", WIDTH, HEIGHT + 80, WIDTH, HEIGHT + 80, false, images, - GROUP_OPTIONS_ERROR_ID, i18n.t("Close"), null, null, null); + super(GROUP_OP_PANEL_ID, "", WIDTH, HEIGHT + 80, false, images, GROUP_OPTIONS_ERROR_ID, + i18n.t("Close"), null, null, null); this.entityHeader = entityHeader; this.entityPreferencesGroup = entityOptionsGroup; super.setIconCls("k-options-icon"); - super.setTitle(i18n.t(CoreMessages.GROUP_OPTIONS_DIALOG_TITLE) + TextUtils.IN_DEVELOPMENT_P); + super.setTitle(i18n.t(CoreMessages.GROUP_OPTIONS_DIALOG_TITLE)); } @Override Modified: trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -21,7 +21,6 @@ import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; -import cc.kune.common.client.utils.TextUtils; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.ws.entheader.EntityHeader; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -41,11 +40,11 @@ @Inject public UserOptionsPanel(final EntityHeader entityHeader, final I18nTranslationService i18n, final NotifyLevelImages images, final UserOptionsCollection userOptionsGroup) { - super(USER_OP_PANEL_ID, "", WIDTH, HEIGHT + 80, WIDTH, HEIGHT + 80, false, images, - USER_OPTIONS_ERROR_ID, i18n.t("Close"), null, null, null); + super(USER_OP_PANEL_ID, "", WIDTH, HEIGHT + 80, false, images, USER_OPTIONS_ERROR_ID, + i18n.t("Close"), null, null, null); this.userPreferencesGroup = userOptionsGroup; super.setIconCls("k-options-icon"); - super.setTitle(i18n.t(CoreMessages.USER_OPTIONS_DIALOG_TITLE) + TextUtils.IN_DEVELOPMENT_P); + super.setTitle(i18n.t(CoreMessages.USER_OPTIONS_DIALOG_TITLE)); } @Override Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePanel.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePanel.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -52,6 +52,8 @@ flow.add(licenseImage); licenseImage.addStyleName("kune-pointer"); change = new Button(i18n.t("Change")); + change.addStyleName("k-button"); + flow.add(change); initWidget(flow); flow.setHeight(String.valueOf(EntityOptionsView.HEIGHT) + "px"); flow.setWidth(String.valueOf(EntityOptionsView.WIDTH) + "px"); Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePresenter.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePresenter.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -19,86 +19,95 @@ */ package cc.kune.gspace.client.options.license; +import cc.kune.common.client.utils.SimpleResponseCallback; import cc.kune.core.client.state.Session; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.gspace.client.licensewizard.LicenseChangeAction; +import cc.kune.gspace.client.licensewizard.LicenseChooseCallback; +import cc.kune.gspace.client.licensewizard.LicenseWizard; import cc.kune.gspace.client.options.EntityOptions; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.IsWidget; +import com.google.inject.Provider; public abstract class EntityOptionsDefLicensePresenter { - private final EntityOptions entityOptions; - // private final Provider<LicenseChangeAction> licChangeAction; - // private final Provider<LicenseWizard> licenseWizard; - protected final Session session; - private EntityOptionsDefLicenseView view; + private final EntityOptions entityOptions; + private final Provider<LicenseChangeAction> licChangeAction; + private final Provider<LicenseWizard> licenseWizard; + protected final Session session; + private EntityOptionsDefLicenseView view; - public EntityOptionsDefLicensePresenter(final EntityOptions entityOptions, final Session session) { - // final Provider<LicenseWizard> licenseWizard, final - // Provider<LicenseChangeAction> licChangeAction) { - this.entityOptions = entityOptions; - this.session = session; - // this.licenseWizard = licenseWizard; - // this.licChangeAction = licChangeAction; - } + public EntityOptionsDefLicensePresenter(final EntityOptions entityOptions, final Session session, + final Provider<LicenseWizard> licenseWizard, final Provider<LicenseChangeAction> licChangeAction) { + this.entityOptions = entityOptions; + this.session = session; + this.licenseWizard = licenseWizard; + this.licChangeAction = licChangeAction; + } - protected abstract boolean applicable(); + protected abstract boolean applicable(); - protected abstract LicenseDTO getCurrentDefLicense(); + protected abstract LicenseDTO getCurrentDefLicense(); - protected abstract StateToken getOperationToken(); + protected abstract StateToken getOperationToken(); - public IsWidget getView() { - return view; - } + public IsWidget getView() { + return view; + } - protected void init(final EntityOptionsDefLicenseView view) { - this.view = view; - entityOptions.addTab(view, view.getTabTitle()); - setState(); - view.getChange().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - onLicenseClick(); - } + protected void init(final EntityOptionsDefLicenseView view) { + this.view = view; + entityOptions.addTab(view, view.getTabTitle()); + setState(); + view.getChange().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + onChange(); + } + }); + view.getLicenseImage().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + onLicenseClick(); + } + }); + } + + public void onChange() { + licenseWizard.get().start(new LicenseChooseCallback() { + + @Override + public void onSelected(final LicenseDTO license) { + licChangeAction.get().changeLicense(getOperationToken(), license, new SimpleResponseCallback() { + + @Override + public void onCancel() { + } + + @Override + public void onSuccess() { + setLicense(license); + } }); - view.getLicenseImage().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - // onChange(); - } - }); - } + } + }); + } - // public void onChange() { - // licenseWizard.get().start(new Listener<LicenseDTO>() { - // @Override - // public void onEvent(final LicenseDTO license) { - // licChangeAction.get().changeLicense(getOperationToken(), license, new - // Listener0() { - // @Override - // public void onEvent() { - // setLicense(license); - // } - // }); - // } - // }); - // } + public void onLicenseClick() { + view.openWindow(getCurrentDefLicense().getUrl()); + } - public void onLicenseClick() { - view.openWindow(getCurrentDefLicense().getUrl()); - } + private void setLicense(final LicenseDTO license) { + view.setLicense(license); + } - private void setLicense(final LicenseDTO license) { - view.setLicense(license); + protected void setState() { + if (applicable()) { + setLicense(getCurrentDefLicense()); } - - protected void setState() { - if (applicable()) { - setLicense(getCurrentDefLicense()); - } - } + } } Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicensePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicensePresenter.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicensePresenter.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -25,39 +25,42 @@ import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.gspace.client.licensewizard.LicenseChangeAction; +import cc.kune.gspace.client.licensewizard.LicenseWizard; import cc.kune.gspace.client.options.GroupOptions; import com.google.inject.Inject; +import com.google.inject.Provider; -public class GroupOptionsDefLicensePresenter extends EntityOptionsDefLicensePresenter implements GroupOptionsDefLicense { +public class GroupOptionsDefLicensePresenter extends EntityOptionsDefLicensePresenter implements + GroupOptionsDefLicense { - @Inject - public GroupOptionsDefLicensePresenter(final GroupOptions entityOptions, final StateManager stateManager, - final Session session, final GroupOptionsDefLicenseView view) { - // , final Provider<LicenseWizard> licenseWizard, - // final Provider<LicenseChangeAction> licChangeAction) { - super(entityOptions, session);// , licenseWizard, licChangeAction); - init(view); - session.onUserSignIn(true, new UserSignInHandler() { - @Override - public void onUserSignIn(final UserSignInEvent event) { - setState(); - } - }); - } + @Inject + public GroupOptionsDefLicensePresenter(final GroupOptions entityOptions, + final StateManager stateManager, final Session session, final GroupOptionsDefLicenseView view, + final Provider<LicenseWizard> licenseWizard, final Provider<LicenseChangeAction> licChangeAction) { + super(entityOptions, session, licenseWizard, licChangeAction); + init(view); + session.onUserSignIn(true, new UserSignInHandler() { + @Override + public void onUserSignIn(final UserSignInEvent event) { + setState(); + } + }); + } - @Override - protected boolean applicable() { - return session.isCurrentStateAGroup(); - } + @Override + protected boolean applicable() { + return session.isCurrentStateAGroup(); + } - @Override - protected LicenseDTO getCurrentDefLicense() { - return session.getCurrentState().getGroup().getDefaultLicense(); - } + @Override + protected LicenseDTO getCurrentDefLicense() { + return session.getCurrentState().getGroup().getDefaultLicense(); + } - @Override - protected StateToken getOperationToken() { - return session.getCurrentStateToken(); - } + @Override + protected StateToken getOperationToken() { + return session.getCurrentStateToken(); + } } Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicensePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicensePresenter.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicensePresenter.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -24,40 +24,42 @@ import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.gspace.client.licensewizard.LicenseChangeAction; +import cc.kune.gspace.client.licensewizard.LicenseWizard; import cc.kune.gspace.client.options.UserOptions; import com.google.inject.Inject; +import com.google.inject.Provider; -public class UserOptionsDefLicensePresenter extends EntityOptionsDefLicensePresenter implements UserOptionsDefLicense { +public class UserOptionsDefLicensePresenter extends EntityOptionsDefLicensePresenter implements + UserOptionsDefLicense { - @Inject - public UserOptionsDefLicensePresenter(final UserOptions entityOptions, final Session session, - final UserOptionsDefLicenseView view) - // final Provider<LicenseWizard> licenseWizard, final - // Provider<LicenseChangeAction> licChangeAction) { - { - super(entityOptions, session); // , licenseWizard, licChangeAction); - init(view); - session.onUserSignIn(true, new UserSignInHandler() { - @Override - public void onUserSignIn(final UserSignInEvent event) { - setState(); - } - }); - } + @Inject + public UserOptionsDefLicensePresenter(final UserOptions entityOptions, final Session session, + final UserOptionsDefLicenseView view, final Provider<LicenseWizard> licenseWizard, + final Provider<LicenseChangeAction> licChangeAction) { + super(entityOptions, session, licenseWizard, licChangeAction); + init(view); + session.onUserSignIn(true, new UserSignInHandler() { + @Override + public void onUserSignIn(final UserSignInEvent event) { + setState(); + } + }); + } - @Override - protected boolean applicable() { - return session.isLogged(); - } + @Override + protected boolean applicable() { + return session.isLogged(); + } - @Override - protected LicenseDTO getCurrentDefLicense() { - return session.getCurrentState().getGroup().getDefaultLicense(); - } + @Override + protected LicenseDTO getCurrentDefLicense() { + return session.getCurrentState().getGroup().getDefaultLicense(); + } - @Override - protected StateToken getOperationToken() { - return session.getCurrentUser().getStateToken(); - } + @Override + protected StateToken getOperationToken() { + return session.getCurrentUser().getStateToken(); + } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/WizardDialog.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/WizardDialog.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/WizardDialog.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -37,243 +37,269 @@ public class WizardDialog implements WizardDialogView { - private final Button backButton; - private final Button cancelButton; - private final BasicDialog dialog; - private final Button finishButton; - private final I18nTranslationService i18n; - private final Button nextButton; - private final DeckPanel deck; - private final Panel mainPanel; + private final Button backButton; + private final Button cancelButton; + private final DeckPanel deck; + private final BasicDialog dialog; + private final Button finishButton; + private final I18nTranslationService i18n; + private final Panel mainPanel; + private final Button nextButton; - public WizardDialog(String dialogId, final String caption, final boolean modal, final boolean minimizable, - final int width, final int height, final int minWidth, final int minHeight, final String backId, - final String nextId, final String finishId, final String cancelId, final String closeId, - final I18nTranslationService i18n, final WizardListener listener) { - dialog = new BasicDialog(dialogId, caption, modal, false, width, height, minWidth, minHeight); - this.i18n = i18n; - dialog.setCollapsible(minimizable); - dialog.setShadow(true); - dialog.setPlain(true); - dialog.setCollapsible(false); - dialog.setResizable(false); - dialog.setId(dialogId); + public WizardDialog(final String dialogId, final String caption, final boolean modal, + final boolean minimizable, final int width, final int height, final int minWidth, + final int minHeight, final String backId, final String nextId, final String finishId, + final String cancelId, final String closeId, final I18nTranslationService i18n, + final WizardListener listener) { + dialog = new BasicDialog(dialogId, caption, modal, false, width, height, minWidth, minHeight); + this.i18n = i18n; + dialog.setCollapsible(minimizable); + dialog.setShadow(true); + dialog.setPlain(true); + dialog.setCollapsible(false); + dialog.setResizable(false); + dialog.setId(dialogId); - backButton = new Button(i18n.tWithNT("« Back", "used in button"), new ButtonListenerAdapter() { - @Override - public void onClick(Button button, EventObject e) { - listener.onBack(); - } - }); - backButton.setId(backId); - dialog.addButton(backButton); + backButton = new Button(i18n.tWithNT("« Back", "used in button"), new ButtonListenerAdapter() { + @Override + public void onClick(final Button button, final EventObject e) { + listener.onBack(); + } + }); + backButton.setId(backId); + dialog.addButton(backButton); - nextButton = new Button(i18n.tWithNT("Next »", "used in button"), new ButtonListenerAdapter() { - @Override - public void onClick(Button button, EventObject e) { - listener.onNext(); - } - }); - nextButton.setId(nextId); - dialog.addButton(nextButton); + nextButton = new Button(i18n.tWithNT("Next »", "used in button"), new ButtonListenerAdapter() { + @Override + public void onClick(final Button button, final EventObject e) { + listener.onNext(); + } + }); + nextButton.setId(nextId); + dialog.addButton(nextButton); - cancelButton = new Button(i18n.tWithNT("Cancel", "used in button"), new ButtonListenerAdapter() { - @Override - public void onClick(Button button, EventObject e) { - listener.onCancel(); - } - }); - cancelButton.setId(cancelId); - dialog.addButton(cancelButton); + cancelButton = new Button(i18n.tWithNT("Cancel", "used in button"), new ButtonListenerAdapter() { + @Override + public void onClick(final Button button, final EventObject e) { + listener.onCancel(); + } + }); + cancelButton.setId(cancelId); + dialog.addButton(cancelButton); - finishButton = new Button(i18n.tWithNT("Finish", "used in button"), new ButtonListenerAdapter() { - @Override - public void onClick(Button button, EventObject e) { - listener.onFinish(); - } - }); - finishButton.setId(finishId); - dialog.addButton(finishButton); + finishButton = new Button(i18n.tWithNT("Finish", "used in button"), new ButtonListenerAdapter() { + @Override + public void onClick(final Button button, final EventObject e) { + listener.onFinish(); + } + }); + finishButton.setId(finishId); + dialog.addButton(finishButton); - dialog.addListener(new WindowListenerAdapter() { - @Override - public void onHide(Component component) { - listener.onClose(); - } - }); - mainPanel = new Panel(); - mainPanel.setLayout(new FitLayout()); - deck = new DeckPanel(); - mainPanel.add(deck); - } + dialog.addListener(new WindowListenerAdapter() { + @Override + public void onHide(final Component component) { + listener.onClose(); + } + }); + mainPanel = new Panel(); + mainPanel.setLayout(new FitLayout()); + deck = new DeckPanel(); + mainPanel.add(deck); + } - public WizardDialog(String dialogId, final String caption, final boolean modal, final boolean minimizable, - final int width, final int height, final WizardListener listener, final I18nTranslationService i18n, - final String backId, final String nextId, final String finishId, final String cancelId, final String closeId) { - this(dialogId, caption, modal, minimizable, width, height, width, height, backId, nextId, finishId, cancelId, - closeId, i18n, listener); - } + public WizardDialog(final String dialogId, final String caption, final boolean modal, + final boolean minimizable, final int width, final int height, final WizardListener listener, + final I18nTranslationService i18n, final String backId, final String nextId, + final String finishId, final String cancelId, final String closeId) { + this(dialogId, caption, modal, minimizable, width, height, width, height, backId, nextId, finishId, + cancelId, closeId, i18n, listener); + } - public void add(View view) { - deck.add(toWidget(view)); - doLayoutIfNeeded(); - } + @Override + public void add(final View view) { + deck.add(toWidget(view)); + doLayoutIfNeeded(); + } - public void center() { - dialog.center(); - } + @Override + public void center() { + dialog.center(); + } - public void clear() { - dialog.clear(); - } + @Override + public void clear() { + dialog.clear(); + } - public void hide() { - dialog.hide(); + private void doLayoutIfNeeded() { + if (dialog.isRendered()) { + dialog.doLayout(); + mainPanel.syncSize(); + mainPanel.doLayout(); } + } - public boolean isCurrentPage(View view) { - int visibleWidgetIndex = deck.getVisibleWidget(); - if (visibleWidgetIndex == -1) { - return false; - } else { - return deck.getWidget(visibleWidgetIndex).equals(toWidget(view)); - } + private int getWidgetCount(final View view) { + if (view instanceof Widget) { + return deck.getWidgetIndex((Widget) view); + } else if (view instanceof DefaultForm) { + return deck.getWidgetIndex(((DefaultForm) view).getFormPanel()); } + return -1; + } - public void mask(final String message) { - dialog.getEl().mask(message, "x-mask-loading"); - } + @Override + public void hide() { + dialog.hide(); + } - public void maskProcessing() { - mask(i18n.t("Processing")); + @Override + public boolean isCurrentPage(final View view) { + final int visibleWidgetIndex = deck.getVisibleWidget(); + if (visibleWidgetIndex == -1) { + return false; + } else { + return deck.getWidget(visibleWidgetIndex).equals(toWidget(view)); } + } - public void remove(View view) { - int count = getWidgetCount(view); - if (count != -1) { - deck.remove(count); - } - } + @Override + public void mask(final String message) { + dialog.getEl().mask(message, "x-mask-loading"); + } - public void setBottomToolbar(Toolbar toolbar) { - dialog.setBottomToolbar(toolbar); - } + @Override + public void maskProcessing() { + mask(i18n.t("Processing")); + } - public void setEnabled(boolean back, boolean next, boolean cancel, boolean finish) { - setEnabledBackButton(back); - setEnabledNextButton(next); - setEnabledCancelButton(cancel); - setEnabledFinishButton(finish); + @Override + public void remove(final View view) { + final int count = getWidgetCount(view); + if (count != -1) { + deck.remove(count); } + } - public void setEnabledBackButton(final boolean enabled) { - if (enabled) { - backButton.enable(); - } else { - backButton.disable(); - } - } + public void setBottomToolbar1(final Toolbar toolbar) { + dialog.setBottomToolbar(toolbar); + } - public void setEnabledCancelButton(final boolean enabled) { - if (enabled) { - cancelButton.enable(); - } else { - cancelButton.disable(); - } - } + @Override + public void setEnabled(final boolean back, final boolean next, final boolean cancel, + final boolean finish) { + setEnabledBackButton(back); + setEnabledNextButton(next); + setEnabledCancelButton(cancel); + setEnabledFinishButton(finish); + } - public void setEnabledFinishButton(final boolean enabled) { - if (enabled) { - finishButton.enable(); - } else { - finishButton.disable(); - } + @Override + public void setEnabledBackButton(final boolean enabled) { + if (enabled) { + backButton.enable(); + } else { + backButton.disable(); } + } - public void setEnabledNextButton(final boolean enabled) { - if (enabled) { - nextButton.enable(); - } else { - nextButton.disable(); - } + @Override + public void setEnabledCancelButton(final boolean enabled) { + if (enabled) { + cancelButton.enable(); + } else { + cancelButton.disable(); } + } - public void setFinishText(final String text) { - finishButton.setText(text); + @Override + public void setEnabledFinishButton(final boolean enabled) { + if (enabled) { + finishButton.enable(); + } else { + finishButton.disable(); } + } - public void setIconCls(String iconCls) { - dialog.setIconCls(iconCls); + @Override + public void setEnabledNextButton(final boolean enabled) { + if (enabled) { + nextButton.enable(); + } else { + nextButton.disable(); } + } - public void setVisible(boolean back, boolean next, boolean cancel, boolean finish) { - setVisibleBackButton(back); - setVisibleNextButton(next); - setVisibleCancelButton(cancel); - setVisibleFinishButton(finish); - } + @Override + public void setFinishText(final String text) { + finishButton.setText(text); + } - public void setVisibleBackButton(final boolean visible) { - backButton.setVisible(visible); - } + public void setIconCls(final String iconCls) { + dialog.setIconCls(iconCls); + } - public void setVisibleCancelButton(final boolean visible) { - cancelButton.setVisible(visible); - } + @Override + public void setVisible(final boolean back, final boolean next, final boolean cancel, + final boolean finish) { + setVisibleBackButton(back); + setVisibleNextButton(next); + setVisibleCancelButton(cancel); + setVisibleFinishButton(finish); + } - public void setVisibleFinishButton(final boolean visible) { - finishButton.setVisible(visible); - } + @Override + public void setVisibleBackButton(final boolean visible) { + backButton.setVisible(visible); + } - public void setVisibleNextButton(final boolean visible) { - nextButton.setVisible(visible); - } + @Override + public void setVisibleCancelButton(final boolean visible) { + cancelButton.setVisible(visible); + } - public void show() { - dialog.show(); - } + @Override + public void setVisibleFinishButton(final boolean visible) { + finishButton.setVisible(visible); + } - public void show(View view) { - int count = getWidgetCount(view); - if (count != -1) { - deck.showWidget(count); - dialog.add(mainPanel); - doLayoutIfNeeded(); - } else { - OldNotifyUser.error("Widget not found in deck of WizardDialog"); - } + @Override + public void setVisibleNextButton(final boolean visible) { + nextButton.setVisible(visible); + } - } + @Override + public void show() { + dialog.show(); + } - public void unMask() { - dialog.getEl().unmask(); + @Override + public void show(final View view) { + final int count = getWidgetCount(view); + if (count != -1) { + deck.showWidget(count); + dialog.add(mainPanel); + doLayoutIfNeeded(); + } else { + OldNotifyUser.error("Widget not found in deck of WizardDialog"); } - private void doLayoutIfNeeded() { - if (dialog.isRendered()) { - dialog.doLayout(); - mainPanel.syncSize(); - mainPanel.doLayout(); - } - } + } - private int getWidgetCount(View view) { - if (view instanceof Widget) { - return deck.getWidgetIndex((Widget) view); - } else if (view instanceof DefaultForm) { - return deck.getWidgetIndex(((DefaultForm) view).getFormPanel()); - } - return -1; + private Widget toWidget(final View view) { + if (view instanceof Widget) { + return (Widget) view; + } else if (view instanceof DefaultForm) { + return ((DefaultForm) view).getFormPanel(); + } else { + OldNotifyUser.error("Trying to add a unknown element in WizardDialog"); + return null; } + } - private Widget toWidget(View view) { - if (view instanceof Widget) { - return (Widget) view; - } else if (view instanceof DefaultForm) { - return ((DefaultForm) view).getFormPanel(); - } else { - OldNotifyUser.error("Trying to add a unknown element in WizardDialog"); - return null; - } - } + @Override + public void unMask() { + dialog.getEl().unmask(); + } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ImageInfo.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ImageInfo.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ImageInfo.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -22,7 +22,7 @@ import org.cobogw.gwt.user.client.CSS; import org.ourproject.kune.platf.client.ui.rte.insertlink.LinkInfo; -import cc.kune.core.client.ui.utils.ContentPosition; +import cc.kune.core.client.ui.ContentPosition; import com.google.gwt.dom.client.Element; import com.google.gwt.user.client.DOM; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPresenter.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPresenter.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -21,7 +21,7 @@ import org.ourproject.kune.platf.client.ui.dialogs.tabbed.OldAbstractTabbedDialogPresenter; -import cc.kune.core.client.ui.utils.ContentPosition; +import cc.kune.core.client.ui.ContentPosition; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertElementAbstractPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertElementAbstractPanel.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertElementAbstractPanel.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -23,7 +23,7 @@ import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; import org.ourproject.kune.platf.client.ui.rte.insertimg.ImageInfo; -import cc.kune.core.client.ui.utils.ContentPosition; +import cc.kune.core.client.ui.ContentPosition; import com.gwtext.client.data.Record; import com.gwtext.client.data.SimpleStore; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertImageAbstractPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertImageAbstractPanel.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertImageAbstractPanel.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -23,7 +23,7 @@ import org.ourproject.kune.platf.client.ui.rte.insertimg.ImageInfo; import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageDialogView; -import cc.kune.core.client.ui.utils.ContentPosition; +import cc.kune.core.client.ui.ContentPosition; import com.gwtext.client.data.Record; import com.gwtext.client.data.SimpleStore; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -23,7 +23,7 @@ import org.ourproject.kune.platf.client.ui.rte.insertimg.abstractimg.InsertElementAbstractPanel; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialogView; -import cc.kune.core.client.ui.utils.ContentPosition; +import cc.kune.core.client.ui.ContentPosition; import com.gwtext.client.widgets.Component; import com.gwtext.client.widgets.Panel; Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -1,63 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.workspace.client.licensewizard; - -import org.ourproject.kune.platf.client.ui.noti.OldNotifyUser; - -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.LicenseDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.events.Listener0; -import com.calclab.suco.client.ioc.Provider; -import com.google.gwt.user.client.rpc.AsyncCallback; - -public class LicenseChangeAction { - private final StateManager stateManager; - private final Provider<GroupServiceAsync> groupService; - private final Session session; - private final I18nTranslationService i18n; - - public LicenseChangeAction(final Provider<GroupServiceAsync> groupService, final Session session, - final I18nTranslationService i18n, final StateManager stateManager) { - this.groupService = groupService; - this.session = session; - this.i18n = i18n; - this.stateManager = stateManager; - } - - public void changeLicense(final StateToken token, final LicenseDTO license, final Listener0 onSuccess) { - OldNotifyUser.showProgressProcessing(); - groupService.get().changeDefLicense(session.getUserHash(), token, license, new AsyncCallback<Void>() { - public void onFailure(final Throwable caught) { - OldNotifyUser.hideProgress(); - OldNotifyUser.error(i18n.t("Error changing default group license")); - } - - public void onSuccess(final Void result) { - stateManager.reload(); - onSuccess.onEvent(); - } - }); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizard.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizard.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizard.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -1,31 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.workspace.client.licensewizard; - - -import cc.kune.core.shared.dto.LicenseDTO; - -import com.calclab.suco.client.events.Listener; - -public interface LicenseWizard { - - void start(Listener<LicenseDTO> listener); - -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPanel.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPanel.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -1,64 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.workspace.client.licensewizard; - -import org.ourproject.kune.platf.client.ui.dialogs.WizardDialog; -import org.ourproject.kune.platf.client.ui.dialogs.WizardListener; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - -import cc.kune.core.shared.i18n.I18nTranslationService; - -public class LicenseWizardPanel extends WizardDialog implements LicenseWizardView { - - public static final String LIC_WIZ_DIALOG = "k-lwp-diag"; - public static final String BACK_BTN_ID = "k-lwp-back-btn"; - public static final String NEXT_BTN_ID = "k-lwp-next-btn"; - public static final String FINISH_BTN_ID = "k-lwp-finish-btn"; - public static final String CLOSE_BTN_ID = "k-lwp-close-btn"; - public static final String CANCEL_BTN_ID = "k-lwp-cancel-btn"; - - public LicenseWizardPanel(final LicenseWizardPresenter presenter, final WorkspaceSkeleton ws, - I18nTranslationService i18n) { - super(LIC_WIZ_DIALOG, i18n.t("License wizard"), true, false, WIDTH, HEIGHT, WIDTH, HEIGHT, BACK_BTN_ID, - NEXT_BTN_ID, FINISH_BTN_ID, CANCEL_BTN_ID, CLOSE_BTN_ID, i18n, new WizardListener() { - public void onBack() { - presenter.onBack(); - } - - public void onCancel() { - presenter.onCancel(); - } - - public void onClose() { - presenter.onClose(); - } - - public void onFinish() { - presenter.onChange(); - } - - public void onNext() { - presenter.onNext(); - } - }); - super.setFinishText(i18n.t("Select")); - super.setIconCls("k-copyleft-icon"); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenter.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenter.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -1,218 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.workspace.client.licensewizard; - -import java.util.List; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.ui.noti.OldNotifyUser; -import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardFirstFormView; -import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardFrdFormView; -import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardSndFormView; -import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardTrdFormView; - -import cc.kune.core.client.state.Session; -import cc.kune.core.shared.dto.LicenseDTO; - -import com.allen_sauer.gwt.log.client.Log; -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener0; - -public class LicenseWizardPresenter implements LicenseWizard { - - private LicenseWizardView view; - private final LicenseWizardFirstFormView fstForm; - private final LicenseWizardSndFormView sndForm; - private final LicenseWizardTrdFormView trdForm; - private final LicenseWizardFrdFormView frdForm; - private final Session session; - private Listener<LicenseDTO> selectLicenseListener; - private final String ccVers; - - public LicenseWizardPresenter(LicenseWizardFirstFormView firstForm, LicenseWizardSndFormView sndForm, - LicenseWizardTrdFormView trdForm, LicenseWizardFrdFormView frdForm, Session session) { - this.fstForm = firstForm; - this.sndForm = sndForm; - this.trdForm = trdForm; - this.frdForm = frdForm; - this.session = session; - ccVers = "-" + session.getCurrentCCversion(); - } - - public View getView() { - return view; - } - - public void init(final LicenseWizardView view) { - this.view = view; - fstForm.onCopyLeftLicenseSelected(new Listener0() { - public void onEvent() { - onCopyLeftLicenseSelected(); - } - }); - fstForm.onAnotherLicenseSelected(new Listener0() { - public void onEvent() { - onAnotherLicenseSelecterd(); - } - }); - trdForm.onChange(new Listener0() { - public void onEvent() { - onCreativeCommonsChanged(); - } - }); - frdForm.onChange(new Listener0() { - public void onEvent() { - if (frdForm.getSelectedLicense().length() > 0) { - view.setEnabled(true, false, true, true); - } - } - }); - view.add(fstForm); - view.add(sndForm); - view.add(trdForm); - view.add(frdForm); - } - - public void onBack() { - if (view.isCurrentPage(sndForm)) { - showFst(); - } else if (in(trdForm)) { - showSnd(); - } else if (in(frdForm)) { - showSnd(); - } else { - Log.error("Programatic error in LicenseWizardPresenter"); - } - } - - public void onCancel() { - view.hide(); - } - - public void onChange() { - String licenseShortName; - if (in(fstForm)) { - licenseShortName = "by-sa" + ccVers; - } else if (in(trdForm)) { - if (trdForm.isAllowComercial()) { - licenseShortName = trdForm.isAllowModif() ? "by" + ccVers : trdForm.isAllowModifShareAlike() ? "by-sa" - + ccVers : "by-nd" + ccVers; - } else { - licenseShortName = trdForm.isAllowModif() ? "by-nc" + ccVers - : trdForm.isAllowModifShareAlike() ? "by-nc-sa" + ccVers : "by-nc-nd" + ccVers; - } - } else if (in(sndForm)) { - licenseShortName = "by-sa" + ccVers; - OldNotifyUser.error("Programatic error in LicenseWizardPresenter"); - } else { - licenseShortName = frdForm.getSelectedLicense(); - } - view.hide(); - selectLicenseListener.onEvent(getLicenseFromShortName(licenseShortName)); - } - - public void onClose() { - view.hide(); - } - - public void onNext() { - if (in(fstForm)) { - view.clear(); - showSnd(); - } else if (in(sndForm)) { - if (sndForm.isCommonLicensesSelected()) { - showTrd(); - } else { - showFrd(); - } - } else { - Log.error("Programatic error in LicenseWizardPresenter"); - } - } - - public void start(Listener<LicenseDTO> selectLicenseListener) { - this.selectLicenseListener = selectLicenseListener; - reset(); - view.show(); - view.center(); - } - - void onAnotherLicenseSelecterd() { - view.setEnabled(false, true, true, false); - } - - void onCopyLeftLicenseSelected() { - view.setEnabled(false, false, true, true); - } - - private LicenseDTO getLicenseFromShortName(final String shortName) { - List<LicenseDTO> licenses = session.getLicenses(); - for (int i = 0; i < licenses.size(); i++) { - final LicenseDTO licenseDTO = licenses.get(i); - if (licenseDTO.getShortName().equals(shortName)) { - return licenseDTO; - } - } - Log.error("Internal error: License not found"); - throw new IndexOutOfBoundsException("License not found"); - } - - private boolean in(View page) { - return view.isCurrentPage(page); - } - - private void onCreativeCommonsChanged() { - boolean isCopyleft = trdForm.isAllowComercial() && trdForm.isAllowModifShareAlike(); - boolean isAppropiateForCulturalWorks = trdForm.isAllowComercial() - && (trdForm.isAllowModif() || trdForm.isAllowModifShareAlike()); - trdForm.setFlags(isCopyleft, isAppropiateForCulturalWorks, !trdForm.isAllowComercial()); - } - - private void reset() { - view.clear(); - view.setEnabled(false, false, true, true); - view.show(fstForm); - fstForm.reset(); - sndForm.reset(); - trdForm.reset(); - frdForm.reset(); - } - - private void showFrd() { - view.show(frdForm); - view.setEnabled(true, false, true, false); - } - - private void showFst() { - view.clear(); - view.show(fstForm); - view.setEnabled(false, true, true, true); - } - - private void showSnd() { - view.show(sndForm); - view.setEnabled(true, true, true, false); - } - - private void showTrd() { - view.show(trdForm); - view.setEnabled(true, false, true, true); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardView.java 2011-05-06 20:13:51 UTC (rev 1356) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardView.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -1,28 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.workspace.client.licensewizard; - -import org.ourproject.kune.platf.client.ui.dialogs.WizardDialogView; - -public interface LicenseWizardView extends WizardDialogView { - - int WIDTH = 400; - int HEIGHT = 450; -} Copied: trunk/src/test/java/cc/kune/gspace/client/licensewizard (from rev 1355, trunk/src/test/java/org/ourproject/kune/workspace/client/licensewizard) Modified: trunk/src/test/java/cc/kune/gspace/client/licensewizard/LicenseWizardPresenterTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenterTest.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/test/java/cc/kune/gspace/client/licensewizard/LicenseWizardPresenterTest.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -17,67 +17,66 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.licensewizard; +package cc.kune.gspace.client.licensewizard; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardFirstFormView; -import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardFrdFormView; -import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardSndFormView; -import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardTrdFormView; import cc.kune.core.client.state.Session; +import cc.kune.gspace.client.licensewizard.pages.LicenseWizardFirstFormView; +import cc.kune.gspace.client.licensewizard.pages.LicenseWizardFrdFormView; +import cc.kune.gspace.client.licensewizard.pages.LicenseWizardSndFormView; +import cc.kune.gspace.client.licensewizard.pages.LicenseWizardTrdFormView; public class LicenseWizardPresenterTest { - private LicenseWizardView view; - private LicenseWizardPresenter licenseWizard; - private LicenseWizardFirstFormView firstForm; - private LicenseWizardSndFormView sndForm; - private LicenseWizardTrdFormView trdForm; - private LicenseWizardFrdFormView frdForm; + private LicenseWizardFirstFormView firstForm; + private LicenseWizardFrdFormView frdForm; + private LicenseWizardPresenter licenseWizard; + private LicenseWizardSndFormView sndForm; + private LicenseWizardTrdFormView trdForm; + private LicenseWizardView view; - @Before - public void before() { - view = Mockito.mock(LicenseWizardView.class); - firstForm = Mockito.mock(LicenseWizardFirstFormView.class); - sndForm = Mockito.mock(LicenseWizardSndFormView.class); - trdForm = Mockito.mock(LicenseWizardTrdFormView.class); - frdForm = Mockito.mock(LicenseWizardFrdFormView.class); - Session session = Mockito.mock(Session.class); - licenseWizard = new LicenseWizardPresenter(firstForm, sndForm, trdForm, frdForm, session); - licenseWizard.init(view); - } + @Before + public void before() { + view = Mockito.mock(LicenseWizardView.class); + firstForm = Mockito.mock(LicenseWizardFirstFormView.class); + sndForm = Mockito.mock(LicenseWizardSndFormView.class); + trdForm = Mockito.mock(LicenseWizardTrdFormView.class); + frdForm = Mockito.mock(LicenseWizardFrdFormView.class); + final Session session = Mockito.mock(Session.class); + licenseWizard = new LicenseWizardPresenter(null, view, null, firstForm, sndForm, trdForm, frdForm, + session); + } - @Test - public void onAnotherSelected() { - licenseWizard.onAnotherLicenseSelecterd(); - Mockito.verify(view).setEnabled(false, true, true, false); - Mockito.when(view.isCurrentPage(firstForm)).thenReturn(true); - licenseWizard.onNext(); - Mockito.verify(view).show(sndForm); - Mockito.verify(view).setEnabled(true, true, true, false); - Mockito.when(view.isCurrentPage(sndForm)).thenReturn(true); - licenseWizard.onBack(); - Mockito.verify(view).show(firstForm); - Mockito.verify(view).setEnabled(false, true, true, true); - } + @Test + public void onAnotherSelected() { + licenseWizard.onAnotherLicenseSelecterd(); + Mockito.verify(view).setEnabled(false, true, true, false); + Mockito.when(view.isCurrentPage(firstForm)).thenReturn(true); + licenseWizard.onNext(); + Mockito.verify(view).show(sndForm); + Mockito.verify(view).setEnabled(true, true, true, false); + Mockito.when(view.isCurrentPage(sndForm)).thenReturn(true); + licenseWizard.onBack(); + Mockito.verify(view).show(firstForm); + Mockito.verify(view).setEnabled(false, true, true, true); + } - @Test - public void onCopyleftSelected() { - licenseWizard.onCopyLeftLicenseSelected(); - Mockito.verify(view).setEnabled(false, false, true, true); - } + @Test + public void onCopyleftSelected() { + licenseWizard.onCopyLeftLicenseSelected(); + Mockito.verify(view).setEnabled(false, false, true, true); + } - @Test - public void onShowResetWidget() { - licenseWizard.start(null); - Mockito.verify(view).clear(); - Mockito.verify(view).center(); - Mockito.verify(view).setEnabled(false, false, true, true); - Mockito.verify(view).show(firstForm); - Mockito.verify(firstForm).reset(); - Mockito.verify(view).show(); - } + @Test + public void onShowResetWidget() { + licenseWizard.start(null); + Mockito.verify(view).clear(); + Mockito.verify(view).setEnabled(false, false, true, true); + Mockito.verify(view).show(firstForm); + Mockito.verify(firstForm).reset(); + Mockito.verify(view).show(); + } } Modified: trunk/src/test/java/cc/kune/gspace/client/licensewizard/MockProvider.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/workspace/client/licensewizard/MockProvider.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/test/java/cc/kune/gspace/client/licensewizard/MockProvider.java 2011-05-07 15:55:38 UTC (rev 1357) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.licensewizard; +package cc.kune.gspace.client.licensewizard; import org.mockito.Mockito;

1 0

06 May '11

Author: vjrj_ Date: 2011-05-06 22:13:51 +0200 (Fri, 06 May 2011) New Revision: 1356 Added: trunk/src/main/java/cc/kune/core/server/manager/file/FileGwtUploadAbstractServlet.java trunk/src/main/java/cc/kune/core/server/manager/file/FileGwtUploadServlet.java Removed: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummary.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryView.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupActionRegistry.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummary.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryView.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipateAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummary.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummaryView.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/RolAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/SocialNetworkPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UIStatus.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UnjoinButtonAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UserActionRegistry.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/other/ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ trunk/src/main/java/org/ourproject/kune/workspace/client/options/ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/ trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/SNRolActionTest.java Modified: trunk/.classpath trunk/README_FIRST trunk/pom.xml trunk/script/mvn-eclipse.sh trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPresenter.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/core/server/KuneRackModule.java trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoUploadManager.java trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java trunk/src/main/java/cc/kune/gspace/GSpace.gwt.xml trunk/src/main/java/cc/kune/gspace/client/GSpaceArmor.java trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoPanel.java trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoView.java trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoPresenter.java trunk/src/main/java/cc/kune/gspace/client/viewers/NoHomePageViewer.java trunk/src/main/java/cc/kune/msgs/client/UserMessage.java trunk/src/main/java/org/ourproject/kune/workspace/client/RegistryModule.java trunk/src/main/resources/kune.properties Log: Better uploader Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/.classpath 2011-05-06 20:13:51 UTC (rev 1356) @@ -24,8 +24,8 @@ <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar" sourcepath="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.2/commons-io-1.2.jar" sourcepath="M2_REPO/commons-io/commons-io/1.2/commons-io-1.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar" sourcepath="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar" sourcepath="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/waveprotocol/communication-src/0.3.0-SNAPSHOT/communication-src-0.3.0-SNAPSHOT.jar"/> @@ -61,6 +61,7 @@ <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-mvp-client/0.5/gwtp-mvp-client-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-mvp-client/0.5/gwtp-mvp-client-0.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-processors/0.5/gwtp-processors-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-processors/0.5/gwtp-processors-0.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-tester/0.5/gwtp-tester-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-tester/0.5/gwtp-tester-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/googlecode/gwtupload/gwtupload/0.6.3-compat/gwtupload-0.6.3-compat.jar" sourcepath="M2_REPO/com/googlecode/gwtupload/gwtupload/0.6.3-compat/gwtupload-0.6.3-compat-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/extjs/gxt/2.2.1/gxt-2.2.1.jar"/> <classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.0.20070617/h2-1.0.20070617.jar"/> <classpathentry kind="var" path="M2_REPO/com/calclab/emite/hablar/r1697/hablar-r1697.jar"/> Modified: trunk/README_FIRST =================================================================== --- trunk/README_FIRST 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/README_FIRST 2011-05-06 20:13:51 UTC (rev 1356) @@ -1,4 +1,4 @@ WARNING -Please note that we are doing a big refactorization of Kune to adapt it to Wave. Also we are starting to use other libraries (for instance gin for IoC instead of our old Suco library). Then don't expect to much of /trunk/ because of that (for our old more stable code see tag 0.0.6-pre-wiab). +Please note that we are doing a big refactorization of Kune to adapt it to Wave. Also we are starting to use other libraries (for instance gin for IoC instead of our old Suco library). Then maybe /trunk/ it's a litle bit inestable because of that (for our old more stable code see tag 0.0.6-pre-wiab). New code (and refactorized) is under cc.kune package. Our old code (not yet refactorized or deprecated) is under org.ourproject.kune package waiting for be adapted or removed. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/pom.xml 2011-05-06 20:13:51 UTC (rev 1356) @@ -462,7 +462,7 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>1.2</version> + <version>1.3.1</version> </dependency> <dependency> <groupId>commons-logging</groupId> @@ -472,7 +472,7 @@ <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> - <version>1.1.1</version> + <version>1.2</version> </dependency>  <dependency> @@ -613,7 +613,15 @@ <version>1.4</version> <type>jar</type> </dependency> +  + <dependency> + <groupId>com.googlecode.gwtupload</groupId> + <artifactId>gwtupload</artifactId> + <version>0.6.3-compat</version> + </dependency> +  </dependencies> +    Modified: trunk/script/mvn-eclipse.sh =================================================================== --- trunk/script/mvn-eclipse.sh 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/script/mvn-eclipse.sh 2011-05-06 20:13:51 UTC (rev 1356) @@ -1,4 +1,4 @@ -mvn eclipse:eclipse -Dgwt.compiler.skip=true +mvn eclipse:eclipse -o -Dgwt.compiler.skip=true RESULT=$? perl -p -i -e 's/<\/classpath>//g' .classpath #perl -p -i -e 's/\/home\/vjrj\/nfsdev\///g' .classpath Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -43,182 +43,182 @@ import com.gwtplatform.mvp.client.proxy.RevealRootContentEvent; public class SpaceSelectorPresenter extends - Presenter<SpaceSelectorPresenter.SpaceSelectorView, SpaceSelectorPresenter.SpaceSelectorProxy> { + Presenter<SpaceSelectorPresenter.SpaceSelectorView, SpaceSelectorPresenter.SpaceSelectorProxy> { - @ProxyCodeSplit - public interface SpaceSelectorProxy extends Proxy<SpaceSelectorPresenter> { - } + @ProxyCodeSplit + public interface SpaceSelectorProxy extends Proxy<SpaceSelectorPresenter> { + } - public interface SpaceSelectorView extends View { + public interface SpaceSelectorView extends View { - HasClickHandlers getGroupBtn(); + HasClickHandlers getGroupBtn(); - HasClickHandlers getHomeBtn(); + HasClickHandlers getHomeBtn(); - HasClickHandlers getPublicBtn(); + HasClickHandlers getPublicBtn(); - HasClickHandlers getUserBtn(); + HasClickHandlers getUserBtn(); - void setGroupBtnDown(boolean down); + void setGroupBtnDown(boolean down); - void setHomeBtnDown(boolean down); + void setHomeBtnDown(boolean down); - void setPublicBtnDown(boolean down); + void setPublicBtnDown(boolean down); - void setUserBtnDown(boolean down); - } + void setUserBtnDown(boolean down); + } - private final GSpaceArmor armor; - private Space currentSpace; - private String groupToken; - private String homeToken; - private String publicToken; - private final Session session; - private final Provider<SignIn> signIn; - private final StateManager stateManager; - private String userToken; + private final GSpaceArmor armor; + private Space currentSpace; + private String groupToken; + private String homeToken; + private String publicToken; + private final Session session; + private final Provider<SignIn> signIn; + private final StateManager stateManager; + private String userToken; - @Inject - public SpaceSelectorPresenter(final EventBus eventBus, final StateManager stateManager, - final SpaceSelectorView view, final SpaceSelectorProxy proxy, final GSpaceArmor armor, - final Session session, final Provider<SignIn> signIn) { - super(eventBus, view, proxy); - this.stateManager = stateManager; - this.armor = armor; - this.session = session; - this.signIn = signIn; - currentSpace = null; - homeToken = SiteTokens.HOME; - userToken = SiteTokens.WAVEINBOX; - groupToken = SiteTokens.GROUP_HOME; - publicToken = TokenUtils.preview(SiteTokens.GROUP_HOME); - view.getHomeBtn().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - stateManager.gotoHistoryToken(homeToken); - } - }); - view.getUserBtn().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - stateManager.gotoHistoryToken(userToken); - } - }); - view.getGroupBtn().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - stateManager.gotoHistoryToken(groupToken); - } - }); - view.getPublicBtn().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - stateManager.gotoHistoryToken(publicToken); - } - }); - } + @Inject + public SpaceSelectorPresenter(final EventBus eventBus, final StateManager stateManager, + final SpaceSelectorView view, final SpaceSelectorProxy proxy, final GSpaceArmor armor, + final Session session, final Provider<SignIn> signIn) { + super(eventBus, view, proxy); + this.stateManager = stateManager; + this.armor = armor; + this.session = session; + this.signIn = signIn; + currentSpace = null; + homeToken = SiteTokens.HOME; + userToken = SiteTokens.WAVEINBOX; + groupToken = SiteTokens.GROUP_HOME; + publicToken = TokenUtils.preview(SiteTokens.GROUP_HOME); + view.getHomeBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + stateManager.gotoHistoryToken(homeToken); + } + }); + view.getUserBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + stateManager.gotoHistoryToken(userToken); + } + }); + view.getGroupBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + stateManager.gotoHistoryToken(groupToken); + } + }); + view.getPublicBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + stateManager.gotoHistoryToken(publicToken); + } + }); + } - @ProxyEvent - public void onAppStart(final AppStartEvent event) { - } + @ProxyEvent + public void onAppStart(final AppStartEvent event) { + } - private void onGroupSpaceSelect() { - armor.selectGroupSpace(); - getView().setHomeBtnDown(false); - getView().setUserBtnDown(false); - getView().setGroupBtnDown(true); - getView().setPublicBtnDown(false); - currentSpace = Space.groupSpace; - } + private void onGroupSpaceSelect() { + armor.selectGroupSpace(); + getView().setHomeBtnDown(false); + getView().setUserBtnDown(false); + getView().setGroupBtnDown(true); + getView().setPublicBtnDown(false); + currentSpace = Space.groupSpace; + } - private void onHomeSpaceSelect() { - armor.selectHomeSpace(); - getView().setHomeBtnDown(true); - getView().setUserBtnDown(false); - getView().setGroupBtnDown(false); - getView().setPublicBtnDown(false); - currentSpace = Space.homeSpace; - } + private void onHomeSpaceSelect() { + armor.selectHomeSpace(); + getView().setHomeBtnDown(true); + getView().setUserBtnDown(false); + getView().setGroupBtnDown(false); + getView().setPublicBtnDown(false); + currentSpace = Space.homeSpace; + } - private void onPublicSpaceSelect() { - armor.selectPublicSpace(); - getView().setHomeBtnDown(false); - getView().setUserBtnDown(false); - getView().setGroupBtnDown(false); - getView().setPublicBtnDown(true); - currentSpace = Space.publicSpace; - } + private void onPublicSpaceSelect() { + armor.selectPublicSpace(); + getView().setHomeBtnDown(false); + getView().setUserBtnDown(false); + getView().setGroupBtnDown(false); + getView().setPublicBtnDown(true); + currentSpace = Space.publicSpace; + } - @ProxyEvent - public void onSpaceConf(final SpaceConfEvent event) { - final Space space = event.getSpace(); - final String token = event.getToken(); - switch (space) { - case homeSpace: - homeToken = token; - break; - case userSpace: - userToken = token; - break; - case groupSpace: - groupToken = token; - break; - case publicSpace: - publicToken = token; - break; - } + @ProxyEvent + public void onSpaceConf(final SpaceConfEvent event) { + final Space space = event.getSpace(); + final String token = event.getToken(); + switch (space) { + case homeSpace: + homeToken = token; + break; + case userSpace: + userToken = token; + break; + case groupSpace: + groupToken = token; + break; + case publicSpace: + publicToken = token; + break; } + } - @ProxyEvent - public void onSpaceSelect(final SpaceSelectEvent event) { - final Space space = event.getSpace(); - if (space != currentSpace) { - switch (space) { - case homeSpace: - onHomeSpaceSelect(); - break; - case userSpace: - onUserSpaceSelect(); - break; - case groupSpace: - onGroupSpaceSelect(); - break; - case publicSpace: - onPublicSpaceSelect(); - break; - default: - break; - } - // getView().hideTooltip(); - } + @ProxyEvent + public void onSpaceSelect(final SpaceSelectEvent event) { + final Space space = event.getSpace(); + if (space != currentSpace) { + switch (space) { + case homeSpace: + onHomeSpaceSelect(); + break; + case userSpace: + onUserSpaceSelect(); + break; + case groupSpace: + onGroupSpaceSelect(); + break; + case publicSpace: + onPublicSpaceSelect(); + break; + default: + break; + } + // getView().hideTooltip(); } + } - @ProxyEvent - public void onUserSignOut(final UserSignOutEvent event) { - if (currentSpace == Space.userSpace) { - stateManager.gotoHistoryToken(homeToken); - } - userToken = SiteTokens.WAVEINBOX; + @ProxyEvent + public void onUserSignOut(final UserSignOutEvent event) { + if (currentSpace == Space.userSpace) { + stateManager.gotoHistoryToken(homeToken); } + userToken = SiteTokens.WAVEINBOX; + } - private void onUserSpaceSelect() { - if (session.isLogged()) { - armor.selectUserSpace(); - getView().setHomeBtnDown(false); - getView().setUserBtnDown(true); - getView().setGroupBtnDown(false); - getView().setPublicBtnDown(false); - currentSpace = Space.userSpace; - } else { - signIn.get().setErrorMessage("Sign in to access to your workspace", NotifyLevel.info); - stateManager.gotoHistoryToken(TokenUtils.addRedirect(SiteTokens.SIGNIN, userToken)); - getView().setUserBtnDown(false); - // NotifyUser.info("Sign in to access to your workspace"); - } + private void onUserSpaceSelect() { + if (session.isLogged()) { + armor.selectUserSpace(); + getView().setHomeBtnDown(false); + getView().setUserBtnDown(true); + getView().setGroupBtnDown(false); + getView().setPublicBtnDown(false); + currentSpace = Space.userSpace; + } else { + signIn.get().setErrorMessage("Sign in to access to your inbox", NotifyLevel.info); + stateManager.gotoHistoryToken(TokenUtils.addRedirect(SiteTokens.SIGNIN, userToken)); + getView().setUserBtnDown(false); + // NotifyUser.info("Sign in to access to your workspace"); } + } - @Override - protected void revealInParent() { - RevealRootContentEvent.fire(this, this); - } + @Override + protected void revealInParent() { + RevealRootContentEvent.fire(this, this); + } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPresenter.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPresenter.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -26,6 +26,8 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.gspace.client.options.logo.CurrentLogoChangedEvent; +import cc.kune.gspace.client.options.logo.CurrentLogoChangedEvent.CurrentLogoChangedHandler; import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.ui.IsWidget; @@ -37,109 +39,115 @@ import com.gwtplatform.mvp.client.proxy.RevealRootContentEvent; public class EntityHeaderPresenter extends - Presenter<EntityHeaderPresenter.EntityHeaderView, EntityHeaderPresenter.EntityHeaderProxy> implements - EntityHeader { + Presenter<EntityHeaderPresenter.EntityHeaderView, EntityHeaderPresenter.EntityHeaderProxy> implements + EntityHeader { - @ProxyCodeSplit - public interface EntityHeaderProxy extends Proxy<EntityHeaderPresenter> { - } - public interface EntityHeaderView extends View { - void addAction(GuiActionDescrip descriptor); + @ProxyCodeSplit + public interface EntityHeaderProxy extends Proxy<EntityHeaderPresenter> { + } + public interface EntityHeaderView extends View { + void addAction(GuiActionDescrip descriptor); - void addWidget(IsWidget widget); + void addWidget(IsWidget widget); - void reloadImage(GroupDTO group); + void reloadImage(GroupDTO group); - void setLargeFont(); + void setLargeFont(); - void setLogoImage(StateToken stateToken); + void setLogoImage(StateToken stateToken); - void setLogoImageVisible(boolean visible); + void setLogoImageVisible(boolean visible); - void setLogoText(final String groupName); + void setLogoText(final String groupName); - void setMediumFont(); + void setMediumFont(); - void setSmallFont(); + void setSmallFont(); - // void setTheme(final WsTheme oldTheme, WsTheme newTheme); + // void setTheme(final WsTheme oldTheme, WsTheme newTheme); - void showDefUserLogo(); - } + void showDefUserLogo(); + } - private static final int LARGE_NAME_LIMIT = 17; - private static final int MEDIUM_NAME_LIMIT = 90; - private final Session session; + private static final int LARGE_NAME_LIMIT = 17; + private static final int MEDIUM_NAME_LIMIT = 90; + private final Session session; - @Inject - public EntityHeaderPresenter(final EventBus eventBus, final EntityHeaderView view, final EntityHeaderProxy proxy, - final StateManager stateManager, final Session session) { - super(eventBus, view, proxy); - this.session = session; - stateManager.onGroupChanged(true, new GroupChangedHandler() { - @Override - public void onGroupChanged(final GroupChangedEvent event) { - setGroupLogo(session.getCurrentState().getGroup()); - } - }); - // theme.addOnThemeChanged(new Listener2<WsTheme, WsTheme>() { - // @Override - // public void onEvent(final WsTheme oldTheme, final WsTheme newTheme) { - // // getView().setTheme(oldTheme, newTheme); - // } - // }); - } + @Inject + public EntityHeaderPresenter(final EventBus eventBus, final EntityHeaderView view, + final EntityHeaderProxy proxy, final StateManager stateManager, final Session session) { + super(eventBus, view, proxy); + this.session = session; + stateManager.onGroupChanged(true, new GroupChangedHandler() { + @Override + public void onGroupChanged(final GroupChangedEvent event) { + setGroupLogo(session.getCurrentState().getGroup()); + } + }); + eventBus.addHandler(CurrentLogoChangedEvent.getType(), new CurrentLogoChangedHandler() { + @Override + public void onCurrentLogoChanged(final CurrentLogoChangedEvent event) { + reloadGroupLogoImage(); + } + }); + // theme.addOnThemeChanged(new Listener2<WsTheme, WsTheme>() { + // @Override + // public void onEvent(final WsTheme oldTheme, final WsTheme newTheme) { + // // getView().setTheme(oldTheme, newTheme); + // } + // }); + } - @Override - public void addAction(final GuiActionDescrip descriptor) { - getView().addAction(descriptor); - } + @Override + public void addAction(final GuiActionDescrip descriptor) { + getView().addAction(descriptor); + } - @Override - public void addWidget(final IsWidget widget) { - getView().addWidget(widget); - } + @Override + public void addWidget(final IsWidget widget) { + getView().addWidget(widget); + } - @Override - public void refreshGroupLogo() { - setGroupLogo(session.getCurrentState().getGroup()); - } + @Override + public void refreshGroupLogo() { + setGroupLogo(session.getCurrentState().getGroup()); + } - @Override - public void reloadGroupLogoImage() { - getView().reloadImage(session.getCurrentState().getGroup()); - } + @Override + public void reloadGroupLogoImage() { + getView().reloadImage(session.getCurrentState().getGroup()); + } - @Override - protected void revealInParent() { - RevealRootContentEvent.fire(this, this); - } + @Override + protected void revealInParent() { + RevealRootContentEvent.fire(this, this); + } - void setGroupLogo(final GroupDTO group) { - if (group.hasLogo()) { - setLogoText(group.getLongName()); - getView().setLogoImage(group.getStateToken()); - getView().setLogoImageVisible(true); - } else { - setLogoText(group.getLongName()); - if (group.isPersonal()) { - getView().showDefUserLogo(); - getView().setLogoImageVisible(true); - } else { - getView().setLogoImageVisible(false); - } - } + void setGroupLogo(final GroupDTO group) { + if (group.hasLogo()) { + setLogoText(group.getLongName()); + getView().setLogoImage(group.getStateToken()); + getView().setLogoImageVisible(true); + } else { + setLogoText(group.getLongName()); + if (group.isPersonal()) { + getView().showDefUserLogo(); + getView().setLogoImageVisible(true); + } else { + getView().setLogoImageVisible(false); + } } + } - void setLogoText(final String name) { - final int length = name.length(); - if (length <= LARGE_NAME_LIMIT) { - getView().setLargeFont(); - } else if (length <= MEDIUM_NAME_LIMIT) { - getView().setMediumFont(); - } else { - getView().setSmallFont(); - } - getView().setLogoText(name); + void setLogoText(final String name) { + final int length = name.length(); + if (length <= LARGE_NAME_LIMIT) { + getView().setLargeFont(); + } else if (length <= MEDIUM_NAME_LIMIT) { + getView().setMediumFont(); + } else { + getView().setSmallFont(); } + getView().setLogoText(name); + } } Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-05-06 20:13:51 UTC (rev 1356) @@ -1,4 +1,6 @@ -CHARSET "UTF-8 "; body { +CHARSET "UTF-8 "; + +body { background-color: white; color: black; font-family: 'Ubuntu', Arial; @@ -795,7 +797,7 @@ white-space: nowrap; } */ -.k-sn-mainpanel .x-btn button,.k-sn-mainpanel button,button.k-button { +.k-sn-mainpanel .x-btn button,.k-sn-mainpanel button,button.k-button, .gwt-FileUpload { font: 13px 'Ubuntu', arial; border: 2px solid #CCCCCC; cursor: pointer; @@ -1314,4 +1316,9 @@ bottom: 0; left: 0; right: 0; -} \ No newline at end of file +} + +.GWTUpld, table.GWTUpld td { + font-family: inherits !important; + font-size: 14px !important; +} Modified: trunk/src/main/java/cc/kune/core/server/KuneRackModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -34,6 +34,7 @@ import cc.kune.core.server.manager.file.EntityLogoUploadManager; import cc.kune.core.server.manager.file.FileDownloadManager; import cc.kune.core.server.manager.file.FileUploadManager; +import cc.kune.core.server.manager.file.FileGwtUploadServlet; import cc.kune.core.server.properties.PropertiesFileName; import cc.kune.core.server.rack.RackBuilder; import cc.kune.core.server.rack.RackModule; @@ -131,7 +132,7 @@ builder.installRESTServices("^/ws/json/", TestJSONService.class, GroupJSONService.class, UserJSONService.class, I18nTranslationJSONService.class, ContentJSONService.class); builder.installServlet("^/ws/servlets/", FileUploadManager.class, FileDownloadManager.class, - EntityLogoUploadManager.class, EntityLogoDownloadManager.class); + EntityLogoUploadManager.class, EntityLogoDownloadManager.class, FileGwtUploadServlet.class); builder.at("^/ws/(.*)$").install(new ForwardFilter("^/ws/(.*)$", "/ws/{0}")); } Modified: trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoUploadManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoUploadManager.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoUploadManager.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -22,19 +22,19 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; -import java.io.Writer; -import javax.servlet.http.HttpServletResponse; - import magick.MagickException; import org.apache.commons.fileupload.FileItem; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import cc.kune.core.client.services.FileConstants; import cc.kune.core.server.auth.ActionLevel; import cc.kune.core.server.auth.Authenticated; import cc.kune.core.server.auth.Authorizated; import cc.kune.core.server.manager.GroupManager; +import cc.kune.core.server.properties.KuneProperties; import cc.kune.core.shared.domain.AccessRol; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -44,117 +44,64 @@ import com.google.inject.Inject; import com.google.inject.persist.Transactional; -public class EntityLogoUploadManager extends FileUploadManagerAbstract { +public class EntityLogoUploadManager extends FileGwtUploadAbstractServlet { - private static final long serialVersionUID = -4281058427935636238L; + public static final Log LOG = LogFactory.getLog(FileGwtUploadServlet.class); + private static final long serialVersionUID = 1L; + private final GroupManager groupManager; + private final I18nTranslationService i18n; - @Inject - transient GroupManager groupManager; + @Inject + public EntityLogoUploadManager(final KuneProperties kuneProperties, final GroupManager groupManager, + final I18nTranslationService i18n) { + super(kuneProperties); + this.groupManager = groupManager; + this.i18n = i18n; + } - @Inject - transient I18nTranslationService i18n; - - @Override - protected void beforePostStart() { + protected void createUploadedFile(final StateToken stateToken, final String mimeTypeS, + final File origFile) throws Exception, IOException, MagickException, FileNotFoundException { + final BasicMimeType mimeType = new BasicMimeType(mimeTypeS); + if (!mimeType.getType().equals("image")) { + throw new Exception("Trying to set a non image (" + mimeTypeS + ") as group logo"); } + final Group group = groupManager.findByShortName(stateToken.getGroup()); - @Override - protected void beforeRespond(final HttpServletResponse response, final Writer w) throws IOException { - response.setCharacterEncoding("utf-8"); - response.setContentType("text/xml"); + if (group == Group.NO_GROUP) { + throw new Exception("Group not found trying to set the logo"); } - protected void createUploadedFile(final StateToken stateToken, final String mimeTypeS, final File origFile) - throws Exception, IOException, MagickException, FileNotFoundException { - final BasicMimeType mimeType = new BasicMimeType(mimeTypeS); - if (!mimeType.getType().equals("image")) { - throw new Exception("Trying to set a non image (" + mimeTypeS + ") as group logo"); - } - final Group group = groupManager.findByShortName(stateToken.getGroup()); + final File tmpDestFile = File.createTempFile("logoDest", ""); - if (group == Group.NO_GROUP) { - throw new Exception("Group not found trying to set the logo"); - } + final boolean result = ImageUtilsDefault.scaleImageToMax(origFile.getAbsolutePath(), + tmpDestFile.getAbsolutePath(), FileConstants.LOGO_DEF_HEIGHT); - final File tmpDestFile = File.createTempFile("logoDest", ""); - - final boolean result = ImageUtilsDefault.scaleImageToMax(origFile.getAbsolutePath(), - tmpDestFile.getAbsolutePath(), FileConstants.LOGO_DEF_HEIGHT); - - if (result) { - group.setLogo(FileUtils.getBytesFromFile(tmpDestFile)); - group.setLogoMime(mimeType); - logFileDel(tmpDestFile.delete()); - } else { - logFileDel(tmpDestFile.delete()); - throw new Exception("Cannot create group logo thumb"); - } + if (result) { + group.setLogo(FileUtils.getBytesFromFile(tmpDestFile)); + group.setLogoMime(mimeType); + logFileDel(tmpDestFile.delete()); + } else { + logFileDel(tmpDestFile.delete()); + throw new Exception("Cannot create group logo thumb"); } + } - @Override - @Authenticated - @Authorizated(accessRolRequired = AccessRol.Administrator, actionLevel = ActionLevel.group) - @Transactional - protected void createUploadedFile(final String userHash, final StateToken stateToken, final String fileName, - final FileItem file, final String typeId) throws Exception { - final String mimeTypeS = file.getContentType(); - final File tmpOrigFile = File.createTempFile("logoOrig", ""); - file.write(tmpOrigFile); - createUploadedFile(stateToken, mimeTypeS, tmpOrigFile); - logFileDel(tmpOrigFile.delete()); + @Override + @Authenticated + @Authorizated(accessRolRequired = AccessRol.Administrator, actionLevel = ActionLevel.group) + @Transactional + protected String createUploadedFile(final String userHash, final StateToken stateToken, + final String fileName, final FileItem file, final String typeId) { + final String mimeTypeS = file.getContentType(); + try { + final File tmpOrigFile = File.createTempFile("logoOrig", ""); + file.write(tmpOrigFile); + createUploadedFile(stateToken, mimeTypeS, tmpOrigFile); + logFileDel(tmpOrigFile.delete()); + } catch (final Exception e) { + return i18n.t("Error uploading file"); } + return i18n.t("Success uploading"); + } - /** - * Expect result with this format: - * - * <pre> - * <?xml version="1.0" encoding="UTF-8"?> - * <response success="false"> - * <errors> - * <field> - * <id>first</id> - * <msg><![CDATA[ - * Invalid name. <br /><i>This is a test validation message from the server </i> - * ]]></msg> - * </field> - * <field> - * <id>dob</id> - * <msg><![CDATA[ - * Invalid Date of Birth. <br /><i>This is a test validation message from the server </i> - * ]]></msg> - * </field> - * </errors> - * </response> - * </pre> - **/ - protected String createXmlResponse(final boolean success, final String message) { - String error = ""; - // FIXME: Use Group/User field when necessary - if (!success) { - error = "<errors><field><id>" + FileConstants.GROUP_LOGO_FIELD + "</id><msg><![CDATA[" + message - + "]]></msg></field></errors>"; - } - return "<response success=\"" + success + "\">" + error + "</response>"; - } - - @Override - protected void onFileUploadException(final HttpServletResponse response) throws IOException { - doResponse(response, createXmlResponse(false, i18n.t("Error: File too large")).toString(), - HttpServletResponse.SC_BAD_REQUEST); - } - - @Override - protected void onOtherException(final HttpServletResponse response, final Exception e) throws IOException { - super.onOtherException(response, e); - LOG.info("Exception: " + e.getCause()); - // e.printStackTrace(); - doResponse(response, createXmlResponse(false, i18n.t("Error uploading file")).toString(), - HttpServletResponse.SC_BAD_REQUEST); - } - - @Override - protected void onSuccess(final HttpServletResponse response) throws IOException { - doResponse(response, createXmlResponse(true, i18n.t("Success uploading")).toString()); - } - } Added: trunk/src/main/java/cc/kune/core/server/manager/file/FileGwtUploadAbstractServlet.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/file/FileGwtUploadAbstractServlet.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/manager/file/FileGwtUploadAbstractServlet.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -0,0 +1,72 @@ +package cc.kune.core.server.manager.file; + +import gwtupload.server.UploadAction; +import gwtupload.server.exceptions.UploadActionException; + +import java.util.List; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import cc.kune.core.client.services.FileConstants; +import cc.kune.core.server.properties.KuneProperties; +import cc.kune.core.shared.domain.utils.StateToken; + +public abstract class FileGwtUploadAbstractServlet extends UploadAction { + + public static final Log LOG = LogFactory.getLog(FileGwtUploadAbstractServlet.class); + private static final long serialVersionUID = 1L; + + public FileGwtUploadAbstractServlet(final KuneProperties kuneProperties) { + this.maxSize = Integer.valueOf(kuneProperties.get(KuneProperties.UPLOAD_MAX_FILE_SIZE_IN_KS)); + this.uploadDelay = Integer.valueOf(kuneProperties.get(KuneProperties.UPLOAD_DELAY_FOR_TEST)); + } + + protected abstract String createUploadedFile(final String userHash, final StateToken stateToken, + final String fileName, final FileItem file, final String typeId); + + @Override + public String executeAction(final HttpServletRequest request, final List<FileItem> fileItems) + throws UploadActionException { + String userHash = null; + StateToken stateToken = null; + String typeId = null; + String fileName = null; + FileItem file = null; + for (final Object element : fileItems) { + final FileItem item = (FileItem) element; + if (item.isFormField()) { + final String name = item.getFieldName(); + final String value = item.getString(); + LOG.info("name: " + name + " value: " + value); + if (name.equals(FileConstants.HASH)) { + userHash = value; + } + if (name.equals(FileConstants.TOKEN)) { + stateToken = new StateToken(value); + } + if (name.equals(FileConstants.TYPE_ID)) { + typeId = value; + } + } else { + fileName = item.getName(); + LOG.info("file: " + fileName + " fieldName: " + item.getFieldName() + " size: " + item.getSize() + + " typeId: " + typeId); + file = item; + } + } + + return createUploadedFile(userHash, stateToken, fileName, file, typeId); + + } + + protected void logFileDel(final boolean delResult) { + if (!delResult) { + LOG.error("Cannot delete file"); + } + } + +} Property changes on: trunk/src/main/java/cc/kune/core/server/manager/file/FileGwtUploadAbstractServlet.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/server/manager/file/FileGwtUploadServlet.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/file/FileGwtUploadServlet.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/manager/file/FileGwtUploadServlet.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -0,0 +1,29 @@ +package cc.kune.core.server.manager.file; + +import javax.inject.Inject; + +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import cc.kune.core.server.properties.KuneProperties; +import cc.kune.core.shared.domain.utils.StateToken; + +public class FileGwtUploadServlet extends FileGwtUploadAbstractServlet { + + public static final Log LOG = LogFactory.getLog(FileGwtUploadServlet.class); + private static final long serialVersionUID = 1L; + + @Inject + public FileGwtUploadServlet(final KuneProperties kuneProperties) { + super(kuneProperties); + } + + @Override + protected String createUploadedFile(final String userHash, final StateToken stateToken, + final String fileName, final FileItem file, final String typeId) { + LOG.info("ok"); + return ""; + } + +} Property changes on: trunk/src/main/java/cc/kune/core/server/manager/file/FileGwtUploadServlet.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -20,37 +20,39 @@ package cc.kune.core.server.properties; public interface KuneProperties { - String SITE_URL = "kune.siteurl"; - String SITE_DOMAIN = "kune.site.domain"; - String SITE_NAME = "kune.default.site.name"; - String SITE_SHORTNAME = "kune.default.site.shortName"; - String SITE_DEF_LICENSE = "kune.default.license"; + String AVI_EMBEDED_OBJECT = "kune.media.aviembededobject"; + String CHAT_DOMAIN = "kune.chat.domain"; + String CHAT_HTTP_BASE = "kune.chat.httpbase"; + String CHAT_ROOM_HOST = "kune.chat.roomHost"; + String CURRENT_CC_VERSION = "kune.currentccversion"; - String SITE_ADMIN_NAME = "kune.admin.name"; - String SITE_ADMIN_SHORTNAME = "kune.admin.shortName"; - String SITE_ADMIN_EMAIL = "kune.admin.email"; - String SITE_ADMIN_PASSWD = "kune.admin.password"; - String DEFAULT_SITE_SHORT_NAME = "kune.default.site.shortName"; - String CURRENT_CC_VERSION = "kune.currentccversion"; - String CHAT_HTTP_BASE = "kune.chat.httpbase"; - String CHAT_DOMAIN = "kune.chat.domain"; - String CHAT_ROOM_HOST = "kune.chat.roomHost"; - String WS_THEMES_DEF = "kune.wsthemes.default"; - String WS_THEMES = "kune.wsthemes"; - String SITE_LOGO_URL = "kune.sitelogourl"; - String UPLOAD_GALLERY_PERMITTED_EXTS = "kune.upload.gallerypermittedextensions"; - String UPLOAD_MAX_FILE_SIZE = "kune.upload.maxfilesizeinmegas"; - String UPLOAD_LOCATION = "kune.upload.location"; - String IMAGES_RESIZEWIDTH = "kune.images.resizewidth"; - String IMAGES_THUMBSIZE = "kune.images.thumbsize"; - String IMAGES_CROPSIZE = "kune.images.cropsize"; - String IMAGES_ICONSIZE = "kune.images.iconsize"; - String FLV_EMBEDED_OBJECT = "kune.media.flvembededobject"; - String OGG_EMBEDED_OBJECT = "kune.media.oggembededobject"; - String MP3_EMBEDED_OBJECT = "kune.media.mp3embededobject"; - String AVI_EMBEDED_OBJECT = "kune.media.aviembededobject"; + String DEFAULT_SITE_SHORT_NAME = "kune.default.site.shortName"; + String FLV_EMBEDED_OBJECT = "kune.media.flvembededobject"; + String IMAGES_CROPSIZE = "kune.images.cropsize"; + String IMAGES_ICONSIZE = "kune.images.iconsize"; + String IMAGES_RESIZEWIDTH = "kune.images.resizewidth"; + String IMAGES_THUMBSIZE = "kune.images.thumbsize"; + String MP3_EMBEDED_OBJECT = "kune.media.mp3embededobject"; + String OGG_EMBEDED_OBJECT = "kune.media.oggembededobject"; + String SITE_ADMIN_EMAIL = "kune.admin.email"; + String SITE_ADMIN_NAME = "kune.admin.name"; + String SITE_ADMIN_PASSWD = "kune.admin.password"; + String SITE_ADMIN_SHORTNAME = "kune.admin.shortName"; + String SITE_DEF_LICENSE = "kune.default.license"; + String SITE_DOMAIN = "kune.site.domain"; + String SITE_LOGO_URL = "kune.sitelogourl"; + String SITE_NAME = "kune.default.site.name"; + String SITE_SHORTNAME = "kune.default.site.shortName"; + String SITE_URL = "kune.siteurl"; + String UPLOAD_DELAY_FOR_TEST = "kune.upload.delayfortest"; + String UPLOAD_GALLERY_PERMITTED_EXTS = "kune.upload.gallerypermittedextensions"; + String UPLOAD_LOCATION = "kune.upload.location"; + String UPLOAD_MAX_FILE_SIZE = "kune.upload.maxfilesizeinmegas"; + String UPLOAD_MAX_FILE_SIZE_IN_KS = "kune.upload.maxfilesizeinks"; + String WS_THEMES = "kune.wsthemes"; + String WS_THEMES_DEF = "kune.wsthemes.default"; - String get(String key); + String get(String key); - String get(String key, String defaultValue); + String get(String key, String defaultValue); } Modified: trunk/src/main/java/cc/kune/gspace/GSpace.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/GSpace.gwt.xml 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/gspace/GSpace.gwt.xml 2011-05-06 20:13:51 UTC (rev 1356) @@ -5,4 +5,11 @@ <source path='client' excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> <inherits name="cc.kune.pspace.PSpace" /> + +  + <inherits name="gwtupload.GWTUpload"/> +  + <stylesheet src="Upload.css"/> + + </module> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmor.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmor.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmor.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -63,4 +63,6 @@ void selectPublicSpace(); void selectUserSpace(); + + void setContentVisible(boolean visible); } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -51,6 +51,8 @@ @UiField VerticalPanel docContainer; @UiField + DockLayoutPanel docContainerParent; + @UiField FlowPanel docFooter; @UiField FlowPanel docHeader; @@ -203,4 +205,11 @@ public void selectUserSpace() { tabs.selectTab(userSpace); } + + @Override + public void setContentVisible(final boolean visible) { + // NotifyUser.info("Visible: " + visible); + // docContainer.getElement().getStyle().setOpacity(visible ? 1d : .0d); + // docFooter.getElement().getStyle().setOpacity(visible ? 1d : .0d); + } } Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml 2011-05-06 20:13:51 UTC (rev 1356) @@ -57,7 +57,7 @@ </g:north> <g:center> <g:DockLayoutPanel unit="PX" - styleName="{res.style.docEditorMargin}"> + styleName="{res.style.docEditorMargin}" ui:field="docContainerParent"> <g:west size="10"> <g:SimplePanel /> </g:west> Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoPanel.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoPanel.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -19,7 +19,12 @@ \*/ package cc.kune.gspace.client.options.logo; -import cc.kune.common.client.log.Log; +import gwtupload.client.IFileInput.FileInputType; +import gwtupload.client.IUploader.OnCancelUploaderHandler; +import gwtupload.client.IUploader.OnChangeUploaderHandler; +import gwtupload.client.IUploader.OnFinishUploaderHandler; +import gwtupload.client.IUploader.OnStartUploaderHandler; +import gwtupload.client.MultiUploader; import cc.kune.common.client.ui.IconLabel; import cc.kune.common.client.utils.OnAcceptCallback; import cc.kune.core.client.resources.CoreMessages; @@ -28,158 +33,103 @@ import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.options.EntityOptionsView; -import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.event.shared.EventBus; +import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.FileUpload; -import com.google.gwt.user.client.ui.FormPanel; -import com.google.gwt.user.client.ui.FormPanel.SubmitCompleteEvent; -import com.google.gwt.user.client.ui.FormPanel.SubmitEvent; +import com.google.gwt.user.client.ui.DecoratorPanel; +import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Hidden; import com.google.gwt.user.client.ui.IsWidget; import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.VerticalPanel; public class EntityOptionsLogoPanel extends Composite implements EntityOptionsLogoView { + public class UploadButton extends Composite implements HasClickHandlers { + DecoratorPanel widget = new DecoratorPanel(); + + public UploadButton() { + final DecoratorPanel widget = new DecoratorPanel(); + final Button btn = new Button(i18n.t("Choose")); + btn.addStyleName("k-button"); + initWidget(widget); + widget.setWidget(btn); + widget.setHeight("50px"); + } + + @Override + public HandlerRegistration addClickHandler(final ClickHandler handler) { + return addDomHandler(handler, ClickEvent.getType()); + } + } + public static final String ICON_UPLD_SERVLET = "servlets/EntityLogoUploadManager"; private final Label dialogInfoLabel; - private final FileUpload fileUpload = new FileUpload(); - private final FormPanel form = new FormPanel(); private final I18nTranslationService i18n; - private OnAcceptCallback onAccept; private final IconLabel tabTitle; private final Hidden tokenField; + private final MultiUploader uploader; private final Hidden userhashField; - // private final TextField file; - public EntityOptionsLogoPanel(final EventBus eventBus, final I18nTranslationService i18n, final String panelId, final String buttonId, final String inputId, final NavResources res) { super(); this.i18n = i18n; tabTitle = new IconLabel(res.picture(), ""); - // super.setButtonAlign(HorizontalAlignment.LEFT); - // super.setFrame(true); - // super.setAutoScroll(false); - // super.setBorder(false); - // super.setFileUpload(true); - // super.setWidth(400); - // super.setIconCls("k-picture-icon"); - // super.setMethod(Method.POST); - // super.setUrl(ICON_UPLD_SERVLET); - // super.setWaitMsgTarget(true); - // super.setHideLabels(true); - // super.setPadding(10); - // super.addFormListener(new FormListener() { - // @Override - // public boolean doBeforeAction(final Form form) { - // return true; - // } - // - // @Override - // public void onActionComplete(final Form form, final int httpStatus, - // final String responseText) { - // presenter.onSubmitComplete(httpStatus, responseText); - // } - // - // @Override - // public void onActionFailed(final Form form, final int httpStatus, - // final String responseText) { - // presenter.onSubmitFailed(httpStatus, responseText); - // } - // }); - // super.add(dialogInfoLabel); - // file = new TextField("File", inputId); - // final EventCallback keyListener = new EventCallback() { - // @Override - // public void execute(final EventObject e) { - // // setEnableFileField(); - // } - // }; - // file.addKeyPressListener(keyListener); - // file.setId(inputId); - // file.setInputType("file"); - // super.add(file); - // final FieldListenerAdapter changeListener = new - // FieldListenerAdapter() { - // @Override - // public void onChange(final Field field, final Object newVal, final - // Object oldVal) { - // NotifyUser.info("change"); - // // setEnableFileField(); - // } - // }; - // // Don't works: - // file.addListener(changeListener); - // setId(panelId); - // - // sendButton.setId(buttonId); - // super.addButton(sendButton); + final UploadButton btn = new UploadButton(); + uploader = new MultiUploader(FileInputType.CUSTOM.with(btn)); + uploader.setServletPath(ICON_UPLD_SERVLET); + uploader.setMaximumFiles(1); dialogInfoLabel = new Label(); dialogInfoLabel.setWordWrap(true); dialogInfoLabel.addStyleName("kune-Margin-20-tb"); - form.setEncoding(FormPanel.ENCODING_MULTIPART); - form.setMethod(FormPanel.METHOD_POST); - form.setAction(GWT.getModuleBaseURL() + ICON_UPLD_SERVLET); + uploader.setValidExtensions("png", "jpg", "gif", "jpeg", "bmp"); userhashField = new Hidden(FileConstants.HASH, FileConstants.HASH); tokenField = new Hidden(FileConstants.TOKEN, FileConstants.TOKEN); - final VerticalPanel holder = new VerticalPanel(); + final FlowPanel holder = new FlowPanel(); - fileUpload.setName("upload"); + uploader.add(userhashField); + uploader.add(tokenField); holder.add(dialogInfoLabel); - holder.add(fileUpload); - holder.add(userhashField); - holder.add(tokenField); - holder.add(new Button(i18n.t("Send"), new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - Log.info("You selected: " + fileUpload.getFilename(), null); - form.submit(); - } - })); + holder.add(uploader); - form.addSubmitHandler(new FormPanel.SubmitHandler() { - @Override - public void onSubmit(final SubmitEvent event) { - // final String filename = file.getValueAsString(); - // if (filename != null && filename.length() > 0) { - // getForm().submit(); - // } - - if (!"".equalsIgnoreCase(fileUpload.getFilename())) { - GWT.log("UPLOADING FILE????", null); - // NOW WHAT???? - } else { - event.cancel(); // cancel the event - } - - } - }); - - form.addSubmitCompleteHandler(new FormPanel.SubmitCompleteHandler() { - @Override - public void onSubmitComplete(final SubmitCompleteEvent event) { - CurrentLogoChangedEvent.fire(eventBus); - } - }); - form.add(holder); - initWidget(form); + initWidget(holder); setHeight(String.valueOf(EntityOptionsView.HEIGHT) + "px"); setWidth(String.valueOf(EntityOptionsView.WIDTH) + "px"); + // uploader.setHeight("100px"); + addStyleName("k-overflow-y-auto"); addStyleName("k-tab-panel"); } @Override + public HandlerRegistration addOnCancelUploadHandler(final OnCancelUploaderHandler handler) { + return uploader.addOnCancelUploadHandler(handler); + } + + @Override + public HandlerRegistration addOnChangeUploadHandler(final OnChangeUploaderHandler handler) { + return uploader.addOnChangeUploadHandler(handler); + } + + @Override + public HandlerRegistration addOnFinishUploadHandler(final OnFinishUploaderHandler handler) { + return uploader.addOnFinishUploadHandler(handler); + } + + @Override + public HandlerRegistration addOnStartUploadHandler(final OnStartUploaderHandler handler) { + return uploader.addOnStartUploadHandler(handler); + } + + @Override public OnAcceptCallback getOnSubmit() { - // TODO Auto-generated method stub return null; } @@ -189,7 +139,7 @@ } public void reset() { - form.reset(); + uploader.reset(); } @Override Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoPresenter.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoPresenter.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -19,6 +19,10 @@ \*/ package cc.kune.gspace.client.options.logo; +import gwtupload.client.IUploadStatus.Status; +import gwtupload.client.IUploader; +import gwtupload.client.IUploader.OnFinishUploaderHandler; +import gwtupload.client.IUploader.OnStartUploaderHandler; import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.rpcservices.UserServiceAsync; import cc.kune.core.client.state.Session; @@ -45,13 +49,6 @@ this.entityLogo = entityLogo; this.entityOptions = entityOptions; this.userService = userService; - eventBus.addHandler(CurrentLogoChangedEvent.getType(), - new CurrentLogoChangedEvent.CurrentLogoChangedHandler() { - @Override - public void onCurrentLogoChanged(final CurrentLogoChangedEvent event) { - onSubmitComplete(); - } - }); } public IsWidget getView() { @@ -62,13 +59,34 @@ this.view = view; entityOptions.addTab(view, view.getTabTitle()); setState(); + view.addOnStartUploadHandler(new OnStartUploaderHandler() { + @Override + public void onStart(final IUploader uploader) { + setState(); + } + }); + view.addOnFinishUploadHandler(new OnFinishUploaderHandler() { + + @Override + public void onFinish(final IUploader uploader) { + onSubmitComplete(uploader); + } + }); } - public void onSubmitComplete() { - entityLogo.reloadGroupLogoImage(); + public void onSubmitComplete(final IUploader uploader) { + final String response = uploader.getServerInfo().message; + if (uploader.getStatus() == Status.SUCCESS) { + if (response != null) { + NotifyUser.info(response); + } + CurrentLogoChangedEvent.fire(eventBus); + } else { + onSubmitFailed(response); + } } - public void onSubmitFailed(final int httpStatus, final String responseText) { + public void onSubmitFailed(final String responseText) { NotifyUser.error("Error setting the logo: " + responseText); } Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoView.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoView.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -19,17 +19,29 @@ \*/ package cc.kune.gspace.client.options.logo; +import gwtupload.client.IUploader; +import gwtupload.client.IUploader.OnCancelUploaderHandler; import cc.kune.common.client.utils.OnAcceptCallback; import cc.kune.gspace.client.options.EntityOptionsTabView; +import com.google.gwt.event.shared.HandlerRegistration; + public interface EntityOptionsLogoView extends EntityOptionsTabView { - OnAcceptCallback getOnSubmit(); + HandlerRegistration addOnCancelUploadHandler(OnCancelUploaderHandler handler); - void setNormalGroupsLabels(); + HandlerRegistration addOnChangeUploadHandler(IUploader.OnChangeUploaderHandler handler); - void setPersonalGroupsLabels(); + HandlerRegistration addOnFinishUploadHandler(IUploader.OnFinishUploaderHandler handler); - void setUploadParams(String userHash, String token); + HandlerRegistration addOnStartUploadHandler(IUploader.OnStartUploaderHandler handler); + OnAcceptCallback getOnSubmit(); + + void setNormalGroupsLabels(); + + void setPersonalGroupsLabels(); + + void setUploadParams(String userHash, String token); + } Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoPresenter.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoPresenter.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -19,6 +19,7 @@ */ package cc.kune.gspace.client.options.logo; +import gwtupload.client.IUploader; import cc.kune.core.client.events.AvatarChangedEvent; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.UserServiceAsync; @@ -56,8 +57,8 @@ } @Override - public void onSubmitComplete() { - super.onSubmitComplete(); + public void onSubmitComplete(final IUploader uploader) { + super.onSubmitComplete(uploader); final GroupDTO group = session.getCurrentState().getGroup(); if (session.getCurrentUser().getShortName().equals(group.getShortName())) { userService.get().getUserAvatarBaser64(session.getUserHash(), group.getStateToken(), Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/NoHomePageViewer.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/NoHomePageViewer.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/NoHomePageViewer.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -26,11 +26,13 @@ @Override public void attach() { + gsArmor.setContentVisible(false); } @Override public void detach() { UiUtils.clear(gsArmor.getDocHeader()); + gsArmor.setContentVisible(true); } @Override Modified: trunk/src/main/java/cc/kune/msgs/client/UserMessage.java =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/UserMessage.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/cc/kune/msgs/client/UserMessage.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -46,114 +46,116 @@ public class UserMessage extends Composite implements HasText { - interface MessageUiBinder extends UiBinder<Widget, UserMessage> { - } - public interface MsgTemplate extends SafeHtmlTemplates { - @Template("<span>{0}</span>") - SafeHtml format(SafeHtml message); - } - public interface MsgWithTitleTemplate extends SafeHtmlTemplates { - @Template("<span><b>{0}</b><br/><p>{1}</p></span>") - SafeHtml format(SafeHtml title, SafeHtml message); - } - private static String closeTitle = "Close"; + interface MessageUiBinder extends UiBinder<Widget, UserMessage> { + } + public interface MsgTemplate extends SafeHtmlTemplates { + @Template("<span>{0}</span>") + SafeHtml format(SafeHtml message); + } + public interface MsgWithTitleTemplate extends SafeHtmlTemplates { + @Template("<span><b>{0}</b><br/><p>{1}</p></span>") + SafeHtml format(SafeHtml title, SafeHtml message); + } + private static String closeTitle = "Close"; - private static int fadeMills = 5000; + private static int fadeMills = 5000; - private static final MsgTemplate MSG_NO_TITLE = GWT.create(MsgTemplate.class); - private static final MsgWithTitleTemplate MSG_WITH_TITLE = GWT.create(MsgWithTitleTemplate.class); + private static final MsgTemplate MSG_NO_TITLE = GWT.create(MsgTemplate.class); + private static final MsgWithTitleTemplate MSG_WITH_TITLE = GWT.create(MsgWithTitleTemplate.class); - private static MessageUiBinder uiBinder = GWT.create(MessageUiBinder.class); + private static MessageUiBinder uiBinder = GWT.create(MessageUiBinder.class); - public static void setCloseTitle(final String title) { - closeTitle = title; - } + public static void setCloseTitle(final String title) { + closeTitle = title; + } - public static void setFadeMills(final int mills) { - fadeMills = mills; - } + public static void setFadeMills(final int mills) { + fadeMills = mills; + } - @UiField - PushButton close; + @UiField + PushButton close; - private final CloseCallback closeCallback; + private final CloseCallback closeCallback; - @UiField - Image icon; + @UiField + Image icon; - @UiField - InlineHTML label; + @UiField + InlineHTML label; - public UserMessage(final NotifyLevel level, final String title, final String message, final String id, - final boolean closeable, final CloseCallback closeCallback) { - this.closeCallback = closeCallback; - initWidget(uiBinder.createAndBindUi(this)); - if (TextUtils.notEmpty(id)) { - super.ensureDebugId(id); - } - if (TextUtils.notEmpty(title)) { - label.setHTML(MSG_WITH_TITLE.format(SimpleHtmlSanitizer.sanitizeHtml(title), - SimpleHtmlSanitizer.sanitizeHtml(message))); - } else { - label.setHTML(MSG_NO_TITLE.format(SimpleHtmlSanitizer.sanitizeHtml(message))); - } - close.setVisible(closeable); - close.setTitle(closeTitle); - if (!closeable) { - final Timer time = new Timer() { - @Override - public void run() { - close(); - } - }; - time.schedule(fadeMills); - } - icon.setResource(UserMessageImagesUtil.getIcon(level)); - final Show anim = new Show(this.getElement()); - anim.setDuration(0.5); - anim.play(); + public UserMessage(final NotifyLevel level, final String title, final String message, final String id, + final boolean closeable, final CloseCallback closeCallback) { + this.closeCallback = closeCallback; + initWidget(uiBinder.createAndBindUi(this)); + if (TextUtils.notEmpty(id)) { + super.ensureDebugId(id); } - - public UserMessage(final String message, final CloseCallback closeCallback) { - this("", message, false, closeCallback); + if (TextUtils.notEmpty(message)) { + if (TextUtils.notEmpty(title)) { + label.setHTML(MSG_WITH_TITLE.format(SimpleHtmlSanitizer.sanitizeHtml(title), + SimpleHtmlSanitizer.sanitizeHtml(message))); + } else { + label.setHTML(MSG_NO_TITLE.format(SimpleHtmlSanitizer.sanitizeHtml(message))); + } + close.setVisible(closeable); + close.setTitle(closeTitle); + if (!closeable) { + final Timer time = new Timer() { + @Override + public void run() { + close(); + } + }; + time.schedule(fadeMills); + } + icon.setResource(UserMessageImagesUtil.getIcon(level)); + final Show anim = new Show(this.getElement()); + anim.setDuration(0.5); + anim.play(); } + } - public UserMessage(final String title, final String message, final boolean closeable, - final CloseCallback closeCallback) { - this(NotifyLevel.info, title, message, "", closeable, closeCallback); - } + public UserMessage(final String message, final CloseCallback closeCallback) { + this("", message, false, closeCallback); + } - public UserMessage(final String title, final String message, final CloseCallback closeCallback) { - this(title, message, false, closeCallback); - } + public UserMessage(final String title, final String message, final boolean closeable, + final CloseCallback closeCallback) { + this(NotifyLevel.info, title, message, "", closeable, closeCallback); + } - private void close() { - final Fade fade = new Fade(this.getElement()); - fade.setDuration(0.7); - fade.play(); - fade.addEffectCompletedHandler(new EffectCompletedHandler() { + public UserMessage(final String title, final String message, final CloseCallback closeCallback) { + this(title, message, false, closeCallback); + } - @Override - public void onEffectCompleted(final EffectCompletedEvent event) { - removeFromParent(); - closeCallback.onClose(); - } - }); - } + private void close() { + final Fade fade = new Fade(this.getElement()); + fade.setDuration(0.7); + fade.play(); + fade.addEffectCompletedHandler(new EffectCompletedHandler() { - @Override - public String getText() { - return label.getText(); - } + @Override + public void onEffectCompleted(final EffectCompletedEvent event) { + removeFromParent(); + closeCallback.onClose(); + } + }); + } - @UiHandler("close") - void handleClick(final ClickEvent e) { - close(); - } + @Override + public String getText() { + return label.getText(); + } - @Override - public void setText(final String text) { - label.setText(text); - } + @UiHandler("close") + void handleClick(final ClickEvent e) { + close(); + } + @Override + public void setText(final String text) { + label.setText(text); + } + } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/RegistryModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/RegistryModule.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/RegistryModule.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -20,11 +20,7 @@ package org.ourproject.kune.workspace.client; import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.oldsn.GroupActionRegistry; -import org.ourproject.kune.workspace.client.oldsn.UserActionRegistry; -import cc.kune.core.client.cnt.ContentActionRegistry; import cc.kune.core.client.registry.AclEditableRegistry; import cc.kune.core.client.registry.AuthorableRegistry; import cc.kune.core.client.registry.CanBeHomepageRegistry; @@ -47,173 +43,177 @@ public class RegistryModule extends AbstractExtendedModule { - @Override - protected void onInstall() { + @Override + protected void onInstall() { - register(Singleton.class, new Factory<AclEditableRegistry>(AclEditableRegistry.class) { - @Override - public AclEditableRegistry create() { - return new AclEditableRegistry(); - } - }); - register(Singleton.class, new Factory<AuthorableRegistry>(AuthorableRegistry.class) { - @Override - public AuthorableRegistry create() { - return new AuthorableRegistry(); - } - }); - register(Singleton.class, new Factory<CanBeHomepageRegistry>(CanBeHomepageRegistry.class) { - @Override - public CanBeHomepageRegistry create() { - return new CanBeHomepageRegistry(); - } - }); + register(Singleton.class, new Factory<AclEditableRegistry>(AclEditableRegistry.class) { + @Override + public AclEditableRegistry create() { + return new AclEditableRegistry(); + } + }); + register(Singleton.class, new Factory<AuthorableRegistry>(AuthorableRegistry.class) { + @Override + public AuthorableRegistry create() { + return new AuthorableRegistry(); + } + }); + register(Singleton.class, new Factory<CanBeHomepageRegistry>(CanBeHomepageRegistry.class) { + @Override + public CanBeHomepageRegistry create() { + return new CanBeHomepageRegistry(); + } + }); - register(Singleton.class, new Factory<ComentableRegistry>(ComentableRegistry.class) { - @Override - public ComentableRegistry create() { - return new ComentableRegistry(); - } - }); + register(Singleton.class, new Factory<ComentableRegistry>(ComentableRegistry.class) { + @Override + public ComentableRegistry create() { + return new ComentableRegistry(); + } + }); - register(Singleton.class, new Factory<DragableRegistry>(DragableRegistry.class) { - @Override - public DragableRegistry create() { - return new DragableRegistry(); - } - }); + register(Singleton.class, new Factory<DragableRegistry>(DragableRegistry.class) { + @Override + public DragableRegistry create() { + return new DragableRegistry(); + } + }); - register(Singleton.class, new Factory<DropableRegistry>(DropableRegistry.class) { - @Override - public DropableRegistry create() { - return new DropableRegistry(); - } - }); + register(Singleton.class, new Factory<DropableRegistry>(DropableRegistry.class) { + @Override + public DropableRegistry create() { + return new DropableRegistry(); + } + }); - register(Singleton.class, new Factory<EmailSubscribeAbleRegistry>(EmailSubscribeAbleRegistry.class) { - @Override - public EmailSubscribeAbleRegistry create() { - return new EmailSubscribeAbleRegistry(); - } - }); + register(Singleton.class, new Factory<EmailSubscribeAbleRegistry>(EmailSubscribeAbleRegistry.class) { + @Override + public EmailSubscribeAbleRegistry create() { + return new EmailSubscribeAbleRegistry(); + } + }); - register(Singleton.class, new Factory<LicensableRegistry>(LicensableRegistry.class) { - @Override - public LicensableRegistry create() { - return new LicensableRegistry(); - } - }); + register(Singleton.class, new Factory<LicensableRegistry>(LicensableRegistry.class) { + @Override + public LicensableRegistry create() { + return new LicensableRegistry(); + } + }); - register(Singleton.class, new Factory<PublishModerableRegistry>(PublishModerableRegistry.class) { - @Override - public PublishModerableRegistry create() { - return new PublishModerableRegistry(); - } - }); + register(Singleton.class, new Factory<PublishModerableRegistry>(PublishModerableRegistry.class) { + @Override + public PublishModerableRegistry create() { + return new PublishModerableRegistry(); + } + }); - register(Singleton.class, new Factory<RateableRegistry>(RateableRegistry.class) { - @Override - public RateableRegistry create() { - return new RateableRegistry(); - } - }); + register(Singleton.class, new Factory<RateableRegistry>(RateableRegistry.class) { + @Override + public RateableRegistry create() { + return new RateableRegistry(); + } + }); - register(Singleton.class, new Factory<TageableRegistry>(TageableRegistry.class) { - @Override - public TageableRegistry create() { - return new TageableRegistry(); - } - }); + register(Singleton.class, new Factory<TageableRegistry>(TageableRegistry.class) { + @Override + public TageableRegistry create() { + return new TageableRegistry(); + } + }); - register(Singleton.class, new Factory<RenamableRegistry>(RenamableRegistry.class) { - @Override - public RenamableRegistry create() { - return new RenamableRegistry(); - } - }); + register(Singleton.class, new Factory<RenamableRegistry>(RenamableRegistry.class) { + @Override + public RenamableRegistry create() { + return new RenamableRegistry(); + } + }); - register(Singleton.class, new Factory<TranslatableRegistry>(TranslatableRegistry.class) { - @Override - public TranslatableRegistry create() { - return new TranslatableRegistry(); - } - }); + register(Singleton.class, new Factory<TranslatableRegistry>(TranslatableRegistry.class) { + @Override + public TranslatableRegistry create() { + return new TranslatableRegistry(); + } + }); - register(Singleton.class, new Factory<VersionableRegistry>(VersionableRegistry.class) { - @Override - public VersionableRegistry create() { - return new VersionableRegistry(); - } - }); + register(Singleton.class, new Factory<VersionableRegistry>(VersionableRegistry.class) { + @Override + public VersionableRegistry create() { + return new VersionableRegistry(); + } + }); - register(Singleton.class, new Factory<XmppComentableRegistry>(XmppComentableRegistry.class) { - @Override - public XmppComentableRegistry create() { - return new XmppComentableRegistry(); - } - }); + register(Singleton.class, new Factory<XmppComentableRegistry>(XmppComentableRegistry.class) { + @Override + public XmppComentableRegistry create() { + return new XmppComentableRegistry(); + } + }); - register(Singleton.class, new Factory<XmppNotifyCapableRegistry>(XmppNotifyCapableRegistry.class) { - @Override - public XmppNotifyCapableRegistry create() { - return new XmppNotifyCapableRegistry(); - } - }); + register(Singleton.class, new Factory<XmppNotifyCapableRegistry>(XmppNotifyCapableRegistry.class) { + @Override + public XmppNotifyCapableRegistry create() { + return new XmppNotifyCapableRegistry(); + } + }); - // register(Singleton.class, new - // Factory<IconsRegistry>(IconsRegistry.class) { - // @Override - // public IconsRegistry create() { - // return new IconsRegistry(); - // } - // }); + // register(Singleton.class, new + // Factory<IconsRegistry>(IconsRegistry.class) { + // @Override + // public IconsRegistry create() { + // return new IconsRegistry(); + // } + // }); - // register(Singleton.class, new - // Factory<ContentCapabilitiesRegistry>(ContentCapabilitiesRegistry.class) - // { - // @Override - // public ContentCapabilitiesRegistry create() { - // return new ContentCapabilitiesRegistry(i(AuthorableRegistry.class), - // i(AclEditableRegistry.class), - // i(OldIconsRegistry.class), i(CanBeHomepageRegistry.class), - // i(ComentableRegistry.class), - // i(DragableRegistry.class), i(DropableRegistry.class), - // i(EmailSubscribeAbleRegistry.class), - // i(LicensableRegistry.class), i(PublishModerableRegistry.class), - // i(RateableRegistry.class), - // i(TageableRegistry.class), i(RenamableRegistry.class), - // i(TranslatableRegistry.class), - // i(VersionableRegistry.class), i(XmppComentableRegistry.class), - // i(XmppNotifyCapableRegistry.class)); - // } - // }); - - register(Singleton.class, new Factory<ContextActionRegistry>(ContextActionRegistry.class) { - @Override - public ContextActionRegistry create() { - return new ContextActionRegistry(); - } - }); - - register(Singleton.class, new Factory<ContentActionRegistry>(ContentActionRegistry.class) { - @Override - public ContentActionRegistry create() { - return new ContentActionRegistry(); - } - }); - - register(Singleton.class, new Factory<GroupActionRegistry>(GroupActionRegistry.class) { - @Override - public GroupActionRegistry create() { - return new GroupActionRegistry(); - } - }); - - register(Singleton.class, new Factory<UserActionRegistry>(UserActionRegistry.class) { - @Override - public UserActionRegistry create() { - return new UserActionRegistry(); - } - }); - } + // register(Singleton.class, new + // Factory<ContentCapabilitiesRegistry>(ContentCapabilitiesRegistry.class) + // { + // @Override + // public ContentCapabilitiesRegistry create() { + // return new ContentCapabilitiesRegistry(i(AuthorableRegistry.class), + // i(AclEditableRegistry.class), + // i(OldIconsRegistry.class), i(CanBeHomepageRegistry.class), + // i(ComentableRegistry.class), + // i(DragableRegistry.class), i(DropableRegistry.class), + // i(EmailSubscribeAbleRegistry.class), + // i(LicensableRegistry.class), i(PublishModerableRegistry.class), + // i(RateableRegistry.class), + // i(TageableRegistry.class), i(RenamableRegistry.class), + // i(TranslatableRegistry.class), + // i(VersionableRegistry.class), i(XmppComentableRegistry.class), + // i(XmppNotifyCapableRegistry.class)); + // } + // }); + // + // register(Singleton.class, new + // Factory<ContextActionRegistry>(ContextActionRegistry.class) { + // @Override + // public ContextActionRegistry create() { + // return new ContextActionRegistry(); + // } + // }); + // + // register(Singleton.class, new + // Factory<ContentActionRegistry>(ContentActionRegistry.class) { + // @Override + // public ContentActionRegistry create() { + // return new ContentActionRegistry(); + // } + // }); + // + // register(Singleton.class, new + // Factory<GroupActionRegistry>(GroupActionRegistry.class) { + // @Override + // public GroupActionRegistry create() { + // return new GroupActionRegistry(); + // } + // }); + // + // register(Singleton.class, new + // Factory<UserActionRegistry>(UserActionRegistry.class) { + // @Override + // public UserActionRegistry create() { + // return new UserActionRegistry(); + // } + // }); + } } Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummary.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummary.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummary.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -1,24 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ -package org.ourproject.kune.workspace.client.oldsn; - - -public interface BuddiesSummary { -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryPanel.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryPanel.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -1,133 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ -package org.ourproject.kune.workspace.client.oldsn; - -import org.ourproject.kune.platf.client.actions.ActionItem; -import org.ourproject.kune.platf.client.actions.ActionItemCollection; -import org.ourproject.kune.platf.client.actions.ActionManager; -import org.ourproject.kune.platf.client.actions.MenuItemsContainer; -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPanel; -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; -import org.ourproject.kune.platf.client.ui.AbstractToolbar; -import org.ourproject.kune.workspace.client.skel.SummaryPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - -import cc.kune.common.client.ui.BasicThumb; -import cc.kune.core.client.resources.CoreMessages; -import cc.kune.core.shared.dto.UserSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.events.Listener; -import com.google.gwt.dom.client.Element; -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.VerticalPanel; -import com.google.gwt.user.client.ui.Widget; -import com.gwtext.client.widgets.menu.Menu; - -public class BuddiesSummaryPanel extends SummaryPanel implements BuddiesSummaryView { - - private final MenuItemsContainer<UserSimpleDTO> menuItemsContainer; - private final FlowPanel flowPanel; - private final Label otherBuddiesLabel; - private final I18nTranslationService i18n; - private final ActionManager actionManager; - private final AbstractToolbar toolbar; - private final Label noBuddiesPublic; - - public BuddiesSummaryPanel(final BuddiesSummaryPresenter presenter, final WorkspaceSkeleton ws, - final I18nTranslationService i18n, final ActionManager actionManager, - final ActionToolbarView<UserSimpleDTO> actionToolbarView) { - super(i18n.t("Buddies"), i18n.t("This user buddies"), ws); - this.actionManager = actionManager; - menuItemsContainer = new MenuItemsContainer<UserSimpleDTO>(); - this.i18n = i18n; - final VerticalPanel vp = new VerticalPanel(); - flowPanel = new FlowPanel(); - otherBuddiesLabel = new Label(); - otherBuddiesLabel.addStyleName("kune-Margin-Small-trbl"); - vp.add(flowPanel); - vp.add(otherBuddiesLabel); - toolbar = ((ActionToolbarPanel<UserSimpleDTO>) actionToolbarView).getToolbar(); - toolbar.setBlankStyle(); - vp.add((Widget) toolbar); - super.add(vp); - addInSummary(); - noBuddiesPublic = new Label(i18n.t(CoreMessages.BUDDIES_NOT_PUBLIC)); - noBuddiesPublic.addStyleName("kune-Margin-7-trbl"); - noBuddiesPublic.addStyleName("k-text-gray"); - } - - public void addBuddie(final UserSimpleDTO user, final ActionItemCollection<UserSimpleDTO> actionCollection, - final String avatarUrl, final String tooltipTitle, final String tooltip) { - final ClickHandler listener = new ClickHandler() { - public void onClick(final ClickEvent event) { - final Element sender = event.getRelativeElement(); - final Menu menu = menuItemsContainer.get(user.getShortName()); - if (menu.getItems().length > 0) { - menu.showAt(sender.getAbsoluteLeft(), sender.getAbsoluteTop() + 5); - } - } - }; - menuItemsContainer.createItemMenu(user.getShortName(), actionCollection, - new Listener<ActionItem<UserSimpleDTO>>() { - public void onEvent(final ActionItem<UserSimpleDTO> actionItem) { - doAction(actionItem); - } - }); - - final BasicThumb thumb = new BasicThumb(avatarUrl.equals(NOAVATAR) ? "images/persons/person2-32.png" - : avatarUrl, AVATARSIZE, user.getShortName(), AVATARLABELMAXSIZE, false, listener); - thumb.setTooltip(tooltipTitle, tooltip); - flowPanel.add(thumb); - } - - @Override - public void clear() { - flowPanel.clear(); - clearOtherUsers(); - menuItemsContainer.clear(); - toolbar.removeAll(); - super.doLayoutIfNeeded(); - } - - public void clearOtherUsers() { - otherBuddiesLabel.setText(""); - } - - public void setNoBuddies() { - otherBuddiesLabel.setText(i18n.t("This user has no buddies")); - } - - public void setOtherUsers(final String text) { - otherBuddiesLabel.setText(text); - } - - public void showBuddiesNotVisible() { - flowPanel.add(noBuddiesPublic); - super.doLayoutIfNeeded(); - } - - private void doAction(final ActionItem<UserSimpleDTO> actionItem) { - actionManager.doAction(actionItem); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryPresenter.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryPresenter.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -1,241 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ -package org.ourproject.kune.workspace.client.oldsn; - -import java.util.List; - -import org.ourproject.kune.chat.client.ChatEngine; -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.actions.ActionEnableCondition; -import org.ourproject.kune.platf.client.actions.ActionMenuItemDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarMenuDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarMenuRadioDescriptor; -import org.ourproject.kune.platf.client.actions.RadioMustBeChecked; -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; -import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionBuddiesSummaryToolbar; - -import cc.kune.common.client.notify.NotifyUser; -import cc.kune.core.client.resources.icons.IconResources; -import cc.kune.core.client.rpcservices.AsyncCallbackSimple; -import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; -import cc.kune.core.client.rpcservices.UserServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.services.ImageUtils; -import cc.kune.core.client.state.AccessRightsClientManager; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.UserSNetVisibility; -import cc.kune.core.shared.domain.utils.AccessRights; -import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.dto.SocialNetworkDataDTO; -import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.dto.UserBuddiesDataDTO; -import cc.kune.core.shared.dto.UserSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.events.Listener; -import com.google.inject.Inject; -import com.google.inject.Provider; - -public class BuddiesSummaryPresenter extends SocialNetworkPresenter implements BuddiesSummary { - - public static final String BUDDIES_VISIBILITY_GROUP = "k-bsp-bud-visib"; - - private final UserActionRegistry actionRegistry; - private final Provider<ChatEngine> chatEngineProvider; - private final Provider<FileDownloadUtils> fileDownUtilsProvider; - private final I18nTranslationService i18n; - private final Session session; - private final StateManager stateManager; - private final ActionBuddiesSummaryToolbar toolbar; - private final Provider<UserServiceAsync> userServiceAsync; - private BuddiesSummaryView view; - - @Inject - public BuddiesSummaryPresenter(final StateManager stateManager, final Session session, - final Provider<UserServiceAsync> userServiceAsync, final UserActionRegistry actionRegistry, - final I18nTranslationService i18n, final Provider<ChatEngine> chatEngineProvider, - final ActionBuddiesSummaryToolbar toolbar, final Provider<FileDownloadUtils> fileDownUtilsProvider, - final ImageUtils imageUtils, final Provider<SocialNetworkServiceAsync> snServiceAsync, - final GroupActionRegistry groupActionRegistry, final AccessRightsClientManager accessRightManager, - final IconResources img) { - super(i18n, stateManager, accessRightManager, session, snServiceAsync, groupActionRegistry, - fileDownUtilsProvider, img); - this.stateManager = stateManager; - this.session = session; - this.userServiceAsync = userServiceAsync; - this.actionRegistry = actionRegistry; - this.i18n = i18n; - this.chatEngineProvider = chatEngineProvider; - this.toolbar = toolbar; - this.fileDownUtilsProvider = fileDownUtilsProvider; - stateManager.onStateChanged(new Listener<StateAbstractDTO>() { - @Override - public void onEvent(final StateAbstractDTO state) { - setState(state); - } - }); - stateManager.onSocialNetworkChanged(new Listener<StateAbstractDTO>() { - @Override - public void onEvent(final StateAbstractDTO state) { - setState(state); - } - }); - registerActions(); - } - - private void createAddNewBuddiesAction() { - final ActionToolbarMenuDescriptor<UserSimpleDTO> addNewBuddiesAction = new ActionToolbarMenuDescriptor<UserSimpleDTO>( - AccessRolDTO.Administrator, buddiesBottom, new Listener<UserSimpleDTO>() { - @Override - public void onEvent(final UserSimpleDTO parameter) { - NotifyUser.info("In development"); - } - }); - addNewBuddiesAction.setTextDescription(i18n.t("Add a new buddy")); - addNewBuddiesAction.setParentMenuTitle(i18n.t("Options")); - addNewBuddiesAction.setIconUrl("images/add-green.gif"); - actionRegistry.addAction(addNewBuddiesAction); - } - - private void createSetBuddiesVisibilityAction(final String textDescription, final UserSNetVisibility visibility) { - final ActionToolbarMenuRadioDescriptor<UserSimpleDTO> buddiesVisibilityAction = new ActionToolbarMenuRadioDescriptor<UserSimpleDTO>( - AccessRolDTO.Administrator, buddiesBottom, new Listener<UserSimpleDTO>() { - @Override - public void onEvent(final UserSimpleDTO parameter) { - userServiceAsync.get().setBuddiesVisibility(session.getUserHash(), - session.getCurrentState().getGroup().getStateToken(), visibility, - new AsyncCallbackSimple<Void>() { - @Override - public void onSuccess(final Void result) { - NotifyUser.info(i18n.t("Buddies visibility changed")); - } - }); - } - }, BUDDIES_VISIBILITY_GROUP, new RadioMustBeChecked() { - @Override - public boolean mustBeChecked() { - final StateAbstractDTO currentState = session.getCurrentState(); - if (currentState.getGroup().isPersonal()) { - final SocialNetworkDataDTO socialNetworkData = currentState.getSocialNetworkData(); - return socialNetworkData.getUserBuddiesVisibility().equals(visibility); - } - return false; - } - }); - buddiesVisibilityAction.setTextDescription(textDescription); - buddiesVisibilityAction.setParentMenuTitle(i18n.t("Options")); - buddiesVisibilityAction.setParentSubMenuTitle(i18n.t("Those who can view your buddies list")); - actionRegistry.addAction(buddiesVisibilityAction); - } - - public View getView() { - return view; - } - - public void init(final BuddiesSummaryView view) { - this.view = view; - } - - private void registerActions() { - final ActionMenuItemDescriptor<UserSimpleDTO> addAsBuddie = new ActionMenuItemDescriptor<UserSimpleDTO>( - AccessRolDTO.Viewer, new Listener<UserSimpleDTO>() { - @Override - public void onEvent(final UserSimpleDTO user) { - chatEngineProvider.get().addNewBuddie(user.getShortName()); - } - }); - addAsBuddie.setMustBeAuthenticated(true); - addAsBuddie.setTextDescription(i18n.t("Add as a buddie")); - addAsBuddie.setIconUrl("images/add-green.png"); - addAsBuddie.setEnableCondition(new ActionEnableCondition<UserSimpleDTO>() { - @Override - public boolean mustBeEnabled(final UserSimpleDTO user) { - return !chatEngineProvider.get().isBuddie(user.getShortName()); - } - }); - actionRegistry.addAction(addAsBuddie); - - final ActionMenuItemDescriptor<UserSimpleDTO> go = new ActionMenuItemDescriptor<UserSimpleDTO>( - AccessRolDTO.Viewer, new Listener<UserSimpleDTO>() { - @Override - public void onEvent(final UserSimpleDTO user) { - stateManager.gotoHistoryToken(user.getShortName()); - } - }); - go.setMustBeAuthenticated(false); - go.setTextDescription(i18n.t("Visit this user's homepage")); - go.setIconUrl("images/group-home.gif"); - actionRegistry.addAction(go); - - createAddNewBuddiesAction(); - createSetBuddiesVisibilityAction(i18n.t("anyone"), UserSNetVisibility.anyone); - createSetBuddiesVisibilityAction(i18n.t("only your buddies"), UserSNetVisibility.yourbuddies); - createSetBuddiesVisibilityAction(i18n.t("only you"), UserSNetVisibility.onlyyou); - } - - protected void setState(final StateAbstractDTO state) { - if (state.getGroup().isPersonal()) { - view.clear(); - final UserBuddiesDataDTO userBuddies = state.getUserBuddies(); - if (state.getSocialNetworkData().isBuddiesVisible()) { - final List<UserSimpleDTO> buddies = userBuddies.getBuddies(); - for (final UserSimpleDTO user : buddies) { - final String avatarUrl = user.hasLogo() ? fileDownUtilsProvider.get().getLogoImageUrl( - user.getStateToken()) : BuddiesSummaryView.NOAVATAR; - final String tooltip = super.createTooltipWithLogo(user.getShortName(), user.getStateToken(), - user.hasLogo(), true); - view.addBuddie(user, actionRegistry.getCurrentActions(user, session.isLogged(), new AccessRights( - true, true, true), false), avatarUrl, user.getName(), tooltip); - } - final boolean hasLocalBuddies = buddies.size() > 0; - final int numExtBuddies = userBuddies.getOtherExtBuddies(); - if (numExtBuddies > 0) { - if (hasLocalBuddies) { - // i18n: plural - view.setOtherUsers(i18n.t(numExtBuddies == 1 ? "and [%d] external user" - : "and [%d] external users", numExtBuddies)); - } else { - view.setOtherUsers(i18n.t(numExtBuddies == 1 ? "[%d] external user" : "[%d] external users", - numExtBuddies)); - } - } else { - if (hasLocalBuddies) { - view.clearOtherUsers(); - } else { - view.setNoBuddies(); - } - } - toolbar.disableMenusAndClearButtons(); - toolbar.addActions( - actionRegistry.getCurrentActions(session.getCurrentUser(), session.isLogged(), - state.getGroupRights(), true), ActionToolbar.IN_ANY); - toolbar.attach(); - view.show(); - } else { - view.showBuddiesNotVisible(); - view.show(); - } - } else { - view.hide(); - } - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryView.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryView.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -1,49 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ -package org.ourproject.kune.workspace.client.oldsn; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.actions.ActionItemCollection; - -import cc.kune.core.shared.dto.UserSimpleDTO; - -public interface BuddiesSummaryView extends View { - - String NOAVATAR = ""; - int AVATARSIZE = 32; - int AVATARLABELMAXSIZE = 15; - - void addBuddie(UserSimpleDTO user, ActionItemCollection<UserSimpleDTO> actionCollection, String avatarUrl, - String tooltipTitle, String tooltip); - - void clear(); - - void clearOtherUsers(); - - void hide(); - - void setNoBuddies(); - - void setOtherUsers(String text); - - void show(); - - void showBuddiesNotVisible(); -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupActionRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupActionRegistry.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupActionRegistry.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -1,30 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ -package org.ourproject.kune.workspace.client.oldsn; - -import org.ourproject.kune.platf.client.actions.ActionRegistry; - -import cc.kune.core.shared.domain.utils.StateToken; - -/** - * The Class GroupActionRegistry stores actions over groups (mainly used in SN) - */ -public class GroupActionRegistry extends ActionRegistry<StateToken> { -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummary.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummary.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummary.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -1,36 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.workspace.client.oldsn; - -import org.ourproject.kune.platf.client.ui.MenuItem; - -import cc.kune.core.shared.dto.GroupDTO; - -public interface GroupMembersSummary { - - void addGroupOperation(MenuItem<GroupDTO> operation, boolean mustBeLogged); - - void addUserOperation(MenuItem<GroupDTO> operation, boolean mustBeLogged); - - void removeGroupOperation(MenuItem<GroupDTO> operation, boolean mustBeLogged); - - void removeUserOperation(MenuItem<GroupDTO> operation, boolean mustBeLogged); - -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryPanel.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryPanel.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -1,139 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ -package org.ourproject.kune.workspace.client.oldsn; - -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPanel; -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; -import org.ourproject.kune.platf.client.ui.AbstractToolbar; -import org.ourproject.kune.platf.client.ui.gridmenu.GridDragConfiguration; -import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; -import org.ourproject.kune.platf.client.ui.gridmenu.GridMenuPanel; -import org.ourproject.kune.workspace.client.skel.SummaryPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.resources.CoreMessages; -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.GroupDTO; - -import com.calclab.suco.client.events.Listener; -import com.google.gwt.core.client.Scheduler; -import com.google.gwt.core.client.Scheduler.ScheduledCommand; -import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.Widget; -import com.gwtext.client.widgets.BoxComponent; -import com.gwtext.client.widgets.MessageBox; -import com.gwtext.client.widgets.event.ContainerListenerAdapter; - -public class GroupMembersSummaryPanel extends SummaryPanel implements GroupMembersSummaryView { - // private static final int MAX_HEIGHT = 110; - private final GridMenuPanel<GroupDTO> gridMenuPanel; - private final I18nUITranslationService i18n; - private final Label noMembersPublic; - private final GroupMembersSummaryPresenter presenter; - private final AbstractToolbar toolbar; - - public GroupMembersSummaryPanel(final GroupMembersSummaryPresenter presenter, final I18nUITranslationService i18n, - final WorkspaceSkeleton ws, final ActionToolbarView<StateToken> actionToolbarView) { - super(i18n.t("Group members"), i18n.t("People and groups collaborating in this group"), ws); - this.presenter = presenter; - this.i18n = i18n; - - final GridDragConfiguration dragConf = new GridDragConfiguration("kk", - i18n.t("Drop into the chat area to start a chat.") + "<br/>" - + i18n.t("Drop into a room to invite the user to join the chat room")); - gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This is an orphaned project, if you are interested " - + "please request to join to work on it"), dragConf, true, true, false, true, false); - final Listener<String> go = new Listener<String>() { - @Override - public void onEvent(final String groupShortName) { - presenter.onDoubleClick(groupShortName); - } - }; - // gridMenuPanel.onClick(go); - gridMenuPanel.onDoubleClick(go); - gridMenuPanel.getBottomBar().setCls("k-blank-toolbar"); - super.add(gridMenuPanel); - - noMembersPublic = new Label(i18n.t(CoreMessages.MEMBERS_NOT_PUBLIC)); - noMembersPublic.addStyleName("kune-Margin-7-trbl"); - noMembersPublic.addStyleName("k-text-gray"); - noMembersPublic.setVisible(false); - super.add(noMembersPublic); - - toolbar = ((ActionToolbarPanel<StateToken>) actionToolbarView).getToolbar(); - toolbar.setBlankStyle(); - super.add((Widget) toolbar); - super.addInSummary(); - ws.addListenerInEntitySummary(new ContainerListenerAdapter() { - @Override - public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight, - final int rawWidth, final int rawHeight) { - gridMenuPanel.setWidth(adjWidth); - } - }); - } - - @Override - public void addItem(final GridItem<GroupDTO> gridItem) { - gridMenuPanel.setVisible(true); - gridMenuPanel.addItem(gridItem); - doLayoutIfNeeded(); - } - - @Override - public void clear() { - gridMenuPanel.removeAll(); - toolbar.removeAll(); - noMembersPublic.setVisible(false); - doLayoutIfNeeded(); - } - - @Override - public void confirmAddCollab(final String groupShortName, final String groupLongName) { - final String groupName = groupLongName + " (" + groupShortName + ")"; - MessageBox.confirm(i18n.t("Confirm member joining"), i18n.t("Add [%s] as a member?", groupName), - new MessageBox.ConfirmCallback() { - @Override - public void execute(final String btnID) { - if (btnID.equals("yes")) { - Scheduler.get().scheduleDeferred(new ScheduledCommand() { - @Override - public void execute() { - presenter.addCollab(groupShortName); - } - }); - } - } - }); - } - - @Override - public void setDraggable(final boolean draggable) { - // gridMenuPanel.setDraggable(draggable); - } - - @Override - public void showMembersNotVisible() { - noMembersPublic.setVisible(true); - gridMenuPanel.setVisible(false); - doLayoutIfNeeded(); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryPresenter.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryPresenter.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -1,294 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ -package org.ourproject.kune.workspace.client.oldsn; - -import java.util.List; - -import org.ourproject.kune.chat.client.ChatEngine; -import org.ourproject.kune.platf.client.actions.ActionToolbarMenuDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarMenuRadioDescriptor; -import org.ourproject.kune.platf.client.actions.RadioMustBeChecked; -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; -import org.ourproject.kune.platf.client.ui.MenuItem; -import org.ourproject.kune.platf.client.ui.gridmenu.GridGroup; -import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionGroupSummaryToolbar; -import org.ourproject.kune.workspace.client.search.GroupLiveSearcher; - -import cc.kune.common.client.notify.NotifyUser; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.resources.icons.IconResources; -import cc.kune.core.client.rpcservices.AsyncCallbackSimple; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.services.ImageDescriptor; -import cc.kune.core.client.services.ImageUtils; -import cc.kune.core.client.state.AccessRightsClientManager; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.AdmissionType; -import cc.kune.core.shared.domain.SocialNetworkVisibility; -import cc.kune.core.shared.domain.utils.AccessRights; -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.AccessListsDTO; -import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.dto.InitDataDTO; -import cc.kune.core.shared.dto.LinkDTO; -import cc.kune.core.shared.dto.SocialNetworkDTO; -import cc.kune.core.shared.dto.SocialNetworkDataDTO; -import cc.kune.core.shared.dto.StateAbstractDTO; - -import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; -import com.calclab.suco.client.events.Listener; -import com.google.inject.Provider; - -public class GroupMembersSummaryPresenter extends SocialNetworkPresenter implements GroupMembersSummary { - - public static final String MEMBERS_VISIBILITY_GROUP = "k-gmsp-memb-visib"; - public static final String NEW_MEMBERS_POLICY_GROUP = "k-gmsp-new-memb-pol"; - - private final GridGroup adminCategory; - private final GridGroup collabCategory; - private final GroupActionRegistry groupActionRegistry; - private final Provider<GroupServiceAsync> groupServiceProvider; - private final I18nUITranslationService i18n; - private final Provider<GroupLiveSearcher> liveSearcherProvider; - private final GridGroup pendigCategory; - private final Session session; - private final Provider<SocialNetworkServiceAsync> snServiceProvider; - private final StateManager stateManager; - private GroupMembersSummaryView view; - - public GroupMembersSummaryPresenter(final I18nUITranslationService i18n, final StateManager stateManager, - final ImageUtils imageUtils, final Session session, - final Provider<SocialNetworkServiceAsync> snServiceProvider, - final Provider<GroupServiceAsync> groupServiceProvider, - final Provider<GroupLiveSearcher> liveSearcherProvider, final Provider<ChatEngine> chatEngineProvider, - final GroupActionRegistry groupActionRegistry, final ActionGroupSummaryToolbar toolbar, - final Provider<FileDownloadUtils> downloadProvider, final AccessRightsClientManager accessRightsManager, - final IconResources img) { - super(i18n, stateManager, accessRightsManager, session, snServiceProvider, groupActionRegistry, - downloadProvider, img); - this.i18n = i18n; - this.stateManager = stateManager; - this.session = session; - this.snServiceProvider = snServiceProvider; - this.groupServiceProvider = groupServiceProvider; - this.liveSearcherProvider = liveSearcherProvider; - this.groupActionRegistry = groupActionRegistry; - final Listener<StateAbstractDTO> setStateListener = new Listener<StateAbstractDTO>() { - @Override - public void onEvent(final StateAbstractDTO state) { - setState(state); - toolbar.disableMenusAndClearButtons(); - toolbar.addActions(groupActionRegistry.getCurrentActions(state.getGroup().getStateToken(), - session.isLogged(), state.getGroupRights(), true), ActionToolbar.IN_ANY); - toolbar.attach(); - } - }; - stateManager.onStateChanged(setStateListener); - stateManager.onSocialNetworkChanged(setStateListener); - session.onInitDataReceived(new Listener<InitDataDTO>() { - @Override - public void onEvent(final InitDataDTO initData) { - addUserOperation(new MenuItem<GroupDTO>("images/new-chat.gif", i18n.t("Start a chat with this member"), - new Listener<GroupDTO>() { - @Override - public void onEvent(final GroupDTO group) { - chatEngineProvider.get().show(); - if (chatEngineProvider.get().isLoggedIn()) { - chatEngineProvider.get().chat( - XmppURI.jid(group.getShortName() + "@" + initData.getChatDomain())); - } else { - NotifyUser.important(i18n.t("To start a chat you need to be 'online'")); - } - } - }), true); - } - }); - final String adminsTitle = i18n.t("Admins"); - final String collabsTitle = i18n.t("Collaborators"); - final String pendingTitle = i18n.t("Pending"); - adminCategory = new GridGroup(adminsTitle, adminsTitle, i18n.t("People that can admin this group"), true); - collabCategory = new GridGroup(collabsTitle, collabsTitle, - i18n.t("Other people that collaborate with this group"), true); - pendigCategory = new GridGroup(pendingTitle, pendingTitle, - i18n.t("People pending to be accepted in this group by the admins"), - imageUtils.getImageHtml(ImageDescriptor.alert), true); - super.addGroupOperation(gotoGroupMenuItem, false); - super.addUserOperation(gotoMemberMenuItem, false); - createActions(); - } - - public void addCollab(final String groupShortName) { - NotifyUser.showProgressProcessing(); - snServiceProvider.get().addCollabMember(session.getUserHash(), session.getCurrentState().getStateToken(), - groupShortName, new AsyncCallbackSimple<SocialNetworkDataDTO>() { - @Override - public void onSuccess(final SocialNetworkDataDTO result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Member added as collaborator")); - stateManager.setSocialNetwork(result); - } - - }); - } - - private void createActions() { - final ActionToolbarMenuDescriptor<StateToken> addMember = new ActionToolbarMenuDescriptor<StateToken>( - AccessRolDTO.Administrator, membersBottom, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken parameter) { - liveSearcherProvider.get().onSelection(new Listener<LinkDTO>() { - @Override - public void onEvent(final LinkDTO link) { - view.confirmAddCollab(link.getShortName(), link.getLongName()); - } - }); - liveSearcherProvider.get().show(); - } - }); - addMember.setIconUrl("images/add-green.gif"); - addMember.setTextDescription(i18n.t("Add member")); - addMember.setToolTip(i18n.t("Add an user or a group as member of this group")); - addMember.setParentMenuTitle(i18n.t("Options")); - - groupActionRegistry.addAction(addMember); - // groupActionRegistry.addAction(unJoin); - - // groupActionRegistry.addAction(participate); - createSetMembersVisibilityAction(i18n.t("anyone"), SocialNetworkVisibility.anyone); - createSetMembersVisibilityAction(i18n.t("only members"), SocialNetworkVisibility.onlymembers); - createSetMembersVisibilityAction(i18n.t("only admins"), SocialNetworkVisibility.onlyadmins); - createNewMembersPolicyAction(i18n.t("moderate request to join"), AdmissionType.Moderated); - createNewMembersPolicyAction(i18n.t("auto accept request to join"), AdmissionType.Open); - } - - private void createNewMembersPolicyAction(final String textDescription, final AdmissionType admissionPolicy) { - final ActionToolbarMenuRadioDescriptor<StateToken> newMembersPolicy = new ActionToolbarMenuRadioDescriptor<StateToken>( - AccessRolDTO.Administrator, membersBottom, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken parameter) { - groupServiceProvider.get().setGroupNewMembersJoiningPolicy(session.getUserHash(), - session.getCurrentState().getGroup().getStateToken(), admissionPolicy, - new AsyncCallbackSimple<Void>() { - @Override - public void onSuccess(final Void result) { - NotifyUser.info(i18n.t("Members joining policy changed")); - } - }); - } - }, NEW_MEMBERS_POLICY_GROUP, new RadioMustBeChecked() { - @Override - public boolean mustBeChecked() { - final StateAbstractDTO currentState = session.getCurrentState(); - return currentState.getGroup().getAdmissionType().equals(admissionPolicy); - } - }); - newMembersPolicy.setTextDescription(textDescription); - newMembersPolicy.setParentMenuTitle(i18n.t("Options")); - newMembersPolicy.setParentSubMenuTitle(i18n.t("New members policy")); - groupActionRegistry.addAction(newMembersPolicy); - } - - private void createSetMembersVisibilityAction(final String textDescription, final SocialNetworkVisibility visibility) { - final ActionToolbarMenuRadioDescriptor<StateToken> showMembers = new ActionToolbarMenuRadioDescriptor<StateToken>( - AccessRolDTO.Administrator, membersBottom, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken parameter) { - groupServiceProvider.get().setSocialNetworkVisibility(session.getUserHash(), - session.getCurrentState().getGroup().getStateToken(), visibility, - new AsyncCallbackSimple<Void>() { - @Override - public void onSuccess(final Void result) { - NotifyUser.info(i18n.t("Members visibility changed")); - } - }); - } - }, MEMBERS_VISIBILITY_GROUP, new RadioMustBeChecked() { - @Override - public boolean mustBeChecked() { - final StateAbstractDTO currentState = session.getCurrentState(); - if (!currentState.getGroup().isPersonal()) { - final SocialNetworkDataDTO socialNetworkData = currentState.getSocialNetworkData(); - return socialNetworkData.getSocialNetworkVisibility().equals(visibility); - } - return false; - } - }); - showMembers.setTextDescription(textDescription); - showMembers.setParentMenuTitle(i18n.t("Options")); - showMembers.setParentSubMenuTitle(i18n.t("Those who can view this member list")); - groupActionRegistry.addAction(showMembers); - } - - public void init(final GroupMembersSummaryView view) { - this.view = view; - } - - @SuppressWarnings("unchecked") - private void setGroupMembers(final SocialNetworkDTO socialNetwork, final AccessRights rights) { - final AccessListsDTO accessLists = socialNetwork.getAccessLists(); - - final List<GroupDTO> adminsList = accessLists.getAdmins().getList(); - final List<GroupDTO> collabList = accessLists.getEditors().getList(); - final List<GroupDTO> pendingCollabsList = socialNetwork.getPendingCollaborators().getList(); - - // final int numAdmins = adminsList.size(); - - final boolean userIsAdmin = rights.isAdministrable(); - final boolean userCanView = rights.isVisible(); - - view.clear(); - - view.setDraggable(session.isLogged()); - - if (userCanView) { - for (final GroupDTO admin : adminsList) { - view.addItem(createGridItem(adminCategory, admin, rights, changeToCollabMenuItem, removeMemberMenuItem)); - } - for (final GroupDTO collab : collabList) { - view.addItem(createGridItem(collabCategory, collab, rights, changeToAdminMenuItem, removeMemberMenuItem)); - } - if (userIsAdmin) { - for (final GroupDTO pendingCollab : pendingCollabsList) { - view.addItem(createGridItem(pendigCategory, pendingCollab, rights, acceptJoinGroupMenuItem, - denyJoinGroupMenuItem)); - } - } - } - view.setVisible(true); - } - - private void setState(final StateAbstractDTO state) { - if (state.getGroup().isPersonal()) { - view.setVisible(false); - } else { - if (state.getSocialNetworkData().isMembersVisible()) { - setGroupMembers(state.getGroupMembers(), state.getGroupRights()); - } else { - view.clear(); - view.showMembersNotVisible(); - view.setVisible(true); - } - } - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryView.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryView.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -1,40 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ -package org.ourproject.kune.workspace.client.oldsn; - -import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; - -import cc.kune.core.shared.dto.GroupDTO; - -public interface GroupMembersSummaryView { - - void addItem(GridItem<GroupDTO> gridItem); - - void clear(); - - void confirmAddCollab(String groupShortName, String groupLongName); - - void setDraggable(boolean draggable); - - void setVisible(boolean visible); - - void showMembersNotVisible(); - -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipateAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipateAction.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipateAction.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -1,75 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.workspace.client.oldsn; - -import org.ourproject.kune.platf.client.actions.ActionEvent; - -import cc.kune.common.client.notify.NotifyUser; -import cc.kune.core.client.resources.icons.IconResources; -import cc.kune.core.client.rpcservices.AsyncCallbackSimple; -import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; -import cc.kune.core.client.state.AccessRightsClientManager; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.dto.SocialNetworkRequestResult; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.google.inject.Provider; - -public class ParticipateAction extends RolAction { - private final Provider<SocialNetworkServiceAsync> snServiceProvider; - - public ParticipateAction(final Session session, final Provider<SocialNetworkServiceAsync> snServiceProvider, - final StateManager stateManager, final AccessRightsClientManager rightsManager, - final I18nTranslationService i18n, final IconResources imgResources) { - super(session, stateManager, rightsManager, i18n, AccessRolDTO.Viewer, i18n.t("Participate"), - i18n.t("Request to participate in this group"), imgResources.addGreen()); - this.snServiceProvider = snServiceProvider; - super.setVisible(false, true); - super.setMustBeAuthenticated(false); - } - - @Override - public void actionPerformed(final ActionEvent event) { - NotifyUser.showProgressProcessing(); - snServiceProvider.get().requestJoinGroup(session.getUserHash(), session.getCurrentState().getStateToken(), - new AsyncCallbackSimple<SocialNetworkRequestResult>() { - @Override - public void onSuccess(final SocialNetworkRequestResult result) { - NotifyUser.hideProgress(); - switch ((result)) { - case accepted: - NotifyUser.info(i18n.t("You are now member of this group")); - stateManager.reload(); - break; - case denied: - NotifyUser.important(i18n.t("Sorry this is a closed group")); - break; - case moderated: - NotifyUser.info(i18n.t("Membership requested. Waiting for admins decision")); - break; - default: - NotifyUser.info(i18n.t("Programatic error in ParticipateAction")); - } - } - }); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummary.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummary.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummary.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -1,24 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.workspace.client.oldsn; - -public interface ParticipationSummary { - -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummaryPanel.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummaryPanel.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -1,80 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.workspace.client.oldsn; - -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPanel; -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; -import org.ourproject.kune.platf.client.ui.AbstractToolbar; -import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; -import org.ourproject.kune.platf.client.ui.gridmenu.GridMenuPanel; -import org.ourproject.kune.workspace.client.skel.SummaryPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.events.Listener; -import com.google.gwt.user.client.ui.Widget; -import com.gwtext.client.widgets.BoxComponent; -import com.gwtext.client.widgets.event.ContainerListenerAdapter; - -public class ParticipationSummaryPanel extends SummaryPanel implements ParticipationSummaryView { - - private final GridMenuPanel<GroupDTO> gridMenuPanel; - private final AbstractToolbar toolbar; - - public ParticipationSummaryPanel(final ParticipationSummaryPresenter presenter, final I18nTranslationService i18n, - final WorkspaceSkeleton ws, final ActionToolbarView<StateToken> actionToolbarView) { - super(i18n.t("Participates in"), i18n.t("Groups in which the user participates"), ws); - gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This user does not belong to any group"), false, false, - false, false, false); - final Listener<String> go = new Listener<String>() { - public void onEvent(final String groupShortName) { - presenter.onDoubleClick(groupShortName); - } - }; - // gridMenuPanel.onClick(go); - gridMenuPanel.onDoubleClick(go); - super.add(gridMenuPanel); - toolbar = ((ActionToolbarPanel<StateToken>) actionToolbarView).getToolbar(); - toolbar.setBlankStyle(); - super.add((Widget) toolbar); - addInSummary(); - ws.addListenerInEntitySummary(new ContainerListenerAdapter() { - @Override - public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight, - final int rawWidth, final int rawHeight) { - gridMenuPanel.setWidth(adjWidth); - } - }); - } - - public void addItem(final GridItem<GroupDTO> gridItem) { - gridMenuPanel.addItem(gridItem); - } - - @Override - public void clear() { - gridMenuPanel.removeAll(); - toolbar.removeAll(); - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummaryPresenter.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummaryPresenter.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -1,105 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.workspace.client.oldsn; - -import java.util.List; - -import org.ourproject.kune.platf.client.ui.gridmenu.GridGroup; -import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionParticipationToolbar; - -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.resources.icons.IconResources; -import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.services.ImageUtils; -import cc.kune.core.client.state.AccessRightsClientManager; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.AccessRights; -import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.dto.ParticipationDataDTO; -import cc.kune.core.shared.dto.StateAbstractDTO; - -import com.calclab.suco.client.events.Listener; -import com.google.inject.Inject; -import com.google.inject.Provider; - -public class ParticipationSummaryPresenter extends SocialNetworkPresenter implements ParticipationSummary { - - private final GridGroup adminCategory; - private GridGroup collabCategory; - private final GridGroup collabOnlyCategory; - private ParticipationSummaryView view; - - @Inject - public ParticipationSummaryPresenter(final I18nUITranslationService i18n, final StateManager stateManager, - final ImageUtils imageUtils, final Session session, - final Provider<SocialNetworkServiceAsync> snServiceProvider, final GroupActionRegistry groupActionRegistry, - final ActionParticipationToolbar actionParticipationToolbar, - final Provider<FileDownloadUtils> downloadProvider, final AccessRightsClientManager accessRightsManager, - final IconResources img) { - super(i18n, stateManager, accessRightsManager, session, snServiceProvider, groupActionRegistry, - downloadProvider, img); - adminCategory = new GridGroup("admin in:", " ", i18n.tWithNT("Administrate these groups", - "talking about a person"), false); - collabCategory = new GridGroup(i18n.t("and as collaborator in:"), " ", i18n.t("Collaborate in these groups"), - false); - collabOnlyCategory = new GridGroup(i18n.t("collaborator in:"), " ", i18n.t("Collaborate in these groups"), - false); - super.addGroupOperation(gotoGroupMenuItem, false); - final Listener<StateAbstractDTO> setStateListener = new Listener<StateAbstractDTO>() { - @Override - public void onEvent(final StateAbstractDTO state) { - setState(state); - } - }; - stateManager.onStateChanged(setStateListener); - stateManager.onSocialNetworkChanged(setStateListener); - } - - public void init(final ParticipationSummaryView view) { - this.view = view; - } - - @SuppressWarnings("unchecked") - private void setState(final StateAbstractDTO state) { - final ParticipationDataDTO participation = state.getParticipation(); - final AccessRights rights = state.getGroupRights(); - view.clear(); - final List<GroupDTO> groupsIsAdmin = participation.getGroupsIsAdmin(); - final List<GroupDTO> groupsIsCollab = participation.getGroupsIsCollab(); - final int numAdmins = groupsIsAdmin.size(); - final int numCollaborators = groupsIsCollab.size(); - if (numAdmins == 0) { - collabCategory = collabOnlyCategory; - } - for (final GroupDTO group : groupsIsAdmin) { - view.addItem(createGridItem(adminCategory, group, rights, unJoinMenuItem)); - } - for (final GroupDTO group : groupsIsCollab) { - view.addItem(createGridItem(collabCategory, group, rights, unJoinMenuItem)); - } - if (numAdmins > 0 || numCollaborators > 0) { - view.setVisible(true); - } else { - view.setVisible(false); - } - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummaryView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummaryView.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummaryView.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -1,35 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.workspace.client.oldsn; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; - -import cc.kune.core.shared.dto.GroupDTO; - -public interface ParticipationSummaryView extends View { - - void addItem(GridItem<GroupDTO> createGridItem); - - void clear(); - - void setVisible(boolean b); - -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/RolAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/RolAction.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/RolAction.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -1,99 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.workspace.client.oldsn; - -import org.ourproject.kune.platf.client.actions.AbstractExtendedAction; -import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; - -import cc.kune.core.client.sn.actions.RolComparator; -import cc.kune.core.client.state.AccessRightsClientManager; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.AccessRights; -import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.google.gwt.resources.client.ImageResource; - -public abstract class RolAction extends AbstractExtendedAction { - - public static UIStatus refreshStatus(final AccessRolDTO rolRequired, final boolean authNeed, - final boolean isLogged, final boolean visibleForMembers, final boolean visibleForNonMemb, - final AccessRights newRights) { - boolean newVisibility = false; - boolean newEnabled = false; - if (authNeed && !isLogged) { - newVisibility = newEnabled = false; - } else { - // Auth ok - newEnabled = RolComparator.isEnabled(rolRequired, newRights); - if (newEnabled) { - final boolean isMember = RolComparator.isMember(newRights); - newEnabled = newVisibility = isMember && visibleForMembers || !isMember && visibleForNonMemb; - } else { - newVisibility = false; - } - } - return new UIStatus(newVisibility, newEnabled); - } - - private boolean authNeed; - protected final I18nTranslationService i18n; - protected final Session session; - protected final StateManager stateManager; - private boolean visibleForMembers; - private boolean visibleForNonMemb; - - public RolAction(final Session session, final StateManager stateManager, - final AccessRightsClientManager rightsManager, final I18nTranslationService i18n, - final AccessRolDTO rolRequired, final String text, final String tooltip, final ImageResource icon) { - super(text, tooltip, icon); - this.session = session; - this.stateManager = stateManager; - this.i18n = i18n; - this.visibleForMembers = true; - this.visibleForNonMemb = true; - this.authNeed = false; - // rightsManager.onRightsChanged(new Listener2<AccessRights, - // AccessRights>() { - // public void onEvent(final AccessRights prevRights, final AccessRights - // newRights) { - // setStatus(refreshStatus(rolRequired, authNeed, session.isLogged(), - // visibleForMembers, - // visibleForNonMemb, newRights)); - // } - // - // }); - } - - public void setMustBeAuthenticated(final boolean authNeed) { - this.authNeed = authNeed; - } - - private void setStatus(final UIStatus refreshStatus) { - setEnabled(refreshStatus.isEnabled()); - putValue(OldGuiActionDescrip.VISIBLE, refreshStatus.isVisible()); - } - - public void setVisible(final boolean forMembers, final boolean forNonMembers) { - this.visibleForMembers = forMembers; - this.visibleForNonMemb = forNonMembers; - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/SocialNetworkPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/SocialNetworkPresenter.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/SocialNetworkPresenter.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -1,329 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ -package org.ourproject.kune.workspace.client.oldsn; - -import org.ourproject.kune.platf.client.actions.ActionToolbarButtonDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarMenuDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarPosition; -import org.ourproject.kune.platf.client.actions.ui.ButtonDescriptor; -import org.ourproject.kune.platf.client.actions.ui.MenuDescriptor; -import org.ourproject.kune.platf.client.actions.ui.OldMenuItemDescriptor; -import org.ourproject.kune.platf.client.ui.MenuItem; -import org.ourproject.kune.platf.client.ui.MenuItemCollection; -import org.ourproject.kune.platf.client.ui.gridmenu.CustomMenu; -import org.ourproject.kune.platf.client.ui.gridmenu.GridGroup; -import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; - -import cc.kune.common.client.notify.NotifyUser; -import cc.kune.core.client.resources.icons.IconResources; -import cc.kune.core.client.rpcservices.AsyncCallbackSimple; -import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; -import cc.kune.core.client.services.FileConstants; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.AccessRightsClientManager; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.AccessRights; -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.dto.SocialNetworkDataDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.events.Listener; -import com.google.inject.Provider; - -public class SocialNetworkPresenter { - - private static final String MEMBERS_BOTTON = "members_bottom"; - - protected MenuItem<GroupDTO> acceptJoinGroupMenuItem; - protected final ActionToolbarPosition buddiesBottom = new ActionToolbarPosition("sn-bottomtoolbar"); - protected MenuItem<GroupDTO> changeToAdminMenuItem; - protected MenuItem<GroupDTO> changeToCollabMenuItem; - protected MenuItem<GroupDTO> denyJoinGroupMenuItem; - private final Provider<FileDownloadUtils> downloadProvider; - protected MenuItem<GroupDTO> gotoGroupMenuItem; - protected MenuItem<GroupDTO> gotoMemberMenuItem; - private final I18nTranslationService i18n; - private final IconResources imgResources; - protected final ActionToolbarPosition membersBottom = new ActionToolbarPosition("sn-bottomtoolbar"); - private MenuDescriptor menuOptions; - private final MenuItemCollection<GroupDTO> otherLoggedOperations; - private final MenuItemCollection<GroupDTO> otherLoggedOperationsUsers; - private final MenuItemCollection<GroupDTO> otherOperations; - private final MenuItemCollection<GroupDTO> otherOperationsUsers; - protected ActionToolbarButtonDescriptor<StateToken> participate; - protected MenuItem<GroupDTO> removeMemberMenuItem; - private final AccessRightsClientManager rightsManager; - private final Session session; - private final Provider<SocialNetworkServiceAsync> snServiceProvider; - private final StateManager stateManager; - protected ActionToolbarMenuDescriptor<StateToken> unJoin; - - protected MenuItem<GroupDTO> unJoinMenuItem; - - public SocialNetworkPresenter(final I18nTranslationService i18n, final StateManager stateManager, - final AccessRightsClientManager rightsManager, final Session session, - final Provider<SocialNetworkServiceAsync> snServiceProvider, final GroupActionRegistry groupActionRegistry, - final Provider<FileDownloadUtils> downloadProvider, final IconResources imgResources) { - this.i18n = i18n; - this.stateManager = stateManager; - this.rightsManager = rightsManager; - this.session = session; - this.snServiceProvider = snServiceProvider; - this.downloadProvider = downloadProvider; - this.imgResources = imgResources; - createButtons(); - createMenuActions(); - otherOperationsUsers = new MenuItemCollection<GroupDTO>(); - otherLoggedOperationsUsers = new MenuItemCollection<GroupDTO>(); - otherOperations = new MenuItemCollection<GroupDTO>(); - otherLoggedOperations = new MenuItemCollection<GroupDTO>(); - } - - public void addGroupOperation(final MenuItem<GroupDTO> operation, final boolean mustBeLogged) { - MenuItemCollection<GroupDTO> collection; - collection = mustBeLogged ? otherLoggedOperations : otherOperations; - collection.add(operation); - } - - public void addUserOperation(final MenuItem<GroupDTO> operation, final boolean mustBeLogged) { - MenuItemCollection<GroupDTO> collection; - collection = mustBeLogged ? otherLoggedOperationsUsers : otherOperationsUsers; - collection.add(operation); - } - - private void createButtons() { - final ParticipateAction participateAction = new ParticipateAction(session, snServiceProvider, stateManager, - rightsManager, i18n, imgResources); - final ButtonDescriptor participateBtn = new ButtonDescriptor(participateAction); - participateBtn.setLocation(MEMBERS_BOTTON); - - menuOptions = new MenuDescriptor(i18n.t("Options")); - - final UnjoinButtonAction unjoinAction = new UnjoinButtonAction(session, snServiceProvider, stateManager, rightsManager, - i18n, imgResources) { - @Override - public String getGroupName() { - return session.getContainerState().getGroup().getShortName(); - } - }; - - final OldMenuItemDescriptor unjoinBtn = new OldMenuItemDescriptor(menuOptions, unjoinAction); - unjoinBtn.setLocation(MEMBERS_BOTTON); - } - - private GridItem<GroupDTO> createDefMemberMenu(final GroupDTO group, final GridGroup gridGroup) { - final CustomMenu<GroupDTO> menu = new CustomMenu<GroupDTO>(group); - final String longName = group.getLongName(); - final boolean hasLogo = group.hasLogo(); - final String toolTip = createTooltipWithLogo(group.getShortName(), group.getStateToken(), hasLogo, - group.isPersonal()); - final String imageHtml = downloadProvider.get().getLogoAvatarHtml(group.getStateToken(), hasLogo, - group.isPersonal(), session.getImgIconsize(), 0); - final GridItem<GroupDTO> gridItem = new GridItem<GroupDTO>(group, gridGroup, group.getShortName(), imageHtml, - longName, longName, " ", longName, toolTip, menu); - if (!group.isPersonal()) { - menu.addMenuItemList(otherOperations); - } - if (session.isLogged() && !group.isPersonal()) { - menu.addMenuItemList(otherLoggedOperations); - } - if (group.isPersonal()) { - menu.addMenuItemList(otherOperationsUsers); - } - if (session.isLogged() && group.isPersonal()) { - menu.addMenuItemList(otherLoggedOperationsUsers); - } - - return gridItem; - } - - protected GridItem<GroupDTO> createGridItem(final GridGroup groupCategory, final GroupDTO group, - final AccessRights rights, final MenuItem<GroupDTO>... gridMenuItems) { - final GridItem<GroupDTO> gridItem = createDefMemberMenu(group, groupCategory); - final CustomMenu<GroupDTO> menu = gridItem.getMenu(); - if (rights.isAdministrable()) { - for (final MenuItem<GroupDTO> item : gridMenuItems) { - menu.addMenuItem(item); - } - } - return gridItem; - } - - private void createMenuActions() { - gotoGroupMenuItem = new MenuItem<GroupDTO>("images/group-home.gif", i18n.t("Visit this group homepage"), - new Listener<GroupDTO>() { - @Override - public void onEvent(final GroupDTO groupDTO) { - stateManager.gotoHistoryToken(groupDTO.getShortName()); - } - }); - gotoMemberMenuItem = new MenuItem<GroupDTO>("images/group-home.gif", i18n.t("Visit this member homepage"), - new Listener<GroupDTO>() { - @Override - public void onEvent(final GroupDTO groupDTO) { - stateManager.gotoHistoryToken(groupDTO.getShortName()); - } - }); - - unJoinMenuItem = new MenuItem<GroupDTO>("images/del.gif", i18n.t("Do not participate anymore in this group"), - new Listener<GroupDTO>() { - @Override - public void onEvent(final GroupDTO groupDTO) { - removeMemberAction(groupDTO); - } - }); - changeToCollabMenuItem = new MenuItem<GroupDTO>("images/arrow-down-green.gif", - i18n.t("Change to collaborator"), new Listener<GroupDTO>() { - @Override - public void onEvent(final GroupDTO group) { - NotifyUser.showProgressProcessing(); - snServiceProvider.get().setAdminAsCollab(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkDataDTO>() { - @Override - public void onSuccess(final SocialNetworkDataDTO result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Member type changed")); - stateManager.setSocialNetwork(result); - } - }); - } - }); - removeMemberMenuItem = new MenuItem<GroupDTO>("images/del.gif", i18n.t("Remove this member"), - new Listener<GroupDTO>() { - @Override - public void onEvent(final GroupDTO group) { - NotifyUser.showProgressProcessing(); - snServiceProvider.get().deleteMember(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkDataDTO>() { - @Override - public void onSuccess(final SocialNetworkDataDTO result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Member removed")); - stateManager.reload(); - // in the - // future, - // only if - // I cannot - // be - // affected: - // snService.stateManager.reloadSocialNetwork((SocialNetworkResultDTO) - // result); - } - }); - } - }); - changeToAdminMenuItem = new MenuItem<GroupDTO>("images/arrow-up-green.gif", i18n.t("Change to admin"), - new Listener<GroupDTO>() { - @Override - public void onEvent(final GroupDTO group) { - NotifyUser.showProgressProcessing(); - snServiceProvider.get().setCollabAsAdmin(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkDataDTO>() { - @Override - public void onSuccess(final SocialNetworkDataDTO result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Member type changed")); - stateManager.setSocialNetwork(result); - } - }); - } - }); - acceptJoinGroupMenuItem = new MenuItem<GroupDTO>("images/accept.gif", i18n.t("Accept this member"), - new Listener<GroupDTO>() { - @Override - public void onEvent(final GroupDTO group) { - NotifyUser.showProgressProcessing(); - snServiceProvider.get().acceptJoinGroup(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkDataDTO>() { - @Override - public void onSuccess(final SocialNetworkDataDTO result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Member accepted")); - stateManager.setSocialNetwork(result); - } - }); - } - }); - denyJoinGroupMenuItem = new MenuItem<GroupDTO>("images/cancel.gif", i18n.t("Reject this member"), - new Listener<GroupDTO>() { - @Override - public void onEvent(final GroupDTO group) { - NotifyUser.showProgressProcessing(); - snServiceProvider.get().denyJoinGroup(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkDataDTO>() { - @Override - public void onSuccess(final SocialNetworkDataDTO result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Member rejected")); - stateManager.setSocialNetwork(result); - } - }); - } - }); - } - - protected String createTooltipWithLogo(final String shortName, final StateToken token, final boolean hasLogo, - final boolean isPersonal) { - return "<table><tr><td>" - + (hasLogo ? downloadProvider.get().getLogoAvatarHtml(token, hasLogo, isPersonal, - FileConstants.LOGO_DEF_HEIGHT, 3) : "") + "</td><td>" - + i18n.t(isPersonal ? "Nickname: [%s]" : "Group short name: [%s]", shortName) + "</td></tr></table>"; - } - - public void onDoubleClick(final String groupShortName) { - stateManager.gotoHistoryToken(groupShortName); - } - - public void removeGroupOperation(final MenuItem<GroupDTO> operation, final boolean mustBeLogged) { - MenuItemCollection<GroupDTO> collection; - collection = mustBeLogged ? otherLoggedOperations : otherOperations; - collection.remove(operation); - } - - private void removeMemberAction(final GroupDTO groupDTO) { - NotifyUser.showProgressProcessing(); - snServiceProvider.get().unJoinGroup(session.getUserHash(), new StateToken(groupDTO.getShortName()), - new AsyncCallbackSimple<SocialNetworkDataDTO>() { - @Override - public void onSuccess(final SocialNetworkDataDTO result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Removed as member")); - stateManager.reload(); - // in the future with user - // info: - // services.stateManager.reloadSocialNetwork((SocialNetworkResultDTO) - // result); - } - }); - } - - public void removeUserOperation(final MenuItem<GroupDTO> operation, final boolean mustBeLogged) { - MenuItemCollection<GroupDTO> collection; - collection = mustBeLogged ? otherLoggedOperationsUsers : otherOperationsUsers; - collection.remove(operation); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UIStatus.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UIStatus.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UIStatus.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -1,82 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.workspace.client.oldsn; - -public class UIStatus { - - private boolean visible; - private boolean enabled; - - public UIStatus(final boolean visible, final boolean enabled) { - this.visible = visible; - this.enabled = enabled; - } - - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final UIStatus other = (UIStatus) obj; - if (enabled != other.enabled) { - return false; - } - if (visible != other.visible) { - return false; - } - return true; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + (enabled ? 1231 : 1237); - result = prime * result + (visible ? 1231 : 1237); - return result; - } - - public boolean isEnabled() { - return enabled; - } - - public boolean isVisible() { - return visible; - } - - public void setEnabled(final boolean enabled) { - this.enabled = enabled; - } - - public void setVisible(final boolean visible) { - this.visible = visible; - } - - @Override - public String toString() { - return "(v: " + visible + ", e:" + enabled + ")"; - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UnjoinButtonAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UnjoinButtonAction.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UnjoinButtonAction.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -1,82 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.workspace.client.oldsn; - -import org.ourproject.kune.platf.client.actions.ActionEvent; - -import cc.kune.common.client.notify.NotifyUser; -import cc.kune.common.client.utils.OnAcceptCallback; -import cc.kune.core.client.resources.icons.IconResources; -import cc.kune.core.client.rpcservices.AsyncCallbackSimple; -import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; -import cc.kune.core.client.state.AccessRightsClientManager; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.dto.SocialNetworkDataDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.google.inject.Provider; - -public class UnjoinButtonAction extends RolAction { - private String groupName; - private final Provider<SocialNetworkServiceAsync> snServiceProvider; - - public UnjoinButtonAction(final Session session, final Provider<SocialNetworkServiceAsync> snServiceProvider, - final StateManager stateManager, final AccessRightsClientManager rightsManager, - final I18nTranslationService i18n, final IconResources imgResources) { - super(session, stateManager, rightsManager, i18n, AccessRolDTO.Editor, i18n.t("Leave this group"), - i18n.t("Do not participate anymore in this group"), imgResources.delGreen()); - this.snServiceProvider = snServiceProvider; - super.setVisible(true, false); - super.setMustBeAuthenticated(true); - } - - @Override - public void actionPerformed(final ActionEvent event) { - NotifyUser.askConfirmation(i18n.t("Leave this group"), i18n.t("Are you sure?"), new OnAcceptCallback() { - @Override - public void onSuccess() { - NotifyUser.showProgressProcessing(); - snServiceProvider.get().unJoinGroup(session.getUserHash(), new StateToken(getGroupName()), - new AsyncCallbackSimple<SocialNetworkDataDTO>() { - @Override - public void onSuccess(final SocialNetworkDataDTO result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Removed as member")); - stateManager.reload(); - // in the future with user info: - // stateManager.reloadSocialNetwork((SocialNetworkResultDTO) - // result); - } - }); - } - }); - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(final String groupName) { - this.groupName = groupName; - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UserActionRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UserActionRegistry.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UserActionRegistry.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -1,33 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ -package org.ourproject.kune.workspace.client.oldsn; - -import org.ourproject.kune.platf.client.actions.ActionRegistry; - -import cc.kune.core.shared.dto.UserSimpleDTO; - -/** - * The Class UserActionRegistry. - * - * List of actions over a user (initially used for buddies actions) - * - */ -public class UserActionRegistry extends ActionRegistry<UserSimpleDTO> { -} Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/main/resources/kune.properties 2011-05-06 20:13:51 UTC (rev 1356) @@ -42,6 +42,8 @@ kune.upload.gallerypermittedextensions = jpg,jpeg,png,gif,bmp,svg,avi,mpg,mpeg,ogg,mov,tif,tiff,mp3,wav kune.upload.maxfilesizeinmegas = 10 +kune.upload.maxfilesizeinks = 10000000 +kune.upload.delayfortest = 50 # Images are resized to thumbsize pixels and later cropped (centered) to cropsize # (integer values) kune.images.resizewidth = 400 Deleted: trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/SNRolActionTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/SNRolActionTest.java 2011-05-06 14:45:24 UTC (rev 1355) +++ trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/SNRolActionTest.java 2011-05-06 20:13:51 UTC (rev 1356) @@ -1,102 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.workspace.client.socialnet; - -import static org.junit.Assert.assertEquals; - -import org.junit.Before; -import org.junit.Test; -import org.ourproject.kune.workspace.client.oldsn.RolAction; -import org.ourproject.kune.workspace.client.oldsn.UIStatus; - -import cc.kune.core.shared.domain.utils.AccessRights; -import cc.kune.core.shared.dto.AccessRolDTO; - -public class SNRolActionTest { - - private AccessRights adminRights; - private AccessRights editorRights; - private AccessRights viewerRights; - private AccessRights noPermRights; - private UIStatus ff; - private UIStatus tt; - - @Before - public void before() { - adminRights = new AccessRights(true, true, true); - editorRights = new AccessRights(false, true, true); - viewerRights = new AccessRights(false, false, true); - noPermRights = new AccessRights(false, false, false); - ff = new UIStatus(false, false); - tt = new UIStatus(true, true); - } - - @Test - public void testRefreshStatus() { - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Viewer, false, false, true, true, noPermRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Viewer, true, false, true, true, noPermRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Viewer, true, true, true, true, noPermRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Viewer, true, true, false, true, noPermRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Viewer, true, true, false, false, noPermRights)); - - assertEquals(tt, RolAction.refreshStatus(AccessRolDTO.Viewer, false, false, true, true, viewerRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Viewer, true, false, true, true, viewerRights)); - assertEquals(tt, RolAction.refreshStatus(AccessRolDTO.Viewer, true, true, true, true, viewerRights)); - assertEquals(tt, RolAction.refreshStatus(AccessRolDTO.Viewer, true, true, false, true, viewerRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Viewer, true, true, false, false, viewerRights)); - - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Editor, false, false, true, true, viewerRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Editor, true, false, true, true, viewerRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Editor, true, true, true, true, viewerRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Editor, true, true, false, true, viewerRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Editor, true, true, false, false, viewerRights)); - - assertEquals(tt, RolAction.refreshStatus(AccessRolDTO.Editor, false, false, true, true, editorRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Editor, true, false, true, true, editorRights)); - assertEquals(tt, RolAction.refreshStatus(AccessRolDTO.Editor, true, true, true, true, editorRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Editor, true, true, false, true, editorRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Editor, true, true, false, false, editorRights)); - - assertEquals(tt, RolAction.refreshStatus(AccessRolDTO.Editor, false, false, true, true, adminRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Editor, true, false, true, true, adminRights)); - assertEquals(tt, RolAction.refreshStatus(AccessRolDTO.Editor, true, true, true, true, adminRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Editor, true, true, false, true, adminRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Editor, true, true, false, false, adminRights)); - - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Administrator, false, false, true, true, viewerRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Administrator, true, false, true, true, viewerRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Administrator, true, true, true, true, viewerRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Administrator, true, true, false, true, viewerRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Administrator, true, true, false, false, viewerRights)); - - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Administrator, false, false, true, true, editorRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Administrator, true, false, true, true, editorRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Administrator, true, true, true, true, editorRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Administrator, true, true, false, true, editorRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Administrator, true, true, false, false, editorRights)); - - assertEquals(tt, RolAction.refreshStatus(AccessRolDTO.Administrator, false, false, true, true, adminRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Administrator, true, false, true, true, adminRights)); - assertEquals(tt, RolAction.refreshStatus(AccessRolDTO.Administrator, true, true, true, true, adminRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Administrator, true, true, false, true, adminRights)); - assertEquals(ff, RolAction.refreshStatus(AccessRolDTO.Administrator, true, true, false, false, adminRights)); - - } -}

1 0