- kune-commits - lists.ourproject.org

r1481 - wp-theme/kune
by Vicente J. Ruiz Jurado 04 Aug '11

04 Aug '11

Author: vjrj_ Date: 2011-08-04 15:48:07 +0200 (Thu, 04 Aug 2011) New Revision: 1481 Modified: wp-theme/kune/style.css Log: Modified: wp-theme/kune/style.css =================================================================== --- wp-theme/kune/style.css 2011-08-04 13:39:21 UTC (rev 1480) +++ wp-theme/kune/style.css 2011-08-04 13:48:07 UTC (rev 1481) @@ -1483,5 +1483,5 @@ } #kune-post-refs, #kune-post-refs a { - font-size: 10px; + font-size: 11px; } \ No newline at end of file

1 0

r1480 - wp-theme/kune
by Vicente J. Ruiz Jurado 04 Aug '11

04 Aug '11

Author: vjrj_ Date: 2011-08-04 15:39:21 +0200 (Thu, 04 Aug 2011) New Revision: 1480 Modified: wp-theme/kune/style.css Log: Modified: wp-theme/kune/style.css =================================================================== --- wp-theme/kune/style.css 2011-08-04 09:25:22 UTC (rev 1479) +++ wp-theme/kune/style.css 2011-08-04 13:39:21 UTC (rev 1480) @@ -1480,4 +1480,8 @@ #content .entry-title a { font-size:20px; font-weight:bold; +} + +#kune-post-refs, #kune-post-refs a { + font-size: 10px; } \ No newline at end of file

1 0

r1479 - wp-theme/kune
by Vicente J. Ruiz Jurado 04 Aug '11

04 Aug '11

Author: vjrj_ Date: 2011-08-04 11:25:22 +0200 (Thu, 04 Aug 2011) New Revision: 1479 Modified: wp-theme/kune/functions.php Log: Modified: wp-theme/kune/functions.php =================================================================== --- wp-theme/kune/functions.php 2011-08-03 17:07:42 UTC (rev 1478) +++ wp-theme/kune/functions.php 2011-08-04 09:25:22 UTC (rev 1479) @@ -494,3 +494,17 @@ ); } endif; + +/** + * http://www.designzzz.com/how-to-stop-wordpress-editor-from-removing-iframe-… + */ +function mytheme_tinymce_config( $init ) { + $valid_iframe = 'iframe[id|class|title|style|align|frameborder|height|longdesc|marginheight|marginwidth|name|scrolling|src|width]'; + if ( isset( $init['extended_valid_elements'] ) ) { + $init['extended_valid_elements'] .= ',' . $valid_iframe; + } else { + $init['extended_valid_elements'] = $valid_iframe; + } + return $init; +} +add_filter('tiny_mce_before_init', 'mytheme_tinymce_config');

1 0

03 Aug '11

Author: vjrj_ Date: 2011-08-03 19:07:42 +0200 (Wed, 03 Aug 2011) New Revision: 1478 Added: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractParentGuiActionDescrip.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/HasChilds.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java trunk/src/main/java/cc/kune/core/client/i18n/I18nConstants.java trunk/src/main/java/cc/kune/core/client/i18n/I18nUtils.java trunk/src/main/java/cc/kune/core/client/sitebar/SiteOptions.java trunk/src/main/java/cc/kune/core/public/images/alert.gif trunk/src/main/java/cc/kune/core/public/images/arrow-down-black.gif trunk/src/main/java/cc/kune/core/public/images/arrow-down-white.gif trunk/src/main/java/cc/kune/core/public/images/arrow-right-black.gif trunk/src/main/java/cc/kune/core/public/images/arrow-right-white.gif trunk/src/main/java/cc/kune/core/public/images/colors.gif trunk/src/main/java/cc/kune/core/public/images/copyleft.png trunk/src/main/java/cc/kune/core/public/images/emblem-system.gif trunk/src/main/java/cc/kune/core/public/images/film.png trunk/src/main/java/cc/kune/core/public/images/info.gif trunk/src/main/java/cc/kune/core/public/images/language.gif trunk/src/main/java/cc/kune/core/public/images/link.gif trunk/src/main/java/cc/kune/core/public/images/picture.png trunk/src/main/java/cc/kune/core/public/images/specialchars.png trunk/src/main/java/cc/kune/core/public/images/splitter-vert-bar.png trunk/src/main/java/cc/kune/gspace/client/i18n/ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nNewTranslatorPanel.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nNewTranslatorPresenter.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslator.java trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorPanel.java trunk/src/main/java/cc/kune/gspace/client/i18n/SiteOptionsI18nTranslatorAction.java trunk/src/main/java/cc/kune/gspace/client/i18n/TranslatorTabsCollection.java trunk/src/main/resources/ConstantsTest_en.properties trunk/src/main/resources/ConstantsTest_es.properties trunk/src/test/java/cc/kune/core/client/i18n/ trunk/src/test/java/cc/kune/core/client/i18n/ConstantsTest.java trunk/src/test/java/cc/kune/core/client/i18n/I18nUtilsTest.java Removed: trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogView.java trunk/src/main/java/org/ourproject/kune/app/public/css/img/alert.gif trunk/src/main/java/org/ourproject/kune/app/public/css/img/arrow-down-black.gif trunk/src/main/java/org/ourproject/kune/app/public/css/img/arrow-down-white.gif trunk/src/main/java/org/ourproject/kune/app/public/css/img/arrow-right-black.gif trunk/src/main/java/org/ourproject/kune/app/public/css/img/arrow-right-white.gif trunk/src/main/java/org/ourproject/kune/app/public/css/img/colors.gif trunk/src/main/java/org/ourproject/kune/app/public/css/img/copyleft.png trunk/src/main/java/org/ourproject/kune/app/public/css/img/emblem-system.gif trunk/src/main/java/org/ourproject/kune/app/public/css/img/film.png trunk/src/main/java/org/ourproject/kune/app/public/css/img/info.gif trunk/src/main/java/org/ourproject/kune/app/public/css/img/language.gif trunk/src/main/java/org/ourproject/kune/app/public/css/img/link.gif trunk/src/main/java/org/ourproject/kune/app/public/css/img/picture.png trunk/src/main/java/org/ourproject/kune/app/public/css/img/specialchars.png trunk/src/main/java/org/ourproject/kune/app/public/css/img/splitter-vert-bar.png trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslator.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelector.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorView.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java Modified: trunk/TODO trunk/TODO_done trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java trunk/src/main/java/cc/kune/chat/client/ChatParts.java trunk/src/main/java/cc/kune/chat/client/actions/ChatSitebarActions.java trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractComposedGuiItem.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractSeparatorDescriptor.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescCollection.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuDescriptor.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuItemDescriptor.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuSeparatorDescriptor.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/SubMenuDescriptor.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/ToolbarDescriptor.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/ToolbarSeparatorDescriptor.java trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialog.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptions.java trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActions.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/docs/client/DocsGinModule.java trunk/src/main/java/cc/kune/docs/client/actions/GoParentFolderBtn.java trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerMenuItem.java trunk/src/main/java/cc/kune/gspace/client/actions/NewContentMenuItem.java trunk/src/main/java/cc/kune/gspace/client/actions/RefreshContentMenuItem.java trunk/src/main/java/cc/kune/gspace/client/options/EntityOptions.java trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.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/UserOptionsPresenter.java trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPresenter.java trunk/src/main/java/com/example/client/HelloWorldActions.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractSearcherPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java Log: Actions hierarchy revisited NEW - # 79: I18n refactorization http://kune.ourproject.org/issues/ticket/79 Modified: trunk/TODO =================================================================== --- trunk/TODO 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/TODO 2011-08-03 17:07:42 UTC (rev 1478) @@ -19,106 +19,6 @@ **** Editors (view plain --> create new --> ask for participation) **** Viewers (view plain --> ask for participation) *** Not logged (view plain wave) - -** Perms in WIAB :ARCHIVE: -27-abr-2011 16:59:01 org.waveprotocol.box.server.robots.OperationContextImpl openWavelet -GRAVE: admin@localhost tried to open [WaveletName localhost/w+1v66qilgtl2o6E/localhost/conv+root] which it isn't participating in -27-abr-2011 16:59:01 org.waveprotocol.box.server.robots.util.OperationUtil executeOperation -ADVERTENCIA: Operation {'method':'robot.fetchWave','id':'op16','waveId':'localhost!w+1v66qilgtl2o6E','waveletId':'localhost!conv+root','blipId':'null','parameters':{WAVELET_ID=localhost!conv+root, WAVE_ID=localhost!w+1v66qilgtl2o6E}} failed to execute -com.google.wave.api.InvalidRequestException: Wavelet [WaveletName localhost/w+1v66qilgtl2o6E/localhost/conv+root] couldn't be retrieved - at org.waveprotocol.box.server.robots.OperationContextImpl.openWavelet(OperationContextImpl.java:231) - at org.waveprotocol.box.server.robots.OperationContextImpl.openWavelet(OperationContextImpl.java:247) - at org.waveprotocol.box.server.robots.operations.FetchWaveService.execute(FetchWaveService.java:52) - at org.waveprotocol.box.server.robots.util.OperationUtil.executeOperation(OperationUtil.java:171) - at cc.kune.wave.server.KuneWaveManagerDefault.fetchWavelet(KuneWaveManagerDefault.java:138) - at cc.kune.wave.server.KuneWaveManagerDefault$$EnhancerByGuice$$eb69153f.CGLIB$fetchWavelet$2(<generated>) - at cc.kune.wave.server.KuneWaveManagerDefault$$EnhancerByGuice$$eb69153f$$FastClassByGuice$$53f72476.invoke(<generated>) - at com.google.inject.internal.cglib.proxy.$MethodProxy.invokeSuper(MethodProxy.java:228) - at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) - at cc.kune.core.server.LoggerMethodInterceptor.invoke(LoggerMethodInterceptor.java:87) - at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) - at com.google.inject.internal.InterceptorStackCallback.intercept(InterceptorStackCallback.java:44) - at cc.kune.wave.server.KuneWaveManagerDefault$$EnhancerByGuice$$eb69153f.fetchWavelet(<generated>) - at cc.kune.core.server.state.StateServiceDefault.create(StateServiceDefault.java:111) - at cc.kune.core.server.state.StateServiceDefault$$EnhancerByGuice$$9d4970d0.CGLIB$create$1(<generated>) - at cc.kune.core.server.state.StateServiceDefault$$EnhancerByGuice$$9d4970d0$$FastClassByGuice$$9a3402d2.invoke(<generated>) - at com.google.inject.internal.cglib.proxy.$MethodProxy.invokeSuper(MethodProxy.java:228) - at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) - at cc.kune.core.server.LoggerMethodInterceptor.invoke(LoggerMethodInterceptor.java:87) - at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) - at com.google.inject.internal.InterceptorStackCallback.intercept(InterceptorStackCallback.java:44) - at cc.kune.core.server.state.StateServiceDefault$$EnhancerByGuice$$9d4970d0.create(<generated>) - at cc.kune.core.server.rpc.ContentRPC.getContentOrDefContent(ContentRPC.java:263) - at cc.kune.core.server.rpc.ContentRPC.getContent(ContentRPC.java:246) - at cc.kune.core.server.rpc.ContentRPC$$EnhancerByGuice$$9d633676.CGLIB$getContent$1(<generated>) - at cc.kune.core.server.rpc.ContentRPC$$EnhancerByGuice$$9d633676$$FastClassByGuice$$8c7047c.invoke(<generated>) - at com.google.inject.internal.cglib.proxy.$MethodProxy.invokeSuper(MethodProxy.java:228) - at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) - at cc.kune.core.server.LoggerMethodInterceptor.invoke(LoggerMethodInterceptor.java:87) - at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) - at com.google.inject.persist.jpa.JpaLocalTxnInterceptor.invoke(JpaLocalTxnInterceptor.java:66) - at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) - at cc.kune.core.server.auth.AuthenticatedMethodInterceptor.invoke(AuthenticatedMethodInterceptor.java:84) - at cc.kune.core.server.OutermostCallInterceptor.invoke(OutermostCallInterceptor.java:66) - at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) - at com.google.inject.internal.InterceptorStackCallback.intercept(InterceptorStackCallback.java:44) - at cc.kune.core.server.rpc.ContentRPC$$EnhancerByGuice$$9d633676.getContent(<generated>) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:616) - at com.google.gwt.user.server.rpc.RPC.invokeAndEncodeResponse(RPC.java:562) - at com.google.gwt.user.server.rpc.RPC.invokeAndEncodeResponse(RPC.java:544) - at com.google.gwt.user.server.rpc.RPC.invokeAndEncodeResponse(RPC.java:504) - at cc.kune.core.server.rack.filters.gwts.DelegatedRemoteServlet.processCall(DelegatedRemoteServlet.java:45) - at com.google.gwt.user.server.rpc.RemoteServiceServlet.processPost(RemoteServiceServlet.java:243) - at com.google.gwt.user.server.rpc.AbstractRemoteServiceServlet.doPost(AbstractRemoteServiceServlet.java:62) - at cc.kune.core.server.rack.filters.gwts.GWTServiceFilter.doFilter(GWTServiceFilter.java:61) - at cc.kune.core.server.rack.RackServletFilter$DockChain.execute(RackServletFilter.java:70) - at cc.kune.core.server.rack.RackServletFilter$DockChain.doFilter(RackServletFilter.java:63) - at com.google.inject.servlet.FilterChainInvocation.doFilter(FilterChainInvocation.java:66) - at com.google.inject.servlet.ManagedFilterPipeline.dispatch(ManagedFilterPipeline.java:118) - at com.google.inject.servlet.ManagedFilterPipeline$$EnhancerByGuice$$1af97b76.CGLIB$dispatch$0(<generated>) - at com.google.inject.servlet.ManagedFilterPipeline$$EnhancerByGuice$$1af97b76$$FastClassByGuice$$57398af4.invoke(<generated>) - at com.google.inject.internal.cglib.proxy.$MethodProxy.invokeSuper(MethodProxy.java:228) - at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) - at cc.kune.core.server.LoggerMethodInterceptor.invoke(LoggerMethodInterceptor.java:87) - at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) - at com.google.inject.internal.InterceptorStackCallback.intercept(InterceptorStackCallback.java:44) - at com.google.inject.servlet.ManagedFilterPipeline$$EnhancerByGuice$$1af97b76.dispatch(<generated>) - at com.google.inject.servlet.GuiceFilter.doFilter(GuiceFilter.java:113) - at cc.kune.core.server.rack.RackServletFilter$DockChain.execute(RackServletFilter.java:70) - at cc.kune.core.server.rack.RackServletFilter$DockChain.doFilter(RackServletFilter.java:63) - at cc.kune.core.server.rack.filters.LogFilter.doFilter(LogFilter.java:46) - at cc.kune.core.server.rack.RackServletFilter$DockChain.execute(RackServletFilter.java:70) - at cc.kune.core.server.rack.RackServletFilter$DockChain.doFilter(RackServletFilter.java:63) - at cc.kune.core.server.rack.RackServletFilter.doFilter(RackServletFilter.java:105) - at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1187) - at org.eclipse.jetty.servlet.ServletHandler.doHandle(ServletHandler.java:421) - at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:119) - at org.eclipse.jetty.security.SecurityHandler.handle(SecurityHandler.java:493) - at org.eclipse.jetty.server.session.SessionHandler.doHandle(SessionHandler.java:225) - at org.eclipse.jetty.server.handler.ContextHandler.doHandle(ContextHandler.java:930) - at org.eclipse.jetty.servlet.ServletHandler.doScope(ServletHandler.java:358) - at org.eclipse.jetty.server.session.SessionHandler.doScope(SessionHandler.java:183) - at org.eclipse.jetty.server.handler.ContextHandler.doScope(ContextHandler.java:866) - at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:117) - at org.eclipse.jetty.server.handler.HandlerWrapper.handle(HandlerWrapper.java:113) - at org.eclipse.jetty.server.Server.handle(Server.java:351) - at org.eclipse.jetty.server.HttpConnection.handleRequest(HttpConnection.java:594) - at org.eclipse.jetty.server.HttpConnection$RequestHandler.content(HttpConnection.java:1059) - at org.eclipse.jetty.http.HttpParser.parseNext(HttpParser.java:764) - at org.eclipse.jetty.http.HttpParser.parseAvailable(HttpParser.java:217) - at org.eclipse.jetty.server.HttpConnection.handle(HttpConnection.java:424) - at org.eclipse.jetty.io.nio.SelectChannelEndPoint.run(SelectChannelEndPoint.java:506) - at org.eclipse.jetty.util.thread.QueuedThreadPool$2.run(QueuedThreadPool.java:436) - at java.lang.Thread.run(Thread.java:679) -2011-04-27 16:59:01,904 [qtp2042579307-41] ERROR - Wavelet [WaveletName localhost/w+1v66qilgtl2o6E/localhost/conv+root] couldn't be retrieved -** TODO Server side extensions configuration menu -A way to specify the default extensions in a client of a wave server. -** TODO style injection: - http://www.hunlock.com/blogs/Howto_Dynamically_Insert_Javascript_And_CSS - https://groups.google.com/group/Google-Web-Toolkit/browse_thread/thread/f4c… ** TODO >> Delete host/room conf in ws.html ** TODO >> kune.properties from cmd line ** TODO HelloWord with samples of extensions: sitebar, sitebar options menu, siteuseroptions, sn, ... Modified: trunk/TODO_done =================================================================== --- trunk/TODO_done 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/TODO_done 2011-08-03 17:07:42 UTC (rev 1478) @@ -131,7 +131,136 @@ * @return The corresponding WaveRef object, or null if the path was invalid. * @throws InvalidWaveRefException If the path contains less than 2 tokens or 3 tokens. */ +* TODO style injection: + :PROPERTIES: + :ARCHIVE_TIME: 2011-07-30 sáb 00:35 + :ARCHIVE_FILE: ~/proyectos/dev/kune/trunk/TODO + :ARCHIVE_OLPATH: SHORT-TERM (URGENT) + :ARCHIVE_CATEGORY: TODO + :ARCHIVE_TODO: TODO + :END: + http://www.hunlock.com/blogs/Howto_Dynamically_Insert_Javascript_And_CSS + https://groups.google.com/group/Google-Web-Toolkit/browse_thread/thread/f4c… +* TODO style injection: + :PROPERTIES: + :ARCHIVE_TIME: 2011-07-30 sáb 00:35 + :ARCHIVE_FILE: ~/proyectos/dev/kune/trunk/TODO + :ARCHIVE_OLPATH: SHORT-TERM (URGENT) + :ARCHIVE_CATEGORY: TODO + :ARCHIVE_TODO: TODO + :END: + http://www.hunlock.com/blogs/Howto_Dynamically_Insert_Javascript_And_CSS + https://groups.google.com/group/Google-Web-Toolkit/browse_thread/thread/f4c… +* TODO Server side extensions configuration menu + :PROPERTIES: + :ARCHIVE_TIME: 2011-07-30 sáb 00:35 + :ARCHIVE_FILE: ~/proyectos/dev/kune/trunk/TODO + :ARCHIVE_OLPATH: SHORT-TERM (URGENT) + :ARCHIVE_CATEGORY: TODO + :ARCHIVE_TODO: TODO + :END: +A way to specify the default extensions in a client of a wave server. +* Perms in WIAB :ARCHIVE: + :PROPERTIES: + :ARCHIVE_TIME: 2011-07-30 sáb 00:36 + :ARCHIVE_FILE: ~/proyectos/dev/kune/trunk/TODO + :ARCHIVE_OLPATH: SHORT-TERM (URGENT) + :ARCHIVE_CATEGORY: TODO + :END: +27-abr-2011 16:59:01 org.waveprotocol.box.server.robots.OperationContextImpl openWavelet +GRAVE: admin@localhost tried to open [WaveletName localhost/w+1v66qilgtl2o6E/localhost/conv+root] which it isn't participating in +27-abr-2011 16:59:01 org.waveprotocol.box.server.robots.util.OperationUtil executeOperation +ADVERTENCIA: Operation {'method':'robot.fetchWave','id':'op16','waveId':'localhost!w+1v66qilgtl2o6E','waveletId':'localhost!conv+root','blipId':'null','parameters':{WAVELET_ID=localhost!conv+root, WAVE_ID=localhost!w+1v66qilgtl2o6E}} failed to execute +com.google.wave.api.InvalidRequestException: Wavelet [WaveletName localhost/w+1v66qilgtl2o6E/localhost/conv+root] couldn't be retrieved + at org.waveprotocol.box.server.robots.OperationContextImpl.openWavelet(OperationContextImpl.java:231) + at org.waveprotocol.box.server.robots.OperationContextImpl.openWavelet(OperationContextImpl.java:247) + at org.waveprotocol.box.server.robots.operations.FetchWaveService.execute(FetchWaveService.java:52) + at org.waveprotocol.box.server.robots.util.OperationUtil.executeOperation(OperationUtil.java:171) + at cc.kune.wave.server.KuneWaveManagerDefault.fetchWavelet(KuneWaveManagerDefault.java:138) + at cc.kune.wave.server.KuneWaveManagerDefault$$EnhancerByGuice$$eb69153f.CGLIB$fetchWavelet$2(<generated>) + at cc.kune.wave.server.KuneWaveManagerDefault$$EnhancerByGuice$$eb69153f$$FastClassByGuice$$53f72476.invoke(<generated>) + at com.google.inject.internal.cglib.proxy.$MethodProxy.invokeSuper(MethodProxy.java:228) + at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) + at cc.kune.core.server.LoggerMethodInterceptor.invoke(LoggerMethodInterceptor.java:87) + at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) + at com.google.inject.internal.InterceptorStackCallback.intercept(InterceptorStackCallback.java:44) + at cc.kune.wave.server.KuneWaveManagerDefault$$EnhancerByGuice$$eb69153f.fetchWavelet(<generated>) + at cc.kune.core.server.state.StateServiceDefault.create(StateServiceDefault.java:111) + at cc.kune.core.server.state.StateServiceDefault$$EnhancerByGuice$$9d4970d0.CGLIB$create$1(<generated>) + at cc.kune.core.server.state.StateServiceDefault$$EnhancerByGuice$$9d4970d0$$FastClassByGuice$$9a3402d2.invoke(<generated>) + at com.google.inject.internal.cglib.proxy.$MethodProxy.invokeSuper(MethodProxy.java:228) + at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) + at cc.kune.core.server.LoggerMethodInterceptor.invoke(LoggerMethodInterceptor.java:87) + at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) + at com.google.inject.internal.InterceptorStackCallback.intercept(InterceptorStackCallback.java:44) + at cc.kune.core.server.state.StateServiceDefault$$EnhancerByGuice$$9d4970d0.create(<generated>) + at cc.kune.core.server.rpc.ContentRPC.getContentOrDefContent(ContentRPC.java:263) + at cc.kune.core.server.rpc.ContentRPC.getContent(ContentRPC.java:246) + at cc.kune.core.server.rpc.ContentRPC$$EnhancerByGuice$$9d633676.CGLIB$getContent$1(<generated>) + at cc.kune.core.server.rpc.ContentRPC$$EnhancerByGuice$$9d633676$$FastClassByGuice$$8c7047c.invoke(<generated>) + at com.google.inject.internal.cglib.proxy.$MethodProxy.invokeSuper(MethodProxy.java:228) + at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) + at cc.kune.core.server.LoggerMethodInterceptor.invoke(LoggerMethodInterceptor.java:87) + at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) + at com.google.inject.persist.jpa.JpaLocalTxnInterceptor.invoke(JpaLocalTxnInterceptor.java:66) + at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) + at cc.kune.core.server.auth.AuthenticatedMethodInterceptor.invoke(AuthenticatedMethodInterceptor.java:84) + at cc.kune.core.server.OutermostCallInterceptor.invoke(OutermostCallInterceptor.java:66) + at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) + at com.google.inject.internal.InterceptorStackCallback.intercept(InterceptorStackCallback.java:44) + at cc.kune.core.server.rpc.ContentRPC$$EnhancerByGuice$$9d633676.getContent(<generated>) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.lang.reflect.Method.invoke(Method.java:616) + at com.google.gwt.user.server.rpc.RPC.invokeAndEncodeResponse(RPC.java:562) + at com.google.gwt.user.server.rpc.RPC.invokeAndEncodeResponse(RPC.java:544) + at com.google.gwt.user.server.rpc.RPC.invokeAndEncodeResponse(RPC.java:504) + at cc.kune.core.server.rack.filters.gwts.DelegatedRemoteServlet.processCall(DelegatedRemoteServlet.java:45) + at com.google.gwt.user.server.rpc.RemoteServiceServlet.processPost(RemoteServiceServlet.java:243) + at com.google.gwt.user.server.rpc.AbstractRemoteServiceServlet.doPost(AbstractRemoteServiceServlet.java:62) + at cc.kune.core.server.rack.filters.gwts.GWTServiceFilter.doFilter(GWTServiceFilter.java:61) + at cc.kune.core.server.rack.RackServletFilter$DockChain.execute(RackServletFilter.java:70) + at cc.kune.core.server.rack.RackServletFilter$DockChain.doFilter(RackServletFilter.java:63) + at com.google.inject.servlet.FilterChainInvocation.doFilter(FilterChainInvocation.java:66) + at com.google.inject.servlet.ManagedFilterPipeline.dispatch(ManagedFilterPipeline.java:118) + at com.google.inject.servlet.ManagedFilterPipeline$$EnhancerByGuice$$1af97b76.CGLIB$dispatch$0(<generated>) + at com.google.inject.servlet.ManagedFilterPipeline$$EnhancerByGuice$$1af97b76$$FastClassByGuice$$57398af4.invoke(<generated>) + at com.google.inject.internal.cglib.proxy.$MethodProxy.invokeSuper(MethodProxy.java:228) + at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) + at cc.kune.core.server.LoggerMethodInterceptor.invoke(LoggerMethodInterceptor.java:87) + at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) + at com.google.inject.internal.InterceptorStackCallback.intercept(InterceptorStackCallback.java:44) + at com.google.inject.servlet.ManagedFilterPipeline$$EnhancerByGuice$$1af97b76.dispatch(<generated>) + at com.google.inject.servlet.GuiceFilter.doFilter(GuiceFilter.java:113) + at cc.kune.core.server.rack.RackServletFilter$DockChain.execute(RackServletFilter.java:70) + at cc.kune.core.server.rack.RackServletFilter$DockChain.doFilter(RackServletFilter.java:63) + at cc.kune.core.server.rack.filters.LogFilter.doFilter(LogFilter.java:46) + at cc.kune.core.server.rack.RackServletFilter$DockChain.execute(RackServletFilter.java:70) + at cc.kune.core.server.rack.RackServletFilter$DockChain.doFilter(RackServletFilter.java:63) + at cc.kune.core.server.rack.RackServletFilter.doFilter(RackServletFilter.java:105) + at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1187) + at org.eclipse.jetty.servlet.ServletHandler.doHandle(ServletHandler.java:421) + at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:119) + at org.eclipse.jetty.security.SecurityHandler.handle(SecurityHandler.java:493) + at org.eclipse.jetty.server.session.SessionHandler.doHandle(SessionHandler.java:225) + at org.eclipse.jetty.server.handler.ContextHandler.doHandle(ContextHandler.java:930) + at org.eclipse.jetty.servlet.ServletHandler.doScope(ServletHandler.java:358) + at org.eclipse.jetty.server.session.SessionHandler.doScope(SessionHandler.java:183) + at org.eclipse.jetty.server.handler.ContextHandler.doScope(ContextHandler.java:866) + at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:117) + at org.eclipse.jetty.server.handler.HandlerWrapper.handle(HandlerWrapper.java:113) + at org.eclipse.jetty.server.Server.handle(Server.java:351) + at org.eclipse.jetty.server.HttpConnection.handleRequest(HttpConnection.java:594) + at org.eclipse.jetty.server.HttpConnection$RequestHandler.content(HttpConnection.java:1059) + at org.eclipse.jetty.http.HttpParser.parseNext(HttpParser.java:764) + at org.eclipse.jetty.http.HttpParser.parseAvailable(HttpParser.java:217) + at org.eclipse.jetty.server.HttpConnection.handle(HttpConnection.java:424) + at org.eclipse.jetty.io.nio.SelectChannelEndPoint.run(SelectChannelEndPoint.java:506) + at org.eclipse.jetty.util.thread.QueuedThreadPool$2.run(QueuedThreadPool.java:436) + at java.lang.Thread.run(Thread.java:679) +2011-04-27 16:59:01,904 [qtp2042579307-41] ERROR - Wavelet [WaveletName localhost/w+1v66qilgtl2o6E/localhost/conv+root] couldn't be retrieved @@ -141,3 +270,8 @@ + + + + + Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -45,7 +45,6 @@ import cc.kune.core.client.init.AppStopEvent; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.sitebar.SitebarActions; -import cc.kune.core.client.sitebar.SitebarActionsPresenter; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.UserSignInEvent; import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; @@ -252,6 +251,7 @@ private void createActionIfNeeded() { if (chatIcon == null) { chatIcon = new IconLabelDescriptor(action); + chatIcon.setParent(siteActions.getLeftToolbar()); chatIcon.setId(CHAT_CLIENT_ICON_ID); chatIcon.setStyles("k-no-backimage, k-btn-sitebar, k-chat-icon"); chatIcon.putValue(Action.NAME, i18n.t(CHAT_TITLE)); @@ -260,13 +260,9 @@ shorcutRegister.put(shortcut, action); action.setShortcut(shortcut); chatIcon.setVisible(session.isLogged()); - siteActions.getLeftToolbar().add( - new ToolbarSeparatorDescriptor(Type.spacer, SitebarActionsPresenter.LEFT_TOOLBAR)); - siteActions.getLeftToolbar().add( - new ToolbarSeparatorDescriptor(Type.spacer, SitebarActionsPresenter.LEFT_TOOLBAR)); - siteActions.getLeftToolbar().add( - new ToolbarSeparatorDescriptor(Type.spacer, SitebarActionsPresenter.LEFT_TOOLBAR)); - siteActions.getLeftToolbar().add(chatIcon); + ToolbarSeparatorDescriptor.build(Type.spacer, siteActions.getLeftToolbar()); + ToolbarSeparatorDescriptor.build(Type.spacer, siteActions.getLeftToolbar()); + ToolbarSeparatorDescriptor.build(Type.spacer, siteActions.getLeftToolbar()); } } Modified: trunk/src/main/java/cc/kune/chat/client/ChatParts.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatParts.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/chat/client/ChatParts.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -157,7 +157,7 @@ userItemsRegistry.get().add(startChatWithBuddieItem); userItemsRegistry.get().add(startChatWithPersonItem); userItemsRegistry.get().add(addAsBuddieItem); - groupConfActions.get().add(startAssembly.get()); + startAssembly.get(); buddieButton.get(); groupSN.get().refreshActions(); // openGroupRoom.get(); Modified: trunk/src/main/java/cc/kune/chat/client/actions/ChatSitebarActions.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/ChatSitebarActions.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/chat/client/actions/ChatSitebarActions.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -143,11 +143,6 @@ onlineAction(NO_STATUS, Show.dnd, res.busy())); final MenuRadioItemDescriptor offlineItem = createChatStatusAction(res.offline(), i18n.t("Sign out of chat"), new ChangeOfflineStatusAction(xmppSession, res.offline())); - userOptions.addAction(onlineItem); - userOptions.addAction(availableItem); - userOptions.addAction(awayItem); - userOptions.addAction(busyItem); - userOptions.addAction(offlineItem); xmppSession.addSessionStateChangedHandler(false, new StateChangedHandler() { @Override Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractComposedGuiItem.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractComposedGuiItem.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractComposedGuiItem.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -23,8 +23,10 @@ import cc.kune.common.client.actions.ui.bind.GuiBinding; import cc.kune.common.client.actions.ui.bind.GuiProvider; +import cc.kune.common.client.actions.ui.descrip.AbstractParentGuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.HasChilds; import cc.kune.common.client.errors.UIException; import com.google.gwt.user.client.ui.Composite; @@ -80,12 +82,19 @@ } else { final AbstractGuiItem item = binding.create(descrip); if (binding.shouldBeAdded()) { + // TODO Change this ^ to shouldBeAttached if (descrip.getPosition() == GuiActionDescrip.NO_POSITION) { addWidget(item); } else { insertWidget(item, descrip.getPosition()); } } + if (descrip instanceof HasChilds) { + for (final GuiActionDescrip child : ((AbstractParentGuiActionDescrip) descrip).getChilds()) { + // Log.info("Child added: " + child.getValue(Action.NAME)); + add(child); + } + } } } } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -194,6 +194,14 @@ @Override public void setParent(final GuiActionDescrip parent) { + setParent(parent, true); + } + + @Override + public void setParent(final GuiActionDescrip parent, final boolean addToParent) { + if (parent != NO_PARENT && addToParent) { + ((AbstractParentGuiActionDescrip) parent).add(this); + } this.parent = parent; } @@ -268,6 +276,12 @@ } @Override + public GuiActionDescrip withParent(final GuiActionDescrip parent, final boolean addToParent) { + setParent(parent, addToParent); + return this; + } + + @Override public GuiActionDescrip withShortcut(final KeyStroke shortcut) { putValue(Action.ACCELERATOR_KEY, shortcut); return this; Added: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractParentGuiActionDescrip.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractParentGuiActionDescrip.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractParentGuiActionDescrip.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -0,0 +1,23 @@ +package cc.kune.common.client.actions.ui.descrip; + +import cc.kune.common.client.actions.AbstractAction; + +public abstract class AbstractParentGuiActionDescrip extends AbstractGuiActionDescrip implements + HasChilds { + + private final GuiActionDescCollection childs; + + public AbstractParentGuiActionDescrip(final AbstractAction action) { + super(action); + childs = new GuiActionDescCollection(); + } + + public void add(final GuiActionDescrip... descriptors) { + childs.add(descriptors); + } + + public GuiActionDescCollection getChilds() { + return childs; + } + +} Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractSeparatorDescriptor.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractSeparatorDescriptor.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractSeparatorDescriptor.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -23,8 +23,8 @@ public abstract class AbstractSeparatorDescriptor extends AbstractGuiActionDescrip { - public AbstractSeparatorDescriptor() { - super(AbstractAction.NO_ACTION); - } + public AbstractSeparatorDescriptor() { + super(AbstractAction.NO_ACTION); + } } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescCollection.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescCollection.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescCollection.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -24,12 +24,14 @@ // @PMD:REVIEWED:AtLeastOneConstructor: by vjrj on 26/05/09 12:31 public class GuiActionDescCollection extends ArrayList<GuiActionDescrip> { - private static final long serialVersionUID = 6759723760404227737L; + private static final long serialVersionUID = 6759723760404227737L; - public void add(final GuiActionDescrip... descriptors) { - for (final GuiActionDescrip descriptor : descriptors) { - super.add(descriptor); - } + public void add(final GuiActionDescrip... descriptors) { + for (final GuiActionDescrip descriptor : descriptors) { + if (!super.contains(descriptor)) { + super.add(descriptor); + } } + } } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -93,6 +93,15 @@ void setParent(final GuiActionDescrip parent); + /** + * @param parent + * @param addToParent + * if yes, the action will be added directly to the parent, useful to + * attach menu items (or other child actions) directly to its parent + * without any other check (for instance session status, etc) + */ + void setParent(GuiActionDescrip parent, boolean addToParent); + void setPosition(final int position); void setStyles(final String styles); @@ -113,6 +122,15 @@ GuiActionDescrip withParent(GuiActionDescrip parent); + /** + * @param parent + * @param addToParent + * if yes, the action will be added directly to the parent, useful to + * attach menu items (or other child actions) directly to its parent + * without any other check (for instance session status, etc) + */ + GuiActionDescrip withParent(GuiActionDescrip parent, boolean addToParent); + GuiActionDescrip withShortcut(KeyStroke keystroke); GuiActionDescrip withStyles(String styles); Added: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/HasChilds.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/HasChilds.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/HasChilds.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -0,0 +1,4 @@ +package cc.kune.common.client.actions.ui.descrip; + +public interface HasChilds { +} Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuDescriptor.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuDescriptor.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuDescriptor.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -25,7 +25,7 @@ import com.google.gwt.resources.client.ImageResource; -public class MenuDescriptor extends AbstractGuiActionDescrip { +public class MenuDescriptor extends AbstractParentGuiActionDescrip { public static final String MENU_CLEAR = "menuclear"; public static final String MENU_HIDE = "hidemenu"; Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuItemDescriptor.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuItemDescriptor.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuItemDescriptor.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -23,35 +23,63 @@ public class MenuItemDescriptor extends AbstractGuiActionDescrip { - /** - * A simple menu item definition. - * - * You must define a menu item with its parent menu. Only use this - * constructor if you'll set the parent menu in the future (before render) - * - * @param action - */ - public MenuItemDescriptor(final AbstractAction action) { - super(action); - } + public static MenuItemDescriptor build(final AbstractAction action) { + return new MenuItemDescriptor(action); + } - /** - * - * A simple menu item definition. - * - * This is the preferred and more common used constructor. - * - * @param parent - * menu - * @param action - */ - public MenuItemDescriptor(final MenuDescriptor parent, final AbstractAction action) { - super(action); - setParent(parent); - } + public static MenuItemDescriptor build(final MenuDescriptor parent, final AbstractAction action) { + return new MenuItemDescriptor(parent, action); + } - @Override - public Class<?> getType() { - return MenuItemDescriptor.class; - } + /** + * A simple menu item definition. + * + * You must define a menu item with its parent menu. Only use this constructor + * if you'll set the parent menu in the future (before render) + * + * @param action + */ + public MenuItemDescriptor(final AbstractAction action) { + super(action); + } + + /** + * + * A simple menu item definition. + * + * This is the preferred and more common used constructor. + * + * @param parent + * menu + * @param action + */ + public MenuItemDescriptor(final MenuDescriptor parent, final AbstractAction action) { + super(action); + setParent(parent); + } + + /** + * + * A simple menu item definition. + * + * This is the preferred and more common used constructor. + * + * @param parent + * menu + * @param addToParent + * if yes, the action will be added directly to the parent, useful to + * attach menu items (or other child actions) directly to its parent + * without any other check (for instance session status, etc) + * @param action + */ + public MenuItemDescriptor(final MenuDescriptor parent, final boolean addToParent, + final AbstractAction action) { + super(action); + setParent(parent, addToParent); + } + + @Override + public Class<?> getType() { + return MenuItemDescriptor.class; + } } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuSeparatorDescriptor.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuSeparatorDescriptor.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuSeparatorDescriptor.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -21,13 +21,17 @@ public class MenuSeparatorDescriptor extends AbstractSeparatorDescriptor { - public MenuSeparatorDescriptor(final MenuDescriptor parent) { - super(); - setParent(parent); - } + public static MenuSeparatorDescriptor build(final MenuDescriptor parent) { + return new MenuSeparatorDescriptor(parent); + } - @Override - public Class<?> getType() { - return MenuSeparatorDescriptor.class; - } + public MenuSeparatorDescriptor(final MenuDescriptor parent) { + super(); + setParent(parent); + } + + @Override + public Class<?> getType() { + return MenuSeparatorDescriptor.class; + } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/SubMenuDescriptor.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/SubMenuDescriptor.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/SubMenuDescriptor.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -26,6 +26,10 @@ public class SubMenuDescriptor extends MenuDescriptor { + public static SubMenuDescriptor build() { + return new SubMenuDescriptor(); + } + public SubMenuDescriptor() { this(new BaseAction(null, null)); } @@ -43,6 +47,11 @@ putValue(MENU_STANDALONE, false); } + public SubMenuDescriptor(final GuiActionDescrip parent, final boolean addToParent, final String text) { + this(text); + setParent(parent, addToParent); + } + public SubMenuDescriptor(final GuiActionDescrip parent, final String text) { this(text); setParent(parent); Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/ToolbarDescriptor.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/ToolbarDescriptor.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/ToolbarDescriptor.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -22,28 +22,32 @@ import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.BaseAction; -public class ToolbarDescriptor extends AbstractGuiActionDescrip { +public class ToolbarDescriptor extends AbstractParentGuiActionDescrip { - public static final String TOOLBAR_CLEAR = "menuclear"; + public static final String TOOLBAR_CLEAR = "menuclear"; - public ToolbarDescriptor() { - super(new BaseAction(null, null)); - super.getAction().putValue(TOOLBAR_CLEAR, false); - } + public static ToolbarDescriptor build() { + return new ToolbarDescriptor(); + } - public void clear() { - // Action detects changes in values, then we fire a change (whatever) to - // fire this method in the UI - putValue(TOOLBAR_CLEAR, !((Boolean) getValue(TOOLBAR_CLEAR))); - } + public ToolbarDescriptor() { + super(new BaseAction(null, null)); + super.getAction().putValue(TOOLBAR_CLEAR, false); + } - @Override - public Class<?> getType() { - return ToolbarDescriptor.class; - } + public void clear() { + // Action detects changes in values, then we fire a change (whatever) to + // fire this method in the UI + putValue(TOOLBAR_CLEAR, !((Boolean) getValue(TOOLBAR_CLEAR))); + } - public void setText(final String text) { - putValue(Action.NAME, text); - } + @Override + public Class<?> getType() { + return ToolbarDescriptor.class; + } + public void setText(final String text) { + putValue(Action.NAME, text); + } + } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/ToolbarSeparatorDescriptor.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/ToolbarSeparatorDescriptor.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/ToolbarSeparatorDescriptor.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -19,28 +19,31 @@ */ package cc.kune.common.client.actions.ui.descrip; - public class ToolbarSeparatorDescriptor extends AbstractSeparatorDescriptor { - public enum Type { - spacer, separator, fill - } + public enum Type { + fill, separator, spacer + } - private final Type type; + public static ToolbarSeparatorDescriptor build(final Type type, final ToolbarDescriptor parent) { + return new ToolbarSeparatorDescriptor(type, parent); + } - public ToolbarSeparatorDescriptor(final Type type, final ToolbarDescriptor parent) { - super(); - this.type = type; - setParent(parent); - } + private final Type type; - public Type getSeparatorType() { - return type; - } + public ToolbarSeparatorDescriptor(final Type type, final ToolbarDescriptor parent) { + super(); + this.type = type; + setParent(parent); + } - @Override - public Class<?> getType() { - return ToolbarSeparatorDescriptor.class; - } + public Type getSeparatorType() { + return type; + } + @Override + public Class<?> getType() { + return ToolbarSeparatorDescriptor.class; + } + } Modified: trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -33,6 +33,8 @@ import com.google.gwt.event.dom.client.MouseOutHandler; import com.google.gwt.event.dom.client.MouseOverEvent; import com.google.gwt.event.dom.client.MouseOverHandler; +import com.google.gwt.event.logical.shared.AttachEvent; +import com.google.gwt.event.logical.shared.AttachEvent.Handler; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.Window; @@ -59,6 +61,15 @@ final Tooltip tip = new Tooltip(); tip.to(widget); tip.setText(text); + widget.addAttachHandler(new Handler() { + @Override + public void onAttachOrDetach(final AttachEvent event) { + if (!event.isAttached()) { + tip.hide(); + } + } + + }); return tip; } return null; Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialog.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialog.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialog.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -25,16 +25,18 @@ public interface AbstractTabbedDialog { - void activateTab(int index); + void activateTab(int index); - void addTab(IsWidget tab, IsWidget tabTitle); + void addTab(IsWidget tab, IsWidget tabTitle); - public void hideMessages(); + void hide(); - void insertTab(IsWidget tab, IsWidget tabTitle, int position); + public void hideMessages(); - public void setErrorMessage(String message, NotifyLevel level); + void insertTab(IsWidget tab, IsWidget tabTitle, int position); - void show(); + public void setErrorMessage(String message, NotifyLevel level); + void show(); + } 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-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -19,11 +19,15 @@ */ package cc.kune.common.client.ui.dialogs.tabbed; +import cc.kune.common.client.ProvidersCollection; import cc.kune.common.client.notify.NotifyLevel; import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.common.client.ui.dialogs.BasicTopDialog; import cc.kune.common.client.ui.dialogs.MessageToolbar; +import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter.AbstractTabbedDialogView; +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.logical.shared.HasCloseHandlers; import com.google.gwt.resources.client.ImageResource; @@ -42,6 +46,7 @@ private final NotifyLevelImages images; private MessageToolbar messageErrorBar; private final boolean modal; + private final ProvidersCollection provCollection; private final String sndBtnId; private final String sndBtnTitle; private DecoratedTabPanel tabPanel; @@ -50,7 +55,8 @@ 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) { + final String firstBtnId, final String sndBtnTitle, final String sndBtnId, + final ProvidersCollection provCollection) { this.dialogId = dialogId; this.title = title; this.modal = modal; @@ -60,13 +66,15 @@ this.firstBtnId = firstBtnId; this.sndBtnTitle = sndBtnTitle; this.sndBtnId = sndBtnId; + this.provCollection = provCollection; } 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); + final String sndBtnId, final ProvidersCollection provCollection) { + this(dialogId, title, modal, images, errorLabelId, firstBtnTitle, firstBtnId, sndBtnTitle, sndBtnId, + provCollection); this.width = width; this.height = height; } @@ -84,9 +92,9 @@ } @Override - public void createAndShow() { - show(); - setFirstTabActive(); + public Widget asWidget() { + createDialogIfNecessary(); + return dialog; } private void createDialog() { @@ -97,6 +105,13 @@ tabPanel = new DecoratedTabPanel(); tabPanel.getDeckPanel().setSize(String.valueOf(width), String.valueOf(height)); dialog.getInnerPanel().add(tabPanel); + dialog.getFirstBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + hide(); + } + }); + provCollection.createAll(); } private void createDialogIfNecessary() { @@ -128,11 +143,6 @@ return dialog.getSecondBtn(); } - public Widget getWidget() { - createDialogIfNecessary(); - return dialog; - } - @Override public void hide() { if (dialog != null) { @@ -187,8 +197,16 @@ } } + @Override public void show() { + showImpl(); + setFirstTabActive(); + } + + private void showImpl() { createDialogIfNecessary(); + hideMessages(); dialog.showCentered(); } + } Deleted: trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -1,73 +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 cc.kune.common.client.ui.dialogs.tabbed; - -import cc.kune.common.client.notify.NotifyLevel; - -import com.google.gwt.user.client.ui.IsWidget; - -public abstract class AbstractTabbedDialogPresenter implements AbstractTabbedDialog { - - private AbstractTabbedDialogView view; - - @Override - public void activateTab(final int index) { - view.activateTab(index); - } - - @Override - public void addTab(final IsWidget tab, final IsWidget tabTitle) { - view.addTab(tab, tabTitle); - } - - public IsWidget getView() { - return view; - } - - public void hide() { - view.hide(); - } - - @Override - public void hideMessages() { - view.hideMessages(); - } - - public void init(final AbstractTabbedDialogView view) { - this.view = view; - } - - @Override - public void insertTab(final IsWidget tab, final IsWidget tabTitle, final int index) { - view.insertTab(tab, tabTitle, index); - } - - @Override - public void setErrorMessage(final String message, final NotifyLevel level) { - view.setErrorMessage(message, level); - } - - @Override - public void show() { - hideMessages(); - view.createAndShow(); - } - -} Added: trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -0,0 +1,93 @@ +/* + * + * 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.tabbed; + +import cc.kune.common.client.notify.NotifyLevel; + +import com.google.gwt.user.client.ui.IsWidget; + +public abstract class AbstractTabbedDialogPresenter implements AbstractTabbedDialog { + + public interface AbstractTabbedDialogView extends IsWidget { + + void activateTab(int index); + + void addTab(IsWidget tab, IsWidget tabTitle); + + void destroy(); + + void hide(); + + void hideMessages(); + + void insertTab(IsWidget tab, IsWidget tabTitle, int position); + + void setErrorMessage(final String message, final NotifyLevel level); + + void show(); + } + + private AbstractTabbedDialogView view; + + @Override + public void activateTab(final int index) { + view.activateTab(index); + } + + @Override + public void addTab(final IsWidget tab, final IsWidget tabTitle) { + view.addTab(tab, tabTitle); + } + + public IsWidget getView() { + return view; + } + + @Override + public void hide() { + view.hide(); + } + + @Override + public void hideMessages() { + view.hideMessages(); + } + + public void init(final AbstractTabbedDialogView view) { + this.view = view; + } + + @Override + public void insertTab(final IsWidget tab, final IsWidget tabTitle, final int index) { + view.insertTab(tab, tabTitle, index); + } + + @Override + public void setErrorMessage(final String message, final NotifyLevel level) { + view.setErrorMessage(message, level); + } + + @Override + public void show() { + hideMessages(); + view.show(); + } + +} Deleted: trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogView.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogView.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogView.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -1,44 +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 cc.kune.common.client.ui.dialogs.tabbed; - -import cc.kune.common.client.notify.NotifyLevel; - -import com.google.gwt.user.client.ui.IsWidget; - -public interface AbstractTabbedDialogView extends IsWidget { - - void activateTab(int index); - - void addTab(IsWidget tab, IsWidget tabTitle); - - void createAndShow(); - - void destroy(); - - void hide(); - - void hideMessages(); - - void insertTab(IsWidget tab, IsWidget tabTitle, int position); - - void setErrorMessage(final String message, final NotifyLevel level); - -} Modified: trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -21,115 +21,221 @@ import java.util.ArrayList; +import org.apache.commons.lang.WordUtils; + +import cc.kune.common.client.errors.NotImplementedException; + import com.google.gwt.safehtml.shared.SimpleHtmlSanitizer; public class TextUtils { - // Original regexp from http://www.regular-expressions.info/email.html - public static final String EMAIL_REGEXP = "[-!#$%&\'*+/=?_`{|}~a-z0-9^]+(\\.[-!#$%&\'*+/=?_`{|}~a-z0-9^]+)*@(localhost|([a-z0-9]([-a-z0-9]*[a-z0-9])?\\.)+[a-z0-9]([-a-z0-9]*[a-z0-9]))?"; - public static final String IN_DEVELOPMENT = "In development"; + // Original regexp from http://www.regular-expressions.info/email.html + public static final String EMAIL_REGEXP = "[-!#$%&\'*+/=?_`{|}~a-z0-9^]+(\\.[-!#$%&\'*+/=?_`{|}~a-z0-9^]+)*@(localhost|([a-z0-9]([-a-z0-9]*[a-z0-9])?\\.)+[a-z0-9]([-a-z0-9]*[a-z0-9]))?"; + public static final String IN_DEVELOPMENT = "In development"; - public static final String IN_DEVELOPMENT_P = " (in development)"; + public static final String IN_DEVELOPMENT_P = " (in development)"; - public static final String NUM_REGEXP = "^[0-9]+$"; + public static final String NUM_REGEXP = "^[0-9]+$"; - public static final String UNIX_NAME = "^[a-z0-9_\\-]+$"; + public static final String UNIX_NAME = "^[a-z0-9_\\-]+$"; - // Original regexp from http://snippets.dzone.com/posts/show/452 - public static final String URL_REGEXP = "((ftp|http|https|mailto):\\/\\/(\\w+:{0,1}\\w*@)?(\\S+)(:[0-9]+)?(\\/|\\/([\\w#!:.?+=&%@!\\-\\/]))?)"; + // Original regexp from http://snippets.dzone.com/posts/show/452 + public static final String URL_REGEXP = "((ftp|http|https|mailto):\\/\\/(\\w+:{0,1}\\w*@)?(\\S+)(:[0-9]+)?(\\/|\\/([\\w#!:.?+=&%@!\\-\\/]))?)"; - public static String br() { - return "<br/>"; + /** + * @see WordUtils#abbreviate + */ + public static String abbreviate(final String str, int lower, int upper, final String appendToEnd) { + // initial parameter checks + if (str == null) { + return null; } - - public static String brbr() { - return "<br/><br/>"; + if (str.length() == 0) { + return ""; } - public static String ellipsis(final String text, final int length) { - return text == null ? "" : length <= 0 ? text : text.length() > length ? text.substring(0, length - 3) + "..." - : text; + // if the lower value is greater than the length of the string, + // set to the length of the string + if (lower > str.length()) { + lower = str.length(); } + // if the upper value is -1 (i.e. no limit) or is greater + // than the length of the string, set to the length of the string + if (upper == -1 || upper > str.length()) { + upper = str.length(); + } + // if upper is less than lower, raise it to lower + if (upper < lower) { + upper = lower; + } - public static boolean empty(final String string) { - return !notEmpty(string); + final StringBuffer result = new StringBuffer(); + final int index = str.indexOf(" ", lower); + if (index == -1) { + result.append(str.substring(0, upper)); + // only if abbreviation has occured do we append the appendToEnd value + if (upper != str.length()) { + result.append(defaultString(appendToEnd)); + } + } else if (index > upper) { + result.append(str.substring(0, upper)); + result.append(defaultString(appendToEnd)); + } else { + result.append(str.substring(0, index)); + result.append(defaultString(appendToEnd)); } + return result.toString(); + } - /** - * This method escape only some dangerous html chars - * - * Try to use {@link SimpleHtmlSanitizer} better - * - */ - @Deprecated - public static String escapeHtmlLight(final String source) { - String result = source; - if (source != null) { - result = result.replaceAll("&", "&"); - result = result.replaceAll("\"", """); - // text = text.replaceAll("\'", "'"); - result = result.replaceAll("<", "<"); - result = result.replaceAll(">", ">"); - } - return result; + public static String br() { + return "<br/>"; + } + + public static String brbr() { + return "<br/><br/>"; + } + + /** + * @see WordUtils#capitalize(String, char[]) + * @return + */ + public static String capitalize(final String str, final char[] delimiters) { + final int delimLen = (delimiters == null ? -1 : delimiters.length); + if (str == null || str.length() == 0 || delimLen == 0) { + return str; } + final int strLen = str.length(); + final StringBuffer buffer = new StringBuffer(strLen); + boolean capitalizeNext = true; + for (int i = 0; i < strLen; i++) { + final char ch = str.charAt(i); - /** - * FIXME: Is this safe? Try to use {@link SimpleHtmlSanitizer} also in the - * method - * - */ - @Deprecated - public static String generateHtmlLink(final String href, final String text) { - return "<a href=\"" + href + "\" target=\"_blank\">" + text + "</a>"; + if (isDelimiter(ch, delimiters)) { + buffer.append(ch); + capitalizeNext = true; + } else if (capitalizeNext) { + // Original:in WordUtils buffer.append(Character.toTitleCase(ch)); + buffer.append(String.valueOf(ch).toUpperCase()); + capitalizeNext = false; + } else { + buffer.append(ch); + } } + return buffer.toString(); + } - public static boolean notEmpty(final String string) { - return string != null && string.length() > 0; + /** + * @see WordUtils#capitalizeFully(String) + */ + public static String capitalizeFully(String str, final char[] delimiters) { + final int delimLen = (delimiters == null ? -1 : delimiters.length); + if (str == null || str.length() == 0 || delimLen == 0) { + return str; } + str = str.toLowerCase(); + return capitalize(str, delimiters); + } - public static String removeLastSlash(final String text) { - return text.replaceFirst("/$", ""); + private static String defaultString(final String str) { + return str == null ? "" : str; + } + + public static String ellipsis(final String text, final int length) { + return text == null ? "" : length <= 0 ? text : text.length() > length ? text.substring(0, + length - 3) + "..." : text; + } + + public static boolean empty(final String string) { + return !notEmpty(string); + } + + /** + * This method escape only some dangerous html chars + * + * Try to use {@link SimpleHtmlSanitizer} better + * + */ + @Deprecated + public static String escapeHtmlLight(final String source) { + String result = source; + if (source != null) { + result = result.replaceAll("&", "&"); + result = result.replaceAll("\"", """); + // text = text.replaceAll("\'", "'"); + result = result.replaceAll("<", "<"); + result = result.replaceAll(">", ">"); } + return result; + } - public static ArrayList<String> splitTags(final String tagsString) { - final ArrayList<String> tagsList = new ArrayList<String>(); - String tagsCopy = tagsString; - // remove commas and quotes - if (tagsString == null) { - return tagsList; - } - tagsCopy = tagsCopy.replaceAll(",", " "); - tagsCopy = tagsCopy.replaceAll("\"", ""); - tagsCopy = tagsCopy.replaceAll("\'", ""); - final String[] splitted = tagsCopy.split("\\s+"); - for (String tag : splitted) { - tag = tag.replaceAll("\\s$", ""); - if (tag.length() > 0) { - tagsList.add(tag); - } - } - return tagsList; + /** + * FIXME: Is this safe? Try to use {@link SimpleHtmlSanitizer} also in the + * method + * + */ + @Deprecated + public static String generateHtmlLink(final String href, final String text) { + return "<a href=\"" + href + "\" target=\"_blank\">" + text + "</a>"; + } + + private static boolean isDelimiter(final char ch, final char[] delimiters) { + if (delimiters == null) { + throw new NotImplementedException(); + // return Character.isWhitespace(ch); } + for (final char delimiter : delimiters) { + if (ch == delimiter) { + return true; + } + } + return false; + } - /* - * This method unescape only some dangerous html chars for use in GWT Html - * widget for instance - */ - public static String unescape(final String source) { - if (source == null) { - return null; - } - String result = source; - result = result.replaceAll("&", "&"); - result = result.replaceAll(""", "\""); - result = result.replaceAll("'", "\'"); - result = result.replaceAll("<", "<"); - result = result.replaceAll(">", ">"); - return result; + public static boolean notEmpty(final String string) { + return string != null && string.length() > 0; + } + + public static String removeLastSlash(final String text) { + return text.replaceFirst("/$", ""); + } + + public static ArrayList<String> splitTags(final String tagsString) { + final ArrayList<String> tagsList = new ArrayList<String>(); + String tagsCopy = tagsString; + // remove commas and quotes + if (tagsString == null) { + return tagsList; } + tagsCopy = tagsCopy.replaceAll(",", " "); + tagsCopy = tagsCopy.replaceAll("\"", ""); + tagsCopy = tagsCopy.replaceAll("\'", ""); + final String[] splitted = tagsCopy.split("\\s+"); + for (String tag : splitted) { + tag = tag.replaceAll("\\s$", ""); + if (tag.length() > 0) { + tagsList.add(tag); + } + } + return tagsList; + } - public TextUtils() { + /* + * This method unescape only some dangerous html chars for use in GWT Html + * widget for instance + */ + public static String unescape(final String source) { + if (source == null) { + return null; } + String result = source; + result = result.replaceAll("&", "&"); + result = result.replaceAll(""", "\""); + result = result.replaceAll("'", "\'"); + result = result.replaceAll("<", "<"); + result = result.replaceAll(">", ">"); + return result; + } + public TextUtils() { + } } Modified: trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -112,7 +112,7 @@ if (subMenuDescriptor == null) { final GuiActionDescrip parent = (i == 0 ? menu : submenus.get(getSubPathId(typeId, path, i - 1))); assert parent != null; - subMenuDescriptor = new SubMenuDescriptor(parent, i18n.t(name)); + subMenuDescriptor = new SubMenuDescriptor(parent, false, i18n.t(name)); // subMenuDescriptor.setVisible(false); submenus.put(subpathId, subMenuDescriptor); actionRegistry.addAction(ActionGroups.TOOLBAR, subMenuDescriptor, typeId); @@ -158,7 +158,7 @@ public GuiActionDescrip get() { final MenuItemDescriptor menuItem = new MenuItemDescriptor(action); menuItem.withText(descrip.getDescName()).withToolTip(descrip.getDescription()); - menuItem.setParent(TextUtils.notEmpty(path) ? submenu : menu); + menuItem.setParent(TextUtils.notEmpty(path) ? submenu : menu, false); return menuItem; } }; Added: trunk/src/main/java/cc/kune/core/client/i18n/I18nConstants.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nConstants.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -0,0 +1,7 @@ +package cc.kune.core.client.i18n; + +import com.google.gwt.i18n.client.ConstantsWithLookup; + +public interface I18nConstants extends ConstantsWithLookup { + +} Added: trunk/src/main/java/cc/kune/core/client/i18n/I18nUtils.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nUtils.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUtils.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -0,0 +1,25 @@ +package cc.kune.core.client.i18n; + +import cc.kune.common.client.utils.TextUtils; + +/** + * Copied some methods from org.apache.commons.lang.WordUtils + * + */ +public class I18nUtils { + + public static String convertMethodName(final String name) { + String result = name; + result = result.replaceAll("\\[%d\\]", "N"); + result = result.replaceAll("\\[%s\\]", "Param"); + final char[] delimiters = { ' ', '.', '?', ',', ';', '&', '(', ')', '"', '$', '!', '/', '\'', '-', + '%', ':', '{', '}', '[', ']' }; + result = TextUtils.capitalizeFully(result, delimiters); + result = result.replaceAll("[ \\.\\?,;&\$\$\"\\$!\\/\\'\\-%:{}\\[\\]]", ""); + return TextUtils.abbreviate( + new StringBuffer(result.length()).append(Character.toLowerCase(result.charAt(0))).append( + result.substring(1)).toString(), 0, 100, ""); + + } + +} \ No newline at end of file Added: trunk/src/main/java/cc/kune/core/client/sitebar/SiteOptions.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SiteOptions.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SiteOptions.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -0,0 +1,7 @@ +package cc.kune.core.client.sitebar; + +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; + +public interface SiteOptions { + void addAction(GuiActionDescrip descriptor); +} Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptions.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptions.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptions.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -19,10 +19,6 @@ */ package cc.kune.core.client.sitebar; -import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +public interface SiteUserOptions extends SiteOptions { -public interface SiteUserOptions { - - void addAction(GuiActionDescrip descriptor); - } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -58,14 +58,13 @@ private final CoreResources res; private ToolbarSeparatorDescriptor separator; private final Session session; - private final SitebarActionsPresenter siteOptions; + private final SitebarActions siteOptions; private final StateManager stateManager; @Inject public SiteUserOptionsPresenter(final Session session, final StateManager stateManager, final Provider<FileDownloadUtils> downloadProvider, final I18nTranslationService i18n, - final CoreResources img, final SitebarActionsPresenter siteOptions, - final GotoGroupAction gotoGroupAction) { + final CoreResources img, final SitebarActions siteOptions, final GotoGroupAction gotoGroupAction) { super(); this.session = session; this.stateManager = stateManager; @@ -100,7 +99,6 @@ private void addActionImpl(final GuiActionDescrip descriptor) { descriptor.setParent(LOGGED_USER_MENU); - siteOptions.getRightToolbar().add(descriptor); } private void addPartipation(final GroupDTO group) { @@ -110,17 +108,14 @@ participant.putValue(Action.NAME, group.getLongName()); participant.putValue(Action.SMALL_ICON, logoImageUrl); participant.setParent(partiMenu); - siteOptions.getRightToolbar().add(participant); } private void createActions() { LOGGED_USER_MENU.setId(LOGGED_USER_MENU_ID); - LOGGED_USER_MENU.setParent(SitebarActionsPresenter.RIGHT_TOOLBAR); + LOGGED_USER_MENU.setParent(siteOptions.getRightToolbar()); LOGGED_USER_MENU.setStyles("k-no-backimage, k-btn-sitebar"); LOGGED_USER_MENU.setRightIcon(res.arrowdownsitebar()); - siteOptions.getRightToolbar().add(LOGGED_USER_MENU); - separator = new ToolbarSeparatorDescriptor(Type.separator, SitebarActionsPresenter.RIGHT_TOOLBAR); - siteOptions.getRightToolbar().add(separator); + separator = new ToolbarSeparatorDescriptor(Type.separator, siteOptions.getRightToolbar()); partiMenu = new SubMenuDescriptor(i18n.t("Your groups")); addActionImpl(partiMenu); Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActions.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActions.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActions.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -19,12 +19,12 @@ */ package cc.kune.core.client.sitebar; -import cc.kune.common.client.actions.ui.IsActionExtensible; +import cc.kune.common.client.actions.ui.descrip.ToolbarDescriptor; public interface SitebarActions { - IsActionExtensible getLeftToolbar(); + ToolbarDescriptor getLeftToolbar(); - IsActionExtensible getRightToolbar(); + ToolbarDescriptor getRightToolbar(); } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -64,10 +64,9 @@ void showErrorDialog(); } - public static final ToolbarDescriptor LEFT_TOOLBAR = new ToolbarDescriptor(); - - public static final MenuDescriptor OPTIONS_MENU = new MenuDescriptor(); - public static final ToolbarDescriptor RIGHT_TOOLBAR = new ToolbarDescriptor(); + private static final ToolbarDescriptor LEFT_TOOLBAR = new ToolbarDescriptor(); + private static final MenuDescriptor OPTIONS_MENU = new MenuDescriptor(); + private static final ToolbarDescriptor RIGHT_TOOLBAR = new ToolbarDescriptor(); public static final String SITE_OPTIONS_MENU = "kune-sop-om"; private final I18nTranslationService i18n; @@ -93,9 +92,22 @@ init(); } + private MenuItemDescriptor createGotoKune() { + final MenuItemDescriptor gotoKuneDevSite = new MenuItemDescriptor(OPTIONS_MENU, + new AbstractAction() { + @Override + public void actionPerformed(final ActionEvent event) { + KuneWindowUtils.open("http://kune.ourproject.org/"); + } + }); + gotoKuneDevSite.putValue(Action.NAME, i18n.t("kune development site")); + gotoKuneDevSite.putValue(Action.SMALL_ICON, icons.kuneIcon16()); + return gotoKuneDevSite; + } + @Override - public IsActionExtensible getLeftToolbar() { - return getView().getLeftBar(); + public ToolbarDescriptor getLeftToolbar() { + return LEFT_TOOLBAR; } public MenuDescriptor getOptionsMenu() { @@ -103,30 +115,21 @@ } @Override - public IsActionExtensible getRightToolbar() { - return getView().getRightBar(); + public ToolbarDescriptor getRightToolbar() { + return RIGHT_TOOLBAR; } private void init() { OPTIONS_MENU.withId(SITE_OPTIONS_MENU); - getView().getLeftBar().add(LEFT_TOOLBAR); - getView().getRightBar().add(RIGHT_TOOLBAR); } @ProxyEvent public void onAppStart(final AppStartEvent event) { - final IsActionExtensible right = getView().getRightBar(); OPTIONS_MENU.putValue(Action.NAME, i18n.t("Options")); OPTIONS_MENU.putValue(Action.SMALL_ICON, res.arrowdownsitebar()); - OPTIONS_MENU.setParent(RIGHT_TOOLBAR); OPTIONS_MENU.setStyles("k-no-backimage, k-btn-sitebar"); OPTIONS_MENU.putValue(AbstractGxtMenuGui.MENU_POSITION, AbstractGxtMenuGui.MenuPosition.bl); - final ToolbarSeparatorDescriptor separator = new ToolbarSeparatorDescriptor(Type.separator, - RIGHT_TOOLBAR); - final ToolbarSeparatorDescriptor separator2 = new ToolbarSeparatorDescriptor(Type.separator, - RIGHT_TOOLBAR); - final MenuSeparatorDescriptor menuSeparator = new MenuSeparatorDescriptor(OPTIONS_MENU); final AbstractExtendedAction bugsAction = new AbstractExtendedAction() { @Override public void actionPerformed(final ActionEvent event) { @@ -135,7 +138,6 @@ }; bugsAction.putValue(Action.NAME, i18n.t("Report Kune issues/problems")); bugsAction.putValue(Action.SMALL_ICON, icons.bug()); - final MenuItemDescriptor reportBugs = new MenuItemDescriptor(OPTIONS_MENU, bugsAction); final AbstractExtendedAction errorAction = new AbstractExtendedAction() { @Override @@ -157,15 +159,6 @@ KuneWindowUtils.open("http://incubator.apache.org/wave/"); } }; - final MenuItemDescriptor gotoKuneDevSite = new MenuItemDescriptor(OPTIONS_MENU, - new AbstractAction() { - @Override - public void actionPerformed(final ActionEvent event) { - KuneWindowUtils.open("http://kune.ourproject.org/"); - } - }); - gotoKuneDevSite.putValue(Action.NAME, i18n.t("kune development site")); - gotoKuneDevSite.putValue(Action.SMALL_ICON, icons.kuneIcon16()); wavePowered.putValue(Action.NAME, i18n.t("Apache Wave powered")); wavePowered.putValue(Action.SMALL_ICON, res.waveIcon()); @@ -176,18 +169,20 @@ // aboutAction.setShortcut(shortcut); // shortcutReg.put(shortcut, aboutAction); - right.add(signInLink.get()); - right.add(signOutLink.get()); - right.add(separator2); - right.add(newGroupLink.get()); - right.add(separator); - right.add(OPTIONS_MENU); - right.add(gotoKuneDevSite); - right.add(reportBugs); - right.add(new MenuItemDescriptor(OPTIONS_MENU, errorAction)); - right.add(new MenuItemDescriptor(OPTIONS_MENU, aboutAction)); - right.add(menuSeparator); - right.add(new MenuItemDescriptor(OPTIONS_MENU, wavePowered)); + signInLink.get(); + signOutLink.get(); + new ToolbarSeparatorDescriptor(Type.separator, RIGHT_TOOLBAR); + newGroupLink.get(); + new ToolbarSeparatorDescriptor(Type.separator, RIGHT_TOOLBAR); + createGotoKune(); + MenuItemDescriptor.build(OPTIONS_MENU, bugsAction); + MenuItemDescriptor.build(OPTIONS_MENU, errorAction); + MenuItemDescriptor.build(OPTIONS_MENU, aboutAction); + MenuSeparatorDescriptor.build(OPTIONS_MENU); + MenuItemDescriptor.build(OPTIONS_MENU, wavePowered); + OPTIONS_MENU.setParent(RIGHT_TOOLBAR); + getView().getLeftBar().add(LEFT_TOOLBAR); + getView().getRightBar().add(RIGHT_TOOLBAR); } @Override Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -31,28 +31,28 @@ public class SitebarNewGroupLink extends ButtonDescriptor { - public static class SitebarNewGroupAction extends AbstractExtendedAction { + public static class SitebarNewGroupAction extends AbstractExtendedAction { - private final StateManager stateManager; + private final StateManager stateManager; - @Inject - public SitebarNewGroupAction(final StateManager stateManager, final I18nTranslationService i18n) { - super(); - this.stateManager = stateManager; - putValue(Action.NAME, i18n.t("Create New Group")); - } + @Inject + public SitebarNewGroupAction(final StateManager stateManager, final I18nTranslationService i18n) { + super(); + this.stateManager = stateManager; + putValue(Action.NAME, i18n.t("Create New Group")); + } - @Override - public void actionPerformed(final ActionEvent event) { - stateManager.gotoHistoryTokenButRedirectToCurrent(SiteTokens.NEWGROUP); - } - + @Override + public void actionPerformed(final ActionEvent event) { + stateManager.gotoHistoryTokenButRedirectToCurrent(SiteTokens.NEWGROUP); } - @Inject - public SitebarNewGroupLink(final SitebarNewGroupAction action) { - super(action); - setStyles("k-no-backimage, k-btn-sitebar, k-fl, k-noborder, k-nobackcolor"); - setParent(SitebarActionsPresenter.RIGHT_TOOLBAR); - } + } + + @Inject + public SitebarNewGroupLink(final SitebarNewGroupAction action, final SitebarActions sitebarActions) { + super(action); + setStyles("k-no-backimage, k-btn-sitebar, k-fl, k-noborder, k-nobackcolor"); + setParent(sitebarActions.getRightToolbar()); + } } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -37,45 +37,46 @@ public class SitebarSignInLink extends ButtonDescriptor { - public static class SitebarSignInAction extends AbstractExtendedAction { + public static class SitebarSignInAction extends AbstractExtendedAction { - private final StateManager stateManager; + private final StateManager stateManager; - @Inject - public SitebarSignInAction(final StateManager stateManager, final I18nTranslationService i18n) { - super(); - this.stateManager = stateManager; - putValue(Action.NAME, i18n.t("Sign in to collaborate")); - } + @Inject + public SitebarSignInAction(final StateManager stateManager, final I18nTranslationService i18n) { + super(); + this.stateManager = stateManager; + putValue(Action.NAME, i18n.t("Sign in to collaborate")); + } - @Override - public void actionPerformed(final ActionEvent event) { - stateManager.gotoHistoryTokenButRedirectToCurrent(SiteTokens.SIGNIN); - } - + @Override + public void actionPerformed(final ActionEvent event) { + stateManager.gotoHistoryTokenButRedirectToCurrent(SiteTokens.SIGNIN); } - public static final String SITE_SIGN_IN = "kune-ssilp-hy"; + } - @Inject - public SitebarSignInLink(final SitebarSignInAction action, final EventBus eventBus, final Session session) { - super(action); - // setParent(SitebarActionsPresenter.RIGHT_TOOLBAR); - setId(SITE_SIGN_IN); - setVisible(!session.isLogged()); - setStyles("k-no-backimage, k-btn-sitebar, k-fl, k-noborder, k-nobackcolor"); - setParent(SitebarActionsPresenter.RIGHT_TOOLBAR); - session.onUserSignIn(true, new UserSignInHandler() { - @Override - public void onUserSignIn(final UserSignInEvent event) { - SitebarSignInLink.this.setVisible(false); - } - }); - session.onUserSignOut(true, new UserSignOutHandler() { - @Override - public void onUserSignOut(final UserSignOutEvent event) { - SitebarSignInLink.this.setVisible(true); - } - }); - } + public static final String SITE_SIGN_IN = "kune-ssilp-hy"; + + @Inject + public SitebarSignInLink(final SitebarSignInAction action, final EventBus eventBus, + final Session session, final SitebarActions sitebarActions) { + super(action); + // setParent(SitebarActionsPresenter.RIGHT_TOOLBAR); + setId(SITE_SIGN_IN); + setVisible(!session.isLogged()); + setStyles("k-no-backimage, k-btn-sitebar, k-fl, k-noborder, k-nobackcolor"); + setParent(sitebarActions.getRightToolbar()); + session.onUserSignIn(true, new UserSignInHandler() { + @Override + public void onUserSignIn(final UserSignInEvent event) { + SitebarSignInLink.this.setVisible(false); + } + }); + session.onUserSignOut(true, new UserSignOutHandler() { + @Override + public void onUserSignOut(final UserSignOutEvent event) { + SitebarSignInLink.this.setVisible(true); + } + }); + } } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -123,10 +123,10 @@ @Inject public SitebarSignOutLink(final SitebarSignOutAction action, final EventBus eventBus, - final ErrorHandler errorHandler, final Session session) { + final ErrorHandler errorHandler, final Session session, final SitebarActions sitebarActions) { super(action); setId(SITE_SIGN_OUT); - setParent(SitebarActionsPresenter.RIGHT_TOOLBAR); + setParent(sitebarActions.getRightToolbar()); setVisible(session.isLogged()); setStyles("k-no-backimage, k-btn-sitebar, k-fl, k-noborder, k-nobackcolor"); session.onUserSignIn(true, new UserSignInHandler() { Modified: trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -149,7 +149,7 @@ item.setParent(menu); } actions.add(menu); - actions.add(menuitems); + // (Not needed after setParent Recursive) actions.add(menuitems); } thumb.hideTooltip(); menu.show(thumb); Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -69,7 +69,6 @@ final IsGroupCondition isGroupCondition, final UnJoinFromCurrentGroupAction unJoinGroupAction) { OPTIONS_MENU.withToolTip(i18n.t("Options")).withIcon(res.arrowdownsitebar()).withStyles( OPTIONS_STYLES); - final GuiActionDescrip optionsTitle = new MenuTitleItemDescriptor(i18n.t("Options")).withParent(OPTIONS_MENU); final MenuRadioItemDescriptor anyoneItem = membersVisibility.get().withVisibility( SocialNetworkVisibility.anyone); final MenuRadioItemDescriptor onlyMembersItem = membersVisibility.get().withVisibility( @@ -83,17 +82,17 @@ final MenuRadioItemDescriptor openItem = membersModeration.get().withModeration(AdmissionType.Open); addImpl(OPTIONS_MENU); - addImpl(optionsTitle); - addImpl(VISIBILITY_SUBMENU.withText(i18n.t("Those who can view this member list")).withParent( - OPTIONS_MENU)); - addImpl(MODERATION_SUBMENU.withText(i18n.t("New members policy")).withParent(OPTIONS_MENU)); - addImpl(anyoneItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("anyone"))); - addImpl(onlyMembersItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only members"))); - addImpl(onlyAdminsItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only admins"))); - addImpl(moderatedItem.withParent(MODERATION_SUBMENU).withText(i18n.t("moderate request to join"))); - addImpl(openItem.withParent(MODERATION_SUBMENU).withText(i18n.t("auto accept request to join"))); - addImpl(closedItem.withParent(MODERATION_SUBMENU).withText(i18n.t("closed for new members"))); + new MenuTitleItemDescriptor(i18n.t("Options")).withParent(OPTIONS_MENU); + VISIBILITY_SUBMENU.withText(i18n.t("Those who can view this member list")).withParent(OPTIONS_MENU); + MODERATION_SUBMENU.withText(i18n.t("New members policy")).withParent(OPTIONS_MENU); + anyoneItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("anyone")); + onlyMembersItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only members")); + onlyAdminsItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only admins")); + moderatedItem.withParent(MODERATION_SUBMENU).withText(i18n.t("moderate request to join")); + openItem.withParent(MODERATION_SUBMENU).withText(i18n.t("auto accept request to join")); + closedItem.withParent(MODERATION_SUBMENU).withText(i18n.t("closed for new members")); + final ButtonDescriptor joinBtn = new ButtonDescriptor(joinGroupAction); final ButtonDescriptor unJoinBtn = new ButtonDescriptor(unJoinGroupAction); // unJoinBtn.add(isLoggedCondition); Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -69,11 +69,10 @@ assert anyoneItem.getAction() != onlyYourBuddiesItem.getAction(); assert anyoneItem.getAction() != onlyYou.getAction(); addImpl(OPTIONS_MENU); - addImpl(VISIBILITY_SUBMENU.withText(i18n.t("Those who can view your network")).withParent( - OPTIONS_MENU)); - addImpl(anyoneItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("anyone"))); - addImpl(onlyYourBuddiesItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only your buddies"))); - addImpl(onlyYou.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only you"))); + VISIBILITY_SUBMENU.withText(i18n.t("Those who can view your network")).withParent(OPTIONS_MENU); + anyoneItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("anyone")); + onlyYourBuddiesItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only your buddies")); + onlyYou.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only you")); final ButtonDescriptor addBuddieBtn = new ButtonDescriptor(addNewBuddiesAction); Copied: trunk/src/main/java/cc/kune/core/public/images/alert.gif (from rev 1445, trunk/src/main/java/org/ourproject/kune/app/public/css/img/alert.gif) =================================================================== (Binary files differ) Copied: trunk/src/main/java/cc/kune/core/public/images/arrow-down-black.gif (from rev 1445, trunk/src/main/java/org/ourproject/kune/app/public/css/img/arrow-down-black.gif) =================================================================== (Binary files differ) Copied: trunk/src/main/java/cc/kune/core/public/images/arrow-down-white.gif (from rev 1445, trunk/src/main/java/org/ourproject/kune/app/public/css/img/arrow-down-white.gif) =================================================================== (Binary files differ) Copied: trunk/src/main/java/cc/kune/core/public/images/arrow-right-black.gif (from rev 1445, trunk/src/main/java/org/ourproject/kune/app/public/css/img/arrow-right-black.gif) =================================================================== (Binary files differ) Copied: trunk/src/main/java/cc/kune/core/public/images/arrow-right-white.gif (from rev 1445, trunk/src/main/java/org/ourproject/kune/app/public/css/img/arrow-right-white.gif) =================================================================== (Binary files differ) Copied: trunk/src/main/java/cc/kune/core/public/images/colors.gif (from rev 1445, trunk/src/main/java/org/ourproject/kune/app/public/css/img/colors.gif) =================================================================== (Binary files differ) Copied: trunk/src/main/java/cc/kune/core/public/images/copyleft.png (from rev 1445, trunk/src/main/java/org/ourproject/kune/app/public/css/img/copyleft.png) =================================================================== (Binary files differ) Copied: trunk/src/main/java/cc/kune/core/public/images/emblem-system.gif (from rev 1445, trunk/src/main/java/org/ourproject/kune/app/public/css/img/emblem-system.gif) =================================================================== (Binary files differ) Copied: trunk/src/main/java/cc/kune/core/public/images/film.png (from rev 1445, trunk/src/main/java/org/ourproject/kune/app/public/css/img/film.png) =================================================================== (Binary files differ) Copied: trunk/src/main/java/cc/kune/core/public/images/info.gif (from rev 1445, trunk/src/main/java/org/ourproject/kune/app/public/css/img/info.gif) =================================================================== (Binary files differ) Copied: trunk/src/main/java/cc/kune/core/public/images/language.gif (from rev 1445, trunk/src/main/java/org/ourproject/kune/app/public/css/img/language.gif) =================================================================== (Binary files differ) Copied: trunk/src/main/java/cc/kune/core/public/images/link.gif (from rev 1445, trunk/src/main/java/org/ourproject/kune/app/public/css/img/link.gif) =================================================================== (Binary files differ) Copied: trunk/src/main/java/cc/kune/core/public/images/picture.png (from rev 1445, trunk/src/main/java/org/ourproject/kune/app/public/css/img/picture.png) =================================================================== (Binary files differ) Copied: trunk/src/main/java/cc/kune/core/public/images/specialchars.png (from rev 1445, trunk/src/main/java/org/ourproject/kune/app/public/css/img/specialchars.png) =================================================================== (Binary files differ) Copied: trunk/src/main/java/cc/kune/core/public/images/splitter-vert-bar.png (from rev 1445, trunk/src/main/java/org/ourproject/kune/app/public/css/img/splitter-vert-bar.png) =================================================================== (Binary files differ) Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-08-03 17:07:42 UTC (rev 1478) @@ -1431,4 +1431,41 @@ button.k-drop-allowed-hover, .k-drop-allowed-hover { border: dashed 2px #3a9fd6 !important; -} \ No newline at end of file +} + +.k-link-icon { + background-image: url(images/link.gif) !important; +} + +.k-options-icon { + background-image: url(images/emblem-system.gif) !important; +} + +.k-copyleft-icon { + background-image: url(images/copyleft.png) !important; +} + +.k-picture-icon { + background-image: url(images/picture.png) !important; +} + +.k-film-icon { + background-image: url(images/film.png) !important; +} + +.k-specialchars-icon { + background-image: url(images/specialchars.png) !important; +} + +.k-info-icon { + background-image: url(images/info.gif) !important; +} + +.k-newgroup-icon { + background-image: url(images/kune-icon16.png) !important; +} + +.k-colors-icon { + background-image: url(images/colors.gif) !important; +} + Modified: trunk/src/main/java/cc/kune/docs/client/DocsGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/DocsGinModule.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/docs/client/DocsGinModule.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -31,5 +31,4 @@ s(DocsClientActions.class); s(DocsFolderNewMenu.class); } - } Modified: trunk/src/main/java/cc/kune/docs/client/actions/GoParentFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/GoParentFolderBtn.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/docs/client/actions/GoParentFolderBtn.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -27,9 +27,10 @@ public class GoParentFolderBtn extends GoParentContainerBtn { - @Inject - public GoParentFolderBtn(final I18nTranslationService i18n, final GoParentContainerAction action, final CoreResources res) { - super(i18n, action, res); - } + @Inject + public GoParentFolderBtn(final I18nTranslationService i18n, final GoParentContainerAction action, + final CoreResources res) { + super(i18n, action, res); + } } Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -24,6 +24,10 @@ 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.i18n.I18nNewTranslatorPanel; +import cc.kune.gspace.client.i18n.I18nNewTranslatorPresenter; +import cc.kune.gspace.client.i18n.I18nNewTranslatorPresenter.I18nNewTranslatorView; +import cc.kune.gspace.client.i18n.SiteOptionsI18nTranslatorAction; import cc.kune.gspace.client.licensewizard.LicenseChangeAction; import cc.kune.gspace.client.licensewizard.LicenseWizard; import cc.kune.gspace.client.licensewizard.LicenseWizardPanel; @@ -169,5 +173,10 @@ s(LicenseWizardTrdFormView.class, LicenseWizardTrdForm.class); s(LicenseWizardFrdFormView.class, LicenseWizardFrdForm.class); s(LicenseChangeAction.class); + + // I18nTranslator + s(I18nNewTranslatorView.class, I18nNewTranslatorPanel.class); + s(I18nNewTranslatorPresenter.class); + s(SiteOptionsI18nTranslatorAction.class); } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -23,6 +23,7 @@ import cc.kune.core.client.init.AppStartEvent.AppStartHandler; import cc.kune.core.client.sitebar.search.SitebarSearchPresenter; import cc.kune.core.client.state.Session; +import cc.kune.gspace.client.i18n.SiteOptionsI18nTranslatorAction; import cc.kune.gspace.client.options.GroupOptions; import cc.kune.gspace.client.options.GroupOptionsCollection; import cc.kune.gspace.client.options.UserOptions; @@ -59,7 +60,8 @@ final Provider<GroupOptStyle> gps, final Provider<GroupOptLogo> gl, final Provider<GroupOptTools> gtc, final Provider<UserOptDefLicense> udl, final Provider<UserOptStyle> ups, final Provider<UserOptLogo> ul, - final Provider<UserOptTools> utc, final Provider<SitebarSearchPresenter> siteSearch) { + final Provider<UserOptTools> utc, final Provider<SitebarSearchPresenter> siteSearch, + final Provider<SiteOptionsI18nTranslatorAction> transAction) { session.onAppStart(true, new AppStartHandler() { @Override @@ -85,6 +87,9 @@ // Init go.get(); uo.get(); + + // i18n + transAction.get(); } }); } Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerMenuItem.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerMenuItem.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -93,7 +93,7 @@ final ImageResource icon, final String title, final String tooltip, final String newName, final String id, final @Nonnull MenuDescriptor parent) { super(action); - setParent(parent); + setParent(parent, false); // The name given to this new content action.putValue(NEW_NAME, newName); action.putValue(ID, id); Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContentMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/NewContentMenuItem.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContentMenuItem.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -93,7 +93,7 @@ public NewContentMenuItem(final I18nTranslationService i18n, final NewContentAction action, final ImageResource icon, final GlobalShortcutRegister shorcutReg, final String title, final String tooltip, final String newName, final String id, @Nonnull final MenuDescriptor parent) { - super(parent, action); + super(parent, false, action); // The name given to this new content action.putValue(NEW_NAME, newName); action.putValue(ID, id); Modified: trunk/src/main/java/cc/kune/gspace/client/actions/RefreshContentMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/RefreshContentMenuItem.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/gspace/client/actions/RefreshContentMenuItem.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -30,27 +30,27 @@ public class RefreshContentMenuItem extends MenuItemDescriptor { - public static class GoParentContainerAction extends AbstractExtendedAction { + public static class GoParentContainerAction extends AbstractExtendedAction { - private final StateManager stateManager; + private final StateManager stateManager; - @Inject - public GoParentContainerAction(final StateManager stateManager) { - this.stateManager = stateManager; - } - - @Override - public void actionPerformed(final ActionEvent event) { - stateManager.refreshCurrentStateWithoutCache(); - } - + @Inject + public GoParentContainerAction(final StateManager stateManager) { + this.stateManager = stateManager; } - @Inject - public RefreshContentMenuItem(final I18nTranslationService i18n, final GoParentContainerAction action, - final ContentViewerOptionsMenu optionsMenu, final NavResources res) { - super(action); - this.withText(i18n.t("Reload current page")).withIcon(res.refresh()).withParent(optionsMenu); + @Override + public void actionPerformed(final ActionEvent event) { + stateManager.refreshCurrentStateWithoutCache(); } + } + + @Inject + public RefreshContentMenuItem(final I18nTranslationService i18n, final GoParentContainerAction action, + final ContentViewerOptionsMenu optionsMenu, final NavResources res) { + super(action); + this.withText(i18n.t("Reload current page")).withIcon(res.refresh()).withParent(optionsMenu, false); + } + } Added: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nNewTranslatorPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nNewTranslatorPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nNewTranslatorPanel.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -0,0 +1,33 @@ +package cc.kune.gspace.client.i18n; + + +import cc.kune.common.client.notify.NotifyLevelImages; +import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.i18n.I18nNewTranslatorPresenter.I18nNewTranslatorView; + +import com.google.inject.Inject; + +public class I18nNewTranslatorPanel extends AbstractTabbedDialogPanel implements I18nNewTranslatorView { + + private static final int HEIGHT = 400; + private static final String TRANSLATOR_ERROR_ID = "i18n-trans-panel-error"; + private static final String TRANSLATOR_PANEL_ID = "i18n-trans-panel"; + private static final int WIDTH = 270; + + @Inject + public I18nNewTranslatorPanel(final I18nTranslationService i18n, final NotifyLevelImages images, + final TranslatorTabsCollection transGroup) { + super(TRANSLATOR_PANEL_ID, "", WIDTH, HEIGHT + 80, false, images, TRANSLATOR_ERROR_ID, + i18n.t("Close"), null, null, null, transGroup); + super.setIconCls("k-options-icon"); + super.setTitle(i18n.t("Help to translate kune")); + } + + @Override + public void hideTranslatorAndIcon() { + // TODO Auto-generated method stub + + } + +} Added: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nNewTranslatorPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nNewTranslatorPresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nNewTranslatorPresenter.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -0,0 +1,37 @@ +package cc.kune.gspace.client.i18n; + + +import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialog; +import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; + +import com.google.inject.Inject; + +public class I18nNewTranslatorPresenter extends AbstractTabbedDialogPresenter implements + AbstractTabbedDialog, I18nTranslator { + + public interface I18nNewTranslatorView extends AbstractTabbedDialogView { + + @Override + void hide(); + + void hideTranslatorAndIcon(); + + @Override + void show(); + } + private I18nNewTranslatorView view; + + @Inject + public I18nNewTranslatorPresenter() { + } + + @Override + public void doShowTranslator() { + view.show(); + } + + public void init(final I18nNewTranslatorView view) { + super.init(view); + this.view = view; + } +} Copied: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslator.java (from rev 1445, trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslator.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslator.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslator.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -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.i18n; + +public interface I18nTranslator { + + void doShowTranslator(); + +} Copied: trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorPanel.java (from rev 1445, trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPanel.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorPanel.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -0,0 +1,141 @@ +/* + * + * 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.i18n; + +import cc.kune.common.client.utils.SimpleCallback; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.I18nLanguageSimpleDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +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.extjs.gxt.ui.client.widget.form.FormPanel; +import com.google.inject.Inject; + +public class LanguageSelectorPanel extends FormPanel { + + @SuppressWarnings("serial") + public class LanguageData extends BaseModel { + + private static final String CODE = "code"; + private static final String ENGLISH_NAME = "englishName"; + + public LanguageData(final String code, final String englishName) { + set(CODE, code); + set(ENGLISH_NAME, englishName); + } + + public String getCode() { + return get(CODE); + } + + public String getEnglishName() { + return get(ENGLISH_NAME); + } + } + + public static final String LANG_FIELD = "k-langsp-lf"; + + private final I18nTranslationService i18n; + private ComboBox<LanguageData> langCombo; + private final Session session; + + @Inject + public LanguageSelectorPanel(final I18nTranslationService i18n, final Session session) { + super(); + this.i18n = i18n; + this.session = session; + setBorders(false); + createLangCombo(); + super.add(langCombo); + } + + public void addChangeListener(final SimpleCallback onChange) { + langCombo.addListener(Events.Select, new Listener<BaseEvent>() { + @Override + public void handleEvent(final BaseEvent be) { + onChange.onCallback(); + } + }); + } + + private void createLangCombo() { + // Field.setMsgTarget("side"); + langCombo = new ComboBox<LanguageData>(); + langCombo.setName(LANG_FIELD); + langCombo.setMinChars(1); + // langCombo.setMode(ComboBox.LOCAL); + langCombo.setStore(createStore()); + langCombo.setDisplayField("language"); + langCombo.setTriggerAction(TriggerAction.ALL); + langCombo.setEmptyText(i18n.t("Enter language")); + langCombo.setLoadingText(i18n.t("Searching...")); + langCombo.setDisplayField(LanguageData.ENGLISH_NAME); + langCombo.setValueField(LanguageData.CODE); + langCombo.setTypeAhead(true); + langCombo.setTypeAheadDelay(1000); + langCombo.setSelectOnFocus(false); + langCombo.setWidth(140); + langCombo.setPageSize(7); + langCombo.setForceSelection(true); + langCombo.setAllowBlank(false); + } + + private ListStore<LanguageData> createStore() { + final ListStore<LanguageData> list = new ListStore<LanguageData>(); + + for (final I18nLanguageSimpleDTO lang : session.getLanguages()) { + list.add(new LanguageData(lang.getCode(), lang.getEnglishName())); + } + return list; + } + + public String getLanguageCode() { + return langCombo.getValue().getCode(); + } + + public String getLanguageEnglishName() { + return langCombo.getValue().getEnglishName(); + } + + @Override + public void reset() { + langCombo.reset(); + } + + public void setLangTitle(final String langFieldTitle) { + if (langFieldTitle == null) { + setHideLabels(true); + } else { + if (langFieldTitle != null) { + langCombo.setFieldLabel(langFieldTitle); + } + } + } + + public void setLanguage(final String languageCode) { + langCombo.setRawValue(languageCode); + } +} Copied: trunk/src/main/java/cc/kune/gspace/client/i18n/SiteOptionsI18nTranslatorAction.java (from rev 1445, trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/SiteOptionsI18nTranslatorAction.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/SiteOptionsI18nTranslatorAction.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -0,0 +1,62 @@ +/* + * + * 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.i18n; + +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.Action; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.sitebar.SitebarActionsPresenter; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; +import com.google.inject.Provider; +import com.google.inject.Singleton; + +@Singleton +public class SiteOptionsI18nTranslatorAction extends AbstractExtendedAction { + private I18nTranslator translator; + private final Provider<I18nNewTranslatorPanel> translatorPanel; + private final Provider<I18nNewTranslatorPresenter> translatorPresenter; + + @Inject + public SiteOptionsI18nTranslatorAction(final I18nTranslationService i18n, final CoreResources img, + final Provider<I18nNewTranslatorPresenter> translatorPresenter, + final Provider<I18nNewTranslatorPanel> translatorPanel, final SitebarActionsPresenter siteOptions) { + super(); + this.translatorPresenter = translatorPresenter; + this.translatorPanel = translatorPanel; + putValue(Action.NAME, i18n.t("Help with the translation")); + putValue(Action.SMALL_ICON, img.language()); + final MenuItemDescriptor item = new MenuItemDescriptor(siteOptions.getOptionsMenu(), this); + // item.setPosition(1); + } + + @Override + public void actionPerformed(final ActionEvent event) { + if (translator == null) { + final I18nNewTranslatorPresenter presenter = translatorPresenter.get(); + presenter.init(translatorPanel.get()); + translator = presenter; + } + translator.doShowTranslator(); + } +} Added: trunk/src/main/java/cc/kune/gspace/client/i18n/TranslatorTabsCollection.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/TranslatorTabsCollection.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/TranslatorTabsCollection.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -0,0 +1,29 @@ +/* + * + * 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.i18n; + +import cc.kune.common.client.ProvidersCollection; + +import com.google.inject.Singleton; + +@SuppressWarnings("serial") +@Singleton +public class TranslatorTabsCollection extends ProvidersCollection { +} Modified: trunk/src/main/java/cc/kune/gspace/client/options/EntityOptions.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/EntityOptions.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/gspace/client/options/EntityOptions.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -19,22 +19,12 @@ */ package cc.kune.gspace.client.options; -import cc.kune.common.client.notify.NotifyLevel; import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialog; import com.google.gwt.user.client.ui.IsWidget; public interface EntityOptions extends AbstractTabbedDialog { - public IsWidget getView(); + public IsWidget getView(); - @Override - public void hideMessages(); - - @Override - public void setErrorMessage(String message, NotifyLevel level); - - @Override - public void show(); - } Modified: trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -19,7 +19,7 @@ */ package cc.kune.gspace.client.options; -import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogView; +import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter.AbstractTabbedDialogView; public interface EntityOptionsView extends AbstractTabbedDialogView { Modified: trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -26,9 +26,6 @@ import cc.kune.core.client.ws.entheader.EntityHeader; 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.user.client.ui.Widget; import com.google.inject.Inject; public class GroupOptionsPanel extends AbstractTabbedDialogPanel implements GroupOptionsView { @@ -36,15 +33,13 @@ public static final String GROUP_OP_PANEL_ID = "k-gop-diagpan"; public static final String GROUP_OPTIONS_ERROR_ID = "k-gop-err-mess"; private final EntityHeader entityHeader; - private final GroupOptionsCollection entityPreferencesGroup; @Inject public GroupOptionsPanel(final EntityHeader entityHeader, final I18nTranslationService i18n, final NotifyLevelImages images, final GroupOptionsCollection entityOptionsGroup) { super(GROUP_OP_PANEL_ID, "", WIDTH, HEIGHT + 80, false, images, GROUP_OPTIONS_ERROR_ID, - i18n.t("Close"), null, null, null); + i18n.t("Close"), null, null, null, entityOptionsGroup); this.entityHeader = entityHeader; - this.entityPreferencesGroup = entityOptionsGroup; super.setIconCls("k-options-icon"); super.setTitle(i18n.t(CoreMessages.GROUP_OPTIONS_DIALOG_TITLE)); } @@ -54,24 +49,4 @@ entityHeader.addAction(descriptor); } - @Override - public Widget asWidget() { - return super.getWidget(); - } - - @Override - public void createAndShow() { - createAndShowItImpl(); - } - - private void createAndShowItImpl() { - super.getFirstBtn().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - hide(); - } - }); - entityPreferencesGroup.createAll(); - super.createAndShow(); - } } Modified: trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -25,9 +25,7 @@ import cc.kune.core.client.ws.entheader.EntityHeader; 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.user.client.ui.Widget; +import com.google.gwt.event.shared.HandlerRegistration; import com.google.inject.Inject; public class UserOptionsPanel extends AbstractTabbedDialogPanel implements UserOptionsView { @@ -35,36 +33,17 @@ public static final String USER_OP_PANEL_ID = "k-uop-diagpan"; public static final String USER_OPTIONS_ERROR_ID = "k-uop-err-mess"; + private HandlerRegistration addClickHandler; private final UserOptionsCollection userPreferencesGroup; @Inject public UserOptionsPanel(final EntityHeader entityHeader, final I18nTranslationService i18n, final NotifyLevelImages images, final UserOptionsCollection userOptionsGroup) { super(USER_OP_PANEL_ID, "", WIDTH, HEIGHT + 80, false, images, USER_OPTIONS_ERROR_ID, - i18n.t("Close"), null, null, null); + i18n.t("Close"), null, null, null, userOptionsGroup); this.userPreferencesGroup = userOptionsGroup; super.setIconCls("k-options-icon"); super.setTitle(i18n.t(CoreMessages.USER_OPTIONS_DIALOG_TITLE)); } - @Override - public Widget asWidget() { - return super.getWidget(); - } - - @Override - public void createAndShow() { - createAndShowItImpl(); - } - - private void createAndShowItImpl() { - super.getFirstBtn().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - hide(); - } - }); - userPreferencesGroup.createAll(); - super.createAndShow(); - } } Modified: trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -61,7 +61,9 @@ init(view); } - private void createActions() { + private void init(final UserOptionsView view) { + super.init(view); + this.view = view; final AbstractExtendedAction userPrefsAction = new AbstractExtendedAction() { @Override @@ -78,10 +80,4 @@ prefsItem.setPosition(1); userOptions.addAction(prefsItem); } - - private void init(final UserOptionsView view) { - super.init(view); - this.view = view; - createActions(); - } } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPresenter.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPresenter.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -22,6 +22,8 @@ import javax.annotation.Nonnull; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.HasChilds; import cc.kune.common.client.errors.UIException; import cc.kune.common.client.ui.EditEvent; import cc.kune.common.client.ui.EditEvent.EditHandler; @@ -188,6 +190,14 @@ } final GuiActionDescCollection actions = actionsRegistry.getCurrentActions(stateContent.getGroup(), stateContent.getTypeId(), session.isLogged(), rights, ActionGroups.TOOLBAR); - getView().setActions(actions); + final GuiActionDescCollection actionsToAttach = new GuiActionDescCollection(); + for (final GuiActionDescrip action : actions) { + // The previous actionsRegistry creates childs actions already via + // Provider.get() + if (action instanceof HasChilds) { + actionsToAttach.add(action); + } + } + getView().setActions(actionsToAttach); } } \ No newline at end of file Modified: trunk/src/main/java/com/example/client/HelloWorldActions.java =================================================================== --- trunk/src/main/java/com/example/client/HelloWorldActions.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/com/example/client/HelloWorldActions.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -13,45 +13,44 @@ public class HelloWorldActions { - public class HelloWorldAction extends AbstractExtendedAction { + public class HelloWorldAction extends AbstractExtendedAction { - @Override - public void actionPerformed(final ActionEvent event) { - NotifyUser.info("Hello world!"); - } - + @Override + public void actionPerformed(final ActionEvent event) { + NotifyUser.info("Hello world!"); } - @Inject - public HelloWorldActions(final CoreResources coreResources, final SitebarActions sitebarActions, - final SiteUserOptions siteUserOptions) { + } - // We can share the action if we don't want to create several (and for - // instance it doesn't store any value) - final HelloWorldAction sharedAction = new HelloWorldAction(); + @Inject + public HelloWorldActions(final CoreResources coreResources, final SitebarActions sitebarActions, + final SiteUserOptions siteUserOptions) { - // An action in the sitebar - final ButtonDescriptor siteBarBtn = new ButtonDescriptor(sharedAction); - siteBarBtn.withText("HWorld!").withIcon(coreResources.info()); - // FIXME setParent as in siteUsOp - sitebarActions.getLeftToolbar().add(siteBarBtn); + // We can share the action if we don't want to create several (and for + // instance it doesn't store any value) + final HelloWorldAction sharedAction = new HelloWorldAction(); - // Other action in the sitebar options menu + // An action in the sitebar + final ButtonDescriptor siteBarBtn = new ButtonDescriptor(sharedAction); + siteBarBtn.withText("HWorld!").withIcon(coreResources.info()); + siteBarBtn.setParent(sitebarActions.getLeftToolbar()); - // An action in the user options menu - final MenuItemDescriptor menuItem = new MenuItemDescriptor(sharedAction); - menuItem.withText("HWorld!").withIcon(coreResources.alert()); - siteUserOptions.addAction(menuItem); + // Other action in the sitebar options menu - // Another action in the SocialNet menu + // An action in the user options menu + final MenuItemDescriptor menuItem = new MenuItemDescriptor(sharedAction); + menuItem.withText("HWorld!").withIcon(coreResources.alert()); + siteUserOptions.addAction(menuItem); - // Something added directly in the Skeleton (esto en el Panel) + // Another action in the SocialNet menu - // IMPORTANT: If you want to add something in a part a don't find how, - // please ask! Maybe we need a extension point or we need to document - // better + // Something added directly in the Skeleton (esto en el Panel) - // Do something with Chat + // IMPORTANT: If you want to add something in a part a don't find how, + // please ask! Maybe we need a extension point or we need to document + // better - } + // Do something with Chat + + } } Deleted: trunk/src/main/java/org/ourproject/kune/app/public/css/img/alert.gif =================================================================== (Binary files differ) Deleted: trunk/src/main/java/org/ourproject/kune/app/public/css/img/arrow-down-black.gif =================================================================== (Binary files differ) Deleted: trunk/src/main/java/org/ourproject/kune/app/public/css/img/arrow-down-white.gif =================================================================== (Binary files differ) Deleted: trunk/src/main/java/org/ourproject/kune/app/public/css/img/arrow-right-black.gif =================================================================== (Binary files differ) Deleted: trunk/src/main/java/org/ourproject/kune/app/public/css/img/arrow-right-white.gif =================================================================== (Binary files differ) Deleted: trunk/src/main/java/org/ourproject/kune/app/public/css/img/colors.gif =================================================================== (Binary files differ) Deleted: trunk/src/main/java/org/ourproject/kune/app/public/css/img/copyleft.png =================================================================== (Binary files differ) Deleted: trunk/src/main/java/org/ourproject/kune/app/public/css/img/emblem-system.gif =================================================================== (Binary files differ) Deleted: trunk/src/main/java/org/ourproject/kune/app/public/css/img/film.png =================================================================== (Binary files differ) Deleted: trunk/src/main/java/org/ourproject/kune/app/public/css/img/info.gif =================================================================== (Binary files differ) Deleted: trunk/src/main/java/org/ourproject/kune/app/public/css/img/language.gif =================================================================== (Binary files differ) Deleted: trunk/src/main/java/org/ourproject/kune/app/public/css/img/link.gif =================================================================== (Binary files differ) Deleted: trunk/src/main/java/org/ourproject/kune/app/public/css/img/picture.png =================================================================== (Binary files differ) Deleted: trunk/src/main/java/org/ourproject/kune/app/public/css/img/specialchars.png =================================================================== (Binary files differ) Deleted: trunk/src/main/java/org/ourproject/kune/app/public/css/img/splitter-vert-bar.png =================================================================== (Binary files differ) Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractSearcherPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractSearcherPanel.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractSearcherPanel.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -19,67 +19,129 @@ */ package org.ourproject.kune.platf.client.ui; +import java.util.Map; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.gwtext.client.core.Connection; -import com.gwtext.client.core.UrlParam; -import com.gwtext.client.data.FieldDef; -import com.gwtext.client.data.HttpProxy; -import com.gwtext.client.data.JsonReader; -import com.gwtext.client.data.RecordDef; -import com.gwtext.client.data.Store; -import com.gwtext.client.widgets.PagingToolbar; -import com.gwtext.client.widgets.grid.GridPanel; -import com.gwtext.client.widgets.grid.RowSelectionModel; +import com.extjs.gxt.ui.client.data.BaseListLoader; +import com.extjs.gxt.ui.client.data.BasePagingLoadConfig; +import com.extjs.gxt.ui.client.data.HttpProxy; +import com.extjs.gxt.ui.client.data.JsonLoadResultReader; +import com.extjs.gxt.ui.client.data.ListLoadResult; +import com.extjs.gxt.ui.client.data.ModelData; +import com.extjs.gxt.ui.client.data.ModelType; +import com.extjs.gxt.ui.client.data.PagingLoadConfig; +import com.extjs.gxt.ui.client.event.Events; +import com.extjs.gxt.ui.client.event.GridEvent; +import com.extjs.gxt.ui.client.event.Listener; +import com.extjs.gxt.ui.client.store.ListStore; +import com.extjs.gxt.ui.client.store.Store; +import com.extjs.gxt.ui.client.store.StoreFilter; +import com.extjs.gxt.ui.client.widget.grid.Grid; +import com.extjs.gxt.ui.client.widget.grid.GridSelectionModel; +import com.extjs.gxt.ui.client.widget.toolbar.PagingToolBar; +import com.extjs.gxt.ui.client.widget.toolbar.PagingToolBar.PagingToolBarMessages; +import com.google.gwt.core.client.GWT; +import com.google.gwt.http.client.RequestBuilder; public class AbstractSearcherPanel { - protected static final int PAGINATION_SIZE = 10; - protected final I18nTranslationService i18n; + protected static final int PAGINATION_SIZE = 10; + protected final I18nTranslationService i18n; - public AbstractSearcherPanel(final I18nTranslationService i18n) { - this.i18n = i18n; - } + public AbstractSearcherPanel(final I18nTranslationService i18n) { + this.i18n = i18n; + } - protected void createPagingToolbar(final Store store, final GridPanel grid) { - final PagingToolbar pag = new PagingToolbar(store); - pag.setPageSize(PAGINATION_SIZE); - pag.setDisplayInfo(true); - pag.setDisplayMsg(i18n.tWithNT("Displaying results {0} - {1} of {2}", "Respect {} values in translations. " - + "This will produce: 'Displaying results 1 - 25 of 95465' for instance")); - pag.setEmptyMsg(i18n.t("No results to display")); - pag.setAfterPageText(i18n.tWithNT("of {0}", "Used to show multiple results: '1 of 30'")); - pag.setBeforePageText(i18n.t("Page")); - pag.setFirstText(i18n.t("First Page")); - pag.setLastText(i18n.t("Last Page")); - pag.setNextText(i18n.t("Next Page")); - pag.setPrevText(i18n.t("Previous Page")); - pag.setRefreshText(i18n.t("Refresh")); - grid.setBottomToolbar(pag); - grid.setLoadMask(true); - grid.setLoadMask(i18n.t("Searching")); - grid.setSelectionModel(new RowSelectionModel()); - grid.setBorder(false); - grid.setFrame(true); - grid.setStripeRows(true); - } + protected void createPagingToolbar(final Store store, final Grid grid) { + final PagingToolBar pag = new PagingToolBar(PAGINATION_SIZE); + final PagingToolBarMessages msgs = new PagingToolBarMessages(); - protected Store createStore(final FieldDef[] fieldDefs, final String url, final String id) { - final JsonReader reader = new JsonReader(new RecordDef(fieldDefs)); - reader.setRoot("list"); - reader.setTotalProperty("size"); - reader.setId(id); - final HttpProxy proxy = new HttpProxy(url, Connection.POST); - return new Store(proxy, reader, true); - } + msgs.setDisplayMsg(i18n.tWithNT("Displaying results {0} - {1} of {2}", + "Respect {} values in translations. " + + "This will produce: 'Displaying results 1 - 25 of 95465' for instance")); + msgs.setEmptyMsg(i18n.t("No results to display")); + msgs.setFirstText(i18n.t("First Page")); + msgs.setAfterPageText(i18n.tWithNT("of {0}", "Used to show multiple results: '1 of 30'")); + msgs.setBeforePageText(i18n.t("Page")); + msgs.setLastText(i18n.t("Last Page")); + msgs.setNextText(i18n.t("Next Page")); + msgs.setPrevText(i18n.t("Previous Page")); + msgs.setRefreshText(i18n.t("Refresh")); + pag.setMessages(msgs); + // pag.setStore(store); + // pag.setDisplayInfo(true); + // grid.setBottomToolbar(pag); + grid.setLoadMask(true); + // grid.setLoadMask(i18n.t("Searching")); + grid.setSelectionModel(new GridSelectionModel()); + grid.setBorders(false); + // grid.setFrame(true); + grid.setStripeRows(true); + } - protected void query(final Store store, final GridPanel grid, final String query) { - final UrlParam[] newParams = new UrlParam[] { new UrlParam("query", query) }; - store.setBaseParams(newParams); - store.load(0, PAGINATION_SIZE); - // see bind/unbind in: - // http://groups.google.com/group/gwt-ext/browse_thread/thread/ae0badb8114b30c… - } + protected Store createStore(final ModelType type, final String url, final String id, final Grid grid) { + final String path = GWT.getHostPageBaseURL() + url; + // use a http proxy to get the data + final RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, path); + final HttpProxy<String> proxy = new HttpProxy<String>(builder); + + // need a loader, proxy, and reader + final JsonLoadResultReader<ListLoadResult<ModelData>> reader = new JsonLoadResultReader<ListLoadResult<ModelData>>( + type); + + final BaseListLoader<ListLoadResult<ModelData>> loader = new BaseListLoader<ListLoadResult<ModelData>>( + proxy, reader); + loader.setRemoteSort(true); + + final ListStore<ModelData> store = new ListStore<ModelData>(loader); + grid.addListener(Events.Attach, new Listener<GridEvent<ModelData>>() { + @Override + public void handleEvent(final GridEvent<ModelData> be) { + final PagingLoadConfig config = new BasePagingLoadConfig(); + config.setOffset(0); + config.setLimit(PAGINATION_SIZE); + + final Map<String, Object> state = grid.getState(); + if (state.containsKey("offset")) { + final int offset = (Integer) state.get("offset"); + final int limit = (Integer) state.get("limit"); + config.setOffset(offset); + config.setLimit(limit); + } + // if (state.containsKey("sortField")) { + // config.setSortField((String) state.get("sortField")); + // config.setSortDir(SortDir.valueOf((String) state.get("sortDir"))); + // } + loader.load(config); + } + }); + + // this goes to Model... + // reader.setRoot("list"); + // reader.setTotalProperty("size"); + // reader.setId(id); + // final HttpProxy proxy = new HttpProxy(url, Connection.POST); + // return new Store(proxy, reader, true); + + return store; + } + + protected void query(final Store store, final Grid grid, final String query) { + // final UrlParam[] newParams = new UrlParam[] { new UrlParam("query", + // query) }; + // store.setBaseParams(newParams); + // store.load(0, PAGINATION_SIZE); + store.clearFilters(); + store.addFilter(new StoreFilter<ModelData>() { + @Override + public boolean select(final Store<ModelData> store, final ModelData parent, final ModelData item, + final String property) { + // TODO Auto-generated method stub + return false; + } + }); + } + } Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslator.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslator.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslator.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -1,26 +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.i18n; - -public interface I18nTranslator { - - void doShowTranslator(); - -} Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -22,14 +22,16 @@ import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.platf.client.ui.AbstractSearcherPanel; import org.ourproject.kune.platf.client.ui.dialogs.BasicDialog; -import org.ourproject.kune.platf.client.ui.noti.OldNotifyUser; import org.ourproject.kune.workspace.client.search.SiteBottomTrayButton; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.client.utils.SimpleCallback; import cc.kune.common.client.utils.TextUtils; import cc.kune.core.shared.SearcherConstants; import cc.kune.core.shared.dto.I18nLanguageDTO; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.i18n.LanguageSelectorPanel; import com.google.gwt.user.client.ui.Frame; import com.google.gwt.user.client.ui.HorizontalPanel; @@ -48,9 +50,7 @@ import com.gwtext.client.widgets.Window; import com.gwtext.client.widgets.event.ButtonListenerAdapter; import com.gwtext.client.widgets.event.WindowListenerAdapter; -import com.gwtext.client.widgets.form.ComboBox; import com.gwtext.client.widgets.form.TextField; -import com.gwtext.client.widgets.form.event.ComboBoxListenerAdapter; import com.gwtext.client.widgets.grid.CellMetadata; import com.gwtext.client.widgets.grid.ColumnConfig; import com.gwtext.client.widgets.grid.ColumnModel; @@ -65,264 +65,272 @@ public class I18nTranslatorPanel extends AbstractSearcherPanel implements I18nTranslatorView { - public static final String TRANSLATOR_DIALOG = "k-i18n-trans"; - private Window dialog; - private final I18nTranslatorPresenter presenter; - private LanguageSelectorPanel languageSelectorPanel; - private Store unTransStore; - private Store transStore; - private GridPanel transGrid; - private GridPanel unTransGrid; - private final LanguageSelector languageSelector; - private final WorkspaceSkeleton ws; - private SiteBottomTrayButton traybarButton; - private final Images img; + public static final String TRANSLATOR_DIALOG = "k-i18n-trans"; + private Window dialog; + private final Images img; + private final LanguageSelectorPanel languageSelector; + private LanguageSelectorPanel languageSelectorPanel; + private final I18nTranslatorPresenter presenter; + private GridPanel transGrid; + private Store transStore; + private SiteBottomTrayButton traybarButton; + private GridPanel unTransGrid; + private Store unTransStore; + private final WorkspaceSkeleton ws; - public I18nTranslatorPanel(final I18nTranslatorPresenter initPresenter, final I18nTranslationService i18n, - final LanguageSelector languageSelector, final WorkspaceSkeleton ws, final Images img) { - super(i18n); - this.presenter = initPresenter; - this.languageSelector = languageSelector; - this.ws = ws; - this.img = img; - } + public I18nTranslatorPanel(final I18nTranslatorPresenter initPresenter, + final I18nTranslationService i18n, final LanguageSelectorPanel languageSelector, + final WorkspaceSkeleton ws, final Images img) { + super(i18n); + this.presenter = initPresenter; + this.languageSelector = languageSelector; + this.ws = ws; + this.img = img; + } - public void close() { - dialog.hide(); - } + @Override + public void close() { + dialog.hide(); + } - public void hide() { - dialog.hide(); - } + private Window createDialog() { + final Panel north = new Panel(); + north.setBorder(false); - public void hideTranslatorAndIcon() { - if (dialog.isRendered()) { - dialog.hide(); - } - if (traybarButton != null) { - traybarButton.destroy(); - traybarButton = null; - } - } + final Panel center = new TabPanel(); + center.setAutoScroll(false); + center.setClosable(false); + center.setBorder(false); - public void show() { - if (dialog == null) { - dialog = createDialog(); - } - // By default we use the user lang to help in translation - final I18nLanguageDTO lang = presenter.getLanguage(); - setLanguage(lang); - final String languageNativeNameIfAvailable = lang.getNativeName().length() > 0 ? lang.getNativeName() - : lang.getEnglishName(); - dialog.setTitle(i18n.t("Help to translate kune to [%s]", languageNativeNameIfAvailable)); - dialog.show(); - dialog.expand(); - dialog.center(); - if (traybarButton == null) { - traybarButton = new SiteBottomTrayButton("images/language.gif", i18n.t("Show/hide translator"), dialog, ws); - } - } + final Window dialog = new BasicDialog(TRANSLATOR_DIALOG, "", false, false, 620, 330); + // dialog.setResizable(false); + dialog.setIconCls("i18n-icon"); - private Window createDialog() { - final Panel north = new Panel(); - north.setBorder(false); + final Button close = new Button(); + close.setText(i18n.tWithNT("Close", "used in button")); + close.addListener(new ButtonListenerAdapter() { + @Override + public void onClick(final Button button, final EventObject e) { + presenter.doClose(); + } + }); + dialog.addButton(close); - final Panel center = new TabPanel(); - center.setAutoScroll(false); - center.setClosable(false); - center.setBorder(false); + final Panel unTransCenterPanel = new Panel(i18n.t("Untranslated")); + unTransCenterPanel.setAutoScroll(false); + unTransCenterPanel.setLayout(new FitLayout()); - final Window dialog = new BasicDialog(TRANSLATOR_DIALOG, "", false, false, 620, 330); - // dialog.setResizable(false); - dialog.setIconCls("i18n-icon"); + final Panel transCenterPanel = new Panel(i18n.t("Translated")); + transCenterPanel.setAutoScroll(false); + transCenterPanel.setLayout(new FitLayout()); - final Button close = new Button(); - close.setText(i18n.tWithNT("Close", "used in button")); - close.addListener(new ButtonListenerAdapter() { - @Override - public void onClick(final Button button, final EventObject e) { - presenter.doClose(); - } - }); - dialog.addButton(close); + final Panel recommendationPanel = new Panel(i18n.t("Recommendations")); + recommendationPanel.setAutoScroll(true); + recommendationPanel.setLayout(new FitLayout()); - final Panel unTransCenterPanel = new Panel(i18n.t("Untranslated")); - unTransCenterPanel.setAutoScroll(false); - unTransCenterPanel.setLayout(new FitLayout()); + transGrid = createGridPanel(true); + unTransGrid = createGridPanel(false); + final HorizontalPanel hp = new HorizontalPanel(); + languageSelectorPanel.addChangeListener(new SimpleCallback() { + @Override + public void onCallback() { + setLanguage(languageSelectorPanel.getLanguageCode()); + dialog.setTitle(i18n.t("Help to translate kune to [%s]", + languageSelectorPanel.getLanguageEnglishName())); + } + }); + hp.add(languageSelectorPanel); + hp.addStyleName("kune-Margin-Large-trbl"); + north.add(hp); - final Panel transCenterPanel = new Panel(i18n.t("Translated")); - transCenterPanel.setAutoScroll(false); - transCenterPanel.setLayout(new FitLayout()); + unTransCenterPanel.add(unTransGrid); + transCenterPanel.add(transGrid); + final Frame recommFrame = new Frame("html/i18n-recom.html"); + recommFrame.setHeight("auto"); + recommendationPanel.add(recommFrame); - final Panel recommendationPanel = new Panel(i18n.t("Recommendations")); - recommendationPanel.setAutoScroll(true); - recommendationPanel.setLayout(new FitLayout()); + center.add(unTransCenterPanel); + center.add(transCenterPanel); + center.add(recommendationPanel); + dialog.add(north, new BorderLayoutData(RegionPosition.NORTH)); + dialog.add(center, new BorderLayoutData(RegionPosition.CENTER)); - transGrid = createGridPanel(true); - unTransGrid = createGridPanel(false); - final HorizontalPanel hp = new HorizontalPanel(); - languageSelectorPanel = (LanguageSelectorPanel) languageSelector.getView(); - languageSelectorPanel.addChangeListener(new ComboBoxListenerAdapter() { - @Override - public void onSelect(final ComboBox comboBox, final Record record, final int index) { - setLanguage(record.getAsString(LanguageSelectorPanel.LANG_ID)); - dialog.setTitle(i18n.t("Help to translate kune to [%s]", record.getAsString("language"))); - } - }); - hp.add(languageSelectorPanel); - hp.addStyleName("kune-Margin-Large-trbl"); - north.add(hp); + center.setActiveItemID(unTransCenterPanel.getId()); + dialog.addListener(new WindowListenerAdapter() { + private void checkPosition(final BoxComponent component, final int x, final int y) { + if (y < 0) { + component.setPagePosition(x, 0); + } + } - unTransCenterPanel.add(unTransGrid); - transCenterPanel.add(transGrid); - final Frame recommFrame = new Frame("html/i18n-recom.html"); - recommFrame.setHeight("auto"); - recommendationPanel.add(recommFrame); + @Override + public void onMove(final BoxComponent component, final int x, final int y) { + checkPosition(component, x, y); + } - center.add(unTransCenterPanel); - center.add(transCenterPanel); - center.add(recommendationPanel); - dialog.add(north, new BorderLayoutData(RegionPosition.NORTH)); - dialog.add(center, new BorderLayoutData(RegionPosition.CENTER)); + @Override + public void onShow(final Component component) { + checkPosition(dialog, component.getAbsoluteLeft(), component.getAbsoluteTop()); + } + }); + return dialog; + } - center.setActiveItemID(unTransCenterPanel.getId()); - dialog.addListener(new WindowListenerAdapter() { - @Override - public void onMove(final BoxComponent component, final int x, final int y) { - checkPosition(component, x, y); - } + private GridPanel createGridPanel(final boolean translated) { - @Override - public void onShow(final Component component) { - checkPosition(dialog, component.getAbsoluteLeft(), component.getAbsoluteTop()); - } + final Renderer renderNT = new Renderer() { + @Override + public String render(final Object value, final CellMetadata cellMetadata, final Record record, + final int rowIndex, final int colNum, final Store store) { + String renderer; + final String[] splitted = splitNT((String) value); + if (splitted.length > 1) { + renderer = "{0} " + img.nt().getHTML(); + final String tip = "<div style='min-width: 75px'>" + splitted[1] + "</div>"; + cellMetadata.setHtmlAttribute("ext:qtip=\"" + tip + "\" ext:qtitle=\"Note for translators\""); + } else { + renderer = "{0}"; + } + return Format.format(renderer, splitted); + } + }; - private void checkPosition(final BoxComponent component, final int x, final int y) { - if (y < 0) { - component.setPagePosition(x, 0); - } - } - }); - return dialog; + Store store; + final String id = "id"; + final FieldDef[] fieldDefs = new FieldDef[] { new StringFieldDef("trKey"), + new StringFieldDef("text"), new StringFieldDef(id) }; + + if (translated) { + final String url = SearcherConstants.I18N_JSON_SERVICE_TRANSLATED; + // transStore = createStore(fieldDefs, url, id); + store = transStore; + } else { + final String url = SearcherConstants.I18N_JSON_SERVICE; + // unTransStore = createStore(fieldDefs, url, id); + store = unTransStore; } - private GridPanel createGridPanel(final boolean translated) { + final ColumnConfig trKeyColumn = new ColumnConfig() { + { + setHeader(i18n.t("Text to translate")); + setDataIndex("trKey"); + setWidth(285); + setTooltip(i18n.t("Click to sort")); + setRenderer(renderNT); + } + }; - final Renderer renderNT = new Renderer() { - public String render(final Object value, final CellMetadata cellMetadata, final Record record, - final int rowIndex, final int colNum, final Store store) { - String renderer; - final String[] splitted = splitNT((String) value); - if (splitted.length > 1) { - renderer = "{0} " + img.nt().getHTML(); - final String tip = "<div style='min-width: 75px'>" + splitted[1] + "</div>"; - cellMetadata.setHtmlAttribute("ext:qtip=\"" + tip + "\" ext:qtitle=\"Note for translators\""); - } else { - renderer = "{0}"; - } - return Format.format(renderer, splitted); - } - }; + final GridEditor textColumnEditor = new GridEditor(new TextField()); - Store store; - final String id = "id"; - final FieldDef[] fieldDefs = new FieldDef[] { new StringFieldDef("trKey"), new StringFieldDef("text"), - new StringFieldDef(id) }; + final ColumnConfig textColumn = new ColumnConfig() { + { + setHeader(i18n.t("Translation (click to edit)")); + setDataIndex("text"); + setWidth(285); + setEditor(textColumnEditor); + } + }; - if (translated) { - final String url = SearcherConstants.I18N_JSON_SERVICE_TRANSLATED; - transStore = createStore(fieldDefs, url, id); - store = transStore; - } else { - final String url = SearcherConstants.I18N_JSON_SERVICE; - unTransStore = createStore(fieldDefs, url, id); - store = unTransStore; - } + final ColumnModel columnModel = new ColumnModel(new ColumnConfig[] { trKeyColumn, textColumn }); - final ColumnConfig trKeyColumn = new ColumnConfig() { - { - setHeader(i18n.t("Text to translate")); - setDataIndex("trKey"); - setWidth(285); - setTooltip(i18n.t("Click to sort")); - setRenderer(renderNT); - } - }; + columnModel.setDefaultSortable(true); - final GridEditor textColumnEditor = new GridEditor(new TextField()); + final EditorGridPanel grid = new EditorGridPanel((translated ? "grid-translated" + : "grid-untranslated"), 595, 180, store, columnModel); + // createPagingToolbar(store, grid); - final ColumnConfig textColumn = new ColumnConfig() { - { - setHeader(i18n.t("Translation (click to edit)")); - setDataIndex("text"); - setWidth(285); - setEditor(textColumnEditor); - } - }; + grid.setClicksToEdit(1); - final ColumnModel columnModel = new ColumnModel(new ColumnConfig[] { trKeyColumn, textColumn }); + grid.addEditorGridListener(new EditorGridListenerAdapter() { + @Override + public void onAfterEdit(final GridPanel grid, final Record record, final String field, + final Object newValue, final Object oldValue, final int rowIndex, final int colIndex) { + final String idValue = record.getAsString(id); + final String trKey = record.getAsString("trKey"); + presenter.doTranslation(idValue, trKey, (String) newValue); + record.set(field, TextUtils.escapeHtmlLight((String) newValue)); + } + }); - columnModel.setDefaultSortable(true); + grid.addGridCellListener(new GridCellListenerAdapter() { + @Override + public void onCellDblClick(final GridPanel grid, final int rowIndex, final int colIndex, + final EventObject e) { + final Record record = unTransStore.getRecordAt(rowIndex); + final String idValue = record.getAsString(id); + final String trKey = record.getAsString("trKey"); + final String text = record.getAsString("text"); + if (text == null || text.length() == 0) { + final String trWithoutNT = removeNT(trKey); + record.set("text", trWithoutNT); + presenter.doTranslation(idValue, trKey, trWithoutNT); + } + } + }); - final EditorGridPanel grid = new EditorGridPanel((translated ? "grid-translated" : "grid-untranslated"), 595, - 180, store, columnModel); - createPagingToolbar(store, grid); + return grid; + } - grid.setClicksToEdit(1); + @Override + public void hide() { + dialog.hide(); + } - grid.addEditorGridListener(new EditorGridListenerAdapter() { - @Override - public void onAfterEdit(final GridPanel grid, final Record record, final String field, - final Object newValue, final Object oldValue, final int rowIndex, final int colIndex) { - final String idValue = record.getAsString(id); - final String trKey = record.getAsString("trKey"); - presenter.doTranslation(idValue, trKey, (String) newValue); - record.set(field, TextUtils.escapeHtmlLight((String) newValue)); - } - }); + @Override + public void hideTranslatorAndIcon() { + if (dialog.isRendered()) { + dialog.hide(); + } + if (traybarButton != null) { + traybarButton.destroy(); + traybarButton = null; + } + } - grid.addGridCellListener(new GridCellListenerAdapter() { - @Override - public void onCellDblClick(final GridPanel grid, final int rowIndex, final int colIndex, final EventObject e) { - final Record record = unTransStore.getRecordAt(rowIndex); - final String idValue = record.getAsString(id); - final String trKey = record.getAsString("trKey"); - final String text = record.getAsString("text"); - if (text == null || text.length() == 0) { - final String trWithoutNT = removeNT(trKey); - record.set("text", trWithoutNT); - presenter.doTranslation(idValue, trKey, trWithoutNT); - } - } - }); + private String removeNT(final String string) { + return i18n.removeNT(string); + } - return grid; - } + private void setLanguage(final I18nLanguageDTO language) { + languageSelectorPanel.setLanguage(language.getCode()); + setLanguage(language.getCode()); + } - private String removeNT(final String string) { - return i18n.removeNT(string); - } + private void setLanguage(final String language) { + NotifyUser.showProgressLoading(); + // query(unTransStore, unTransGrid, language); + // query(transStore, transGrid, language); + NotifyUser.hideProgress(); + } - private void setLanguage(final I18nLanguageDTO language) { - languageSelectorPanel.setLanguage(language.getCode()); - setLanguage(language.getCode()); + @Override + public void show() { + if (dialog == null) { + dialog = createDialog(); } - - private void setLanguage(final String language) { - OldNotifyUser.showProgressLoading(); - query(unTransStore, unTransGrid, language); - query(transStore, transGrid, language); - OldNotifyUser.hideProgress(); + // By default we use the user lang to help in translation + final I18nLanguageDTO lang = presenter.getLanguage(); + setLanguage(lang); + final String languageNativeNameIfAvailable = lang.getNativeName().length() > 0 ? lang.getNativeName() + : lang.getEnglishName(); + dialog.setTitle(i18n.t("Help to translate kune to [%s]", languageNativeNameIfAvailable)); + dialog.show(); + dialog.expand(); + dialog.center(); + if (traybarButton == null) { + traybarButton = new SiteBottomTrayButton("images/language.gif", i18n.t("Show/hide translator"), + dialog, ws); } + } - private String[] splitNT(final String textWithNT) { - String[] nt; - final String[] splitted = textWithNT.split(" \\[%NT "); - if (splitted.length > 1) { - nt = splitted[1].split("\\]$"); - splitted[1] = nt[0]; - } - return splitted; + private String[] splitNT(final String textWithNT) { + String[] nt; + final String[] splitted = textWithNT.split(" \\[%NT "); + if (splitted.length > 1) { + nt = splitted[1].split("\\]$"); + splitted[1] = nt[0]; } + return splitted; + } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPresenter.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPresenter.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -26,6 +26,7 @@ import cc.kune.core.client.rpcservices.I18nServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.shared.dto.I18nLanguageDTO; +import cc.kune.gspace.client.i18n.I18nTranslator; import com.calclab.suco.client.events.Listener0; import com.google.gwt.user.client.rpc.AsyncCallback; Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelector.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelector.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelector.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -1,34 +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.i18n; - -import org.ourproject.kune.platf.client.View; - -import cc.kune.core.shared.dto.I18nLanguageDTO; - -public interface LanguageSelector { - - String getSelectedLanguage(); - - View getView(); - - void setLanguage(I18nLanguageDTO language); - -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPanel.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPanel.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -1,104 +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.i18n; - - -import cc.kune.core.shared.i18n.I18nTranslationService; - -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.Field; -import com.gwtext.client.widgets.form.FormPanel; -import com.gwtext.client.widgets.form.event.ComboBoxListener; - -public class LanguageSelectorPanel extends FormPanel implements LanguageSelectorView { - - public static final String LANG_ID = "abbr"; - public static final String LANG_FIELD = "k-langsp-lf"; - - private ComboBox langCombo; - private final LanguageSelectorPresenter presenter; - private final I18nTranslationService i18n; - - public LanguageSelectorPanel(final LanguageSelectorPresenter presenter, final I18nTranslationService i18n) { - this(presenter, null, i18n); - } - - public LanguageSelectorPanel(final LanguageSelectorPresenter presenter, final String langFieldTitle, - final I18nTranslationService i18n) { - super(); - this.i18n = i18n; - super.setBorder(false); - if (langFieldTitle == null) { - setHideLabels(true); - } - this.presenter = presenter; - createLangCombo(langFieldTitle); - super.add(langCombo); - } - - public void addChangeListener(final ComboBoxListener listener) { - langCombo.addListener(listener); - } - - public String getLanguage() { - return langCombo.getValueAsString(); - } - - public void reset() { - langCombo.reset(); - } - - public void setLanguage(final String languageCode) { - langCombo.setValue(languageCode); - } - - private void createLangCombo(final String langFieldTitle) { - final Store langStore = new SimpleStore(new String[] { LANG_ID, "language" }, getLanguages()); - langStore.load(); - - Field.setMsgTarget("side"); - langCombo = new ComboBox(); - langCombo.setName(LANG_FIELD); - langCombo.setMinChars(1); - if (langFieldTitle != null) { - langCombo.setFieldLabel(langFieldTitle); - } - langCombo.setStore(langStore); - langCombo.setDisplayField("language"); - langCombo.setMode(ComboBox.LOCAL); - langCombo.setTriggerAction(ComboBox.ALL); - langCombo.setEmptyText(i18n.t("Enter language")); - langCombo.setLoadingText(i18n.t("Searching...")); - langCombo.setTypeAhead(true); - langCombo.setTypeAheadDelay(1000); - langCombo.setSelectOnFocus(false); - langCombo.setWidth(140); - langCombo.setValueField(LANG_ID); - langCombo.setPageSize(7); - langCombo.setForceSelection(true); - langCombo.setAllowBlank(false); - } - - private Object[][] getLanguages() { - return presenter.getLanguages(); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPresenter.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPresenter.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -1,55 +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.i18n; - -import org.ourproject.kune.platf.client.View; - -import cc.kune.core.client.state.Session; -import cc.kune.core.shared.dto.I18nLanguageDTO; - -public class LanguageSelectorPresenter implements LanguageSelector { - - private LanguageSelectorView view; - private final Session session; - - public LanguageSelectorPresenter(final Session session) { - this.session = session; - } - - public Object[][] getLanguages() { - return session.getLanguagesArray(); - } - - public String getSelectedLanguage() { - return view.getLanguage(); - } - - public View getView() { - return view; - } - - public void init(final LanguageSelectorView view) { - this.view = view; - } - - public void setLanguage(final I18nLanguageDTO language) { - view.setLanguage(language.getCode()); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorView.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorView.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -1,32 +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.i18n; - -import org.ourproject.kune.platf.client.View; - -public interface LanguageSelectorView extends View { - - void reset(); - - String getLanguage(); - - void setLanguage(String code); - -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -1,51 +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.i18n; - -import org.ourproject.kune.platf.client.actions.Action; -import org.ourproject.kune.platf.client.actions.ActionEvent; -import org.ourproject.kune.platf.client.actions.OldAbstractAction; -import org.ourproject.kune.platf.client.actions.ui.OldMenuItemDescriptor; - -import cc.kune.core.client.resources.icons.IconResources; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.ioc.Provider; - -public class SiteOptionsI18nTranslatorAction extends OldAbstractAction { - private final Provider<I18nTranslator> translator; - - public SiteOptionsI18nTranslatorAction(final I18nTranslationService i18n, final IconResources img, - final Provider<I18nTranslator> translator) { - super(); - this.translator = translator; - putValue(Action.NAME, i18n.t("Help with the translation")); - putValue(Action.SMALL_ICON, img.language()); - final OldMenuItemDescriptor item = new OldMenuItemDescriptor(this); - item.setPosition(1); - // siteOptions.addAction(item); - } - - @Override - public void actionPerformed(final ActionEvent event) { - translator.get().doShowTranslator(); - } - -} Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java 2011-07-29 21:04:15 UTC (rev 1477) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -24,7 +24,6 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import cc.kune.common.client.errors.UIException; -import cc.kune.core.shared.SearcherConstants; import cc.kune.core.shared.i18n.I18nTranslationService; import com.allen_sauer.gwt.log.client.Log; @@ -59,239 +58,249 @@ public class SiteSearcherPanel extends AbstractSearcherPanel implements SiteSearcherView { - public static final String SITE_SEARCHER_DIALOG = "k-site-searcher-dialog"; - private final Window dialog; - private final SiteSearcherPresenter presenter; - private Store groupStore; - private TextField searchField; - private Store contentStore; - private GridPanel groupsGrid; - private GridPanel contentGrid; - private final WorkspaceSkeleton ws; - private SiteBottomTrayButton traybarButton; + public static final String SITE_SEARCHER_DIALOG = "k-site-searcher-dialog"; + private GridPanel contentGrid; + private Store contentStore; + private final Window dialog; + private GridPanel groupsGrid; + private Store groupStore; + private final SiteSearcherPresenter presenter; + private TextField searchField; + private SiteBottomTrayButton traybarButton; + private final WorkspaceSkeleton ws; - public SiteSearcherPanel(final SiteSearcherPresenter initPresenter, final I18nTranslationService i18n, - final WorkspaceSkeleton ws) { - super(i18n); - this.presenter = initPresenter; - this.ws = ws; - dialog = createDialog(); - } + public SiteSearcherPanel(final SiteSearcherPresenter initPresenter, final I18nTranslationService i18n, + final WorkspaceSkeleton ws) { + super(i18n); + this.presenter = initPresenter; + this.ws = ws; + dialog = createDialog(); + } - public String getTextToSearch() { - return searchField.getValueAsString(); - } + private Window createDialog() { + final Panel north = new Panel(); + north.setHeight(50); + north.setBorder(false); - public void hide() { - dialog.hide(); - } + final TabPanel centerPanel = new TabPanel(); + centerPanel.setActiveTab(0); + centerPanel.setAutoScroll(true); + centerPanel.setClosable(false); + centerPanel.setBorder(false); - public void search(final String text, final SiteSearcherType type) { - searchField.setValue(text); - switch (type) { - case group_user: - query(groupStore, groupsGrid, text); - break; - case content: - query(contentStore, contentGrid, text); - break; - default: - break; - } - } + final BasicDialog dialog = new BasicDialog(SITE_SEARCHER_DIALOG, i18n.t("Search"), false, false, + 500, 400); + // dialog.setResizable(false); + dialog.setIconCls("search-icon"); + final Button closeButton = new Button(i18n.tWithNT("Close", "used in button")); + closeButton.addListener(new ButtonListenerAdapter() { + @Override + public void onClick(final Button button, final EventObject e) { + presenter.doClose(); + } + }); + dialog.addButton(closeButton); - public void setTextToSearch(final String text) { - searchField.setValue(text); - } + final Panel searchPanel = createSearchForm(presenter); + final Panel groupsPanel = new Panel("Groups & Users"); + final Panel contentPanel = new Panel("Content"); + groupsPanel.setLayout(new FitLayout()); + contentPanel.setLayout(new FitLayout()); - public void show() { - dialog.show(); - dialog.expand(); - dialog.center(); - if (traybarButton == null) { - traybarButton = new SiteBottomTrayButton("images/kune-search-ico-push.gif", - i18n.t("Show/hide search engine"), dialog, ws); - } - } + groupsGrid = createSearchPanel(SiteSearcherType.group_user); + contentGrid = createSearchPanel(SiteSearcherType.content); + groupsPanel.add(groupsGrid); + contentPanel.add(contentGrid); + centerPanel.add(groupsPanel); + centerPanel.add(contentPanel); + dialog.add(searchPanel, new BorderLayoutData(RegionPosition.NORTH)); + dialog.add(centerPanel, new BorderLayoutData(RegionPosition.CENTER)); - private Window createDialog() { - final Panel north = new Panel(); - north.setHeight(50); - north.setBorder(false); + groupsPanel.addListener(new PanelListenerAdapter() { + @Override + public void onActivate(final Panel panel) { + dialog.setTitle(i18n.t("Search users and groups")); + presenter.doSearch(SiteSearcherType.group_user); + } + }); - final TabPanel centerPanel = new TabPanel(); - centerPanel.setActiveTab(0); - centerPanel.setAutoScroll(true); - centerPanel.setClosable(false); - centerPanel.setBorder(false); + contentPanel.addListener(new PanelListenerAdapter() { + @Override + public void onActivate(final Panel panel) { + dialog.setTitle(i18n.t("Search contents")); + presenter.doSearch(SiteSearcherType.content); + } + }); - final BasicDialog dialog = new BasicDialog(SITE_SEARCHER_DIALOG, i18n.t("Search"), false, false, 500, 400); - // dialog.setResizable(false); - dialog.setIconCls("search-icon"); - final Button closeButton = new Button(i18n.tWithNT("Close", "used in button")); - closeButton.addListener(new ButtonListenerAdapter() { - @Override - public void onClick(final Button button, final EventObject e) { - presenter.doClose(); - } - }); - dialog.addButton(closeButton); + final String panelId = groupsPanel.getId(); + centerPanel.setActiveItemID(panelId); - final Panel searchPanel = createSearchForm(presenter); - final Panel groupsPanel = new Panel("Groups & Users"); - final Panel contentPanel = new Panel("Content"); - groupsPanel.setLayout(new FitLayout()); - contentPanel.setLayout(new FitLayout()); + dialog.setCloseAction(Window.HIDE); + dialog.addListener(new WindowListenerAdapter() { + private void checkPosition(final BoxComponent component, final int x, final int y) { + if (y < 0) { + component.setPagePosition(x, 0); + } + } - groupsGrid = createSearchPanel(SiteSearcherType.group_user); - contentGrid = createSearchPanel(SiteSearcherType.content); - groupsPanel.add(groupsGrid); - contentPanel.add(contentGrid); - centerPanel.add(groupsPanel); - centerPanel.add(contentPanel); - dialog.add(searchPanel, new BorderLayoutData(RegionPosition.NORTH)); - dialog.add(centerPanel, new BorderLayoutData(RegionPosition.CENTER)); + @Override + public void onMove(final BoxComponent component, final int x, final int y) { + checkPosition(component, x, y); + } - groupsPanel.addListener(new PanelListenerAdapter() { - @Override - public void onActivate(final Panel panel) { - dialog.setTitle(i18n.t("Search users and groups")); - presenter.doSearch(SiteSearcherType.group_user); - } - }); + @Override + public void onShow(final Component component) { + checkPosition(dialog, component.getAbsoluteLeft(), component.getAbsoluteTop()); + } + }); + return dialog; + } - contentPanel.addListener(new PanelListenerAdapter() { - @Override - public void onActivate(final Panel panel) { - dialog.setTitle(i18n.t("Search contents")); - presenter.doSearch(SiteSearcherType.content); - } - }); + private Panel createSearchForm(final SiteSearcherPresenter presenter) { + final Panel searchPanel = new Panel(); + searchPanel.setBorder(false); - final String panelId = groupsPanel.getId(); - centerPanel.setActiveItemID(panelId); + final HorizontalPanel hp = new HorizontalPanel(); - dialog.setCloseAction(Window.HIDE); - dialog.addListener(new WindowListenerAdapter() { - @Override - public void onMove(final BoxComponent component, final int x, final int y) { - checkPosition(component, x, y); - } + final FormPanel form = new FormPanel(); + form.setBorder(false); + form.setWidth(330); + form.setHideLabels(true); - @Override - public void onShow(final Component component) { - checkPosition(dialog, component.getAbsoluteLeft(), component.getAbsoluteTop()); - } + searchField = new TextField(); + searchField.setWidth(300); + searchField.addListener(new FieldListenerAdapter() { - private void checkPosition(final BoxComponent component, final int x, final int y) { - if (y < 0) { - component.setPagePosition(x, 0); - } - } - }); - return dialog; - } + @Override + public void onSpecialKey(final Field field, final EventObject event) { + if (event.getKey() == KeyCodes.KEY_ENTER) { + presenter.doSearch(field.getValueAsString()); + } + event.stopEvent(); + } - private Panel createSearchForm(final SiteSearcherPresenter presenter) { - final Panel searchPanel = new Panel(); - searchPanel.setBorder(false); + }); + form.add(searchField); - final HorizontalPanel hp = new HorizontalPanel(); + final Button searchBtn = new Button(i18n.tWithNT("Search", "used in button")); + searchBtn.addListener(new ButtonListenerAdapter() { + @Override + public void onClick(final Button button, final EventObject e) { + presenter.doSearch(searchField.getValueAsString()); + } + }); + hp.add(form); + hp.add(searchBtn); + hp.setSpacing(7); + hp.addStyleName("kune-Margin-Large-trbl"); + searchPanel.add(hp); + return searchPanel; + } - final FormPanel form = new FormPanel(); - form.setBorder(false); - form.setWidth(330); - form.setHideLabels(true); + private GridPanel createSearchPanel(final SiteSearcherType type) { + final String id = "shortName"; + final FieldDef[] fieldDefs = new FieldDef[] { new StringFieldDef(id), + new StringFieldDef("longName"), new StringFieldDef("link"), new StringFieldDef("iconUrl") }; + final Store store; - searchField = new TextField(); - searchField.setWidth(300); - searchField.addListener(new FieldListenerAdapter() { + switch (type) { + case group_user: + store = groupStore = null; // createStore(fieldDefs, + // SearcherConstants.GROUP_DATA_PROXY_URL, id); + break; + case content: + store = contentStore = null; // createStore(fieldDefs, + // SearcherConstants.CONTENT_DATA_PROXY_URL, + // id); + break; + default: + throw new UIException("Unknown type of search"); + } - @Override - public void onSpecialKey(final Field field, final EventObject event) { - if (event.getKey() == KeyCodes.KEY_ENTER) { - presenter.doSearch(field.getValueAsString()); - } - event.stopEvent(); - } + final ColumnModel columnModel = new ColumnModel(new ColumnConfig[] { new ColumnConfig() { + { + setDataIndex(id); + setWidth(100); + } + }, new ColumnConfig() { + { + setDataIndex("longName"); + setWidth(350); + } + } }); - }); - form.add(searchField); + // columnModel.setDefaultSortable(true); - final Button searchBtn = new Button(i18n.tWithNT("Search", "used in button")); - searchBtn.addListener(new ButtonListenerAdapter() { - @Override - public void onClick(final Button button, final EventObject e) { - presenter.doSearch(searchField.getValueAsString()); - } - }); - hp.add(form); - hp.add(searchBtn); - hp.setSpacing(7); - hp.addStyleName("kune-Margin-Large-trbl"); - searchPanel.add(hp); - return searchPanel; - } + final String gridName = type == SiteSearcherType.group_user ? "group-search" : "content-search"; - private GridPanel createSearchPanel(final SiteSearcherType type) { - final String id = "shortName"; - final FieldDef[] fieldDefs = new FieldDef[] { new StringFieldDef(id), new StringFieldDef("longName"), - new StringFieldDef("link"), new StringFieldDef("iconUrl") }; - final Store store; + final GridPanel grid = new GridPanel(gridName, 474, 250, store, columnModel); - switch (type) { - case group_user: - store = groupStore = createStore(fieldDefs, SearcherConstants.GROUP_DATA_PROXY_URL, id); - break; - case content: - store = contentStore = createStore(fieldDefs, SearcherConstants.CONTENT_DATA_PROXY_URL, id); - break; - default: - throw new UIException("Unknown type of search"); - } + // createPagingToolbar(store, grid); + grid.setHideColumnHeader(true); + final GridView view = new GridView(); + view.setForceFit(true); + view.setEmptyText(i18n.t("No results")); + grid.setView(view); - final ColumnModel columnModel = new ColumnModel(new ColumnConfig[] { new ColumnConfig() { - { - setDataIndex(id); - setWidth(100); - } - }, new ColumnConfig() { - { - setDataIndex("longName"); - setWidth(350); - } - } }); + grid.addListener(new PanelListenerAdapter() { + @Override + public void onRender(final Component component) { + Log.debug("Loading store"); + store.load(0, PAGINATION_SIZE); + } + }); - // columnModel.setDefaultSortable(true); + grid.addGridCellListener(new GridCellListenerAdapter() { + @Override + public void onCellClick(final GridPanel grid, final int rowIndex, final int colindex, + final EventObject e) { + final Record record = store.getRecordAt(rowIndex); + final String groupShortName = record.getAsString(id); + presenter.doGoto(groupShortName); + } + }); - final String gridName = type == SiteSearcherType.group_user ? "group-search" : "content-search"; + return grid; + } - final GridPanel grid = new GridPanel(gridName, 474, 250, store, columnModel); + @Override + public String getTextToSearch() { + return searchField.getValueAsString(); + } - createPagingToolbar(store, grid); - grid.setHideColumnHeader(true); - final GridView view = new GridView(); - view.setForceFit(true); - view.setEmptyText(i18n.t("No results")); - grid.setView(view); + @Override + public void hide() { + dialog.hide(); + } - grid.addListener(new PanelListenerAdapter() { - @Override - public void onRender(final Component component) { - Log.debug("Loading store"); - store.load(0, PAGINATION_SIZE); - } - }); + @Override + public void search(final String text, final SiteSearcherType type) { + searchField.setValue(text); + switch (type) { + case group_user: + // query(groupStore, groupsGrid, text); + break; + case content: + // query(contentStore, contentGrid, text); + break; + default: + break; + } + } - grid.addGridCellListener(new GridCellListenerAdapter() { - @Override - public void onCellClick(final GridPanel grid, final int rowIndex, final int colindex, final EventObject e) { - final Record record = store.getRecordAt(rowIndex); - final String groupShortName = record.getAsString(id); - presenter.doGoto(groupShortName); - } - }); + @Override + public void setTextToSearch(final String text) { + searchField.setValue(text); + } - return grid; + @Override + public void show() { + dialog.show(); + dialog.expand(); + dialog.center(); + if (traybarButton == null) { + traybarButton = new SiteBottomTrayButton("images/kune-search-ico-push.gif", + i18n.t("Show/hide search engine"), dialog, ws); } + } } Added: trunk/src/main/resources/ConstantsTest_en.properties =================================================================== --- trunk/src/main/resources/ConstantsTest_en.properties (rev 0) +++ trunk/src/main/resources/ConstantsTest_en.properties 2011-08-03 17:07:42 UTC (rev 1478) @@ -0,0 +1,7 @@ +areYouSure = Are you Sure? +pleaseConfirm = Please confirm! +somethingNotTranslated = Something not translated +someMultipleLines = \ +some \ +multiple \ +lines \ No newline at end of file Added: trunk/src/main/resources/ConstantsTest_es.properties =================================================================== --- trunk/src/main/resources/ConstantsTest_es.properties (rev 0) +++ trunk/src/main/resources/ConstantsTest_es.properties 2011-08-03 17:07:42 UTC (rev 1478) @@ -0,0 +1,2 @@ +areYouSure = �Est�s seguro? +pleaseConfirm = �Por favor confirma! \ No newline at end of file Added: trunk/src/test/java/cc/kune/core/client/i18n/ConstantsTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/client/i18n/ConstantsTest.java (rev 0) +++ trunk/src/test/java/cc/kune/core/client/i18n/ConstantsTest.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -0,0 +1,54 @@ +package cc.kune.core.client.i18n; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.testng.AssertJUnit.assertEquals; + +import java.util.Locale; +import java.util.MissingResourceException; +import java.util.ResourceBundle; + +import org.junit.Before; +import org.junit.Test; + +public class ConstantsTest { + private ResourceBundle english; + private ResourceBundle spanish; + + @Test + public void basicEnglishFound() { + assertEquals("Are you Sure?", english.getString(I18nUtils.convertMethodName("Are you Sure?"))); + } + + @Test(expected = MissingResourceException.class) + public void basicEnglishNotFound() { + english.getString(I18nUtils.convertMethodName("Other thing")); + } + + @Test + public void basicFound() { + assertEquals("¡Por favor confirma!", + spanish.getString(I18nUtils.convertMethodName("Please confirm!"))); + } + + @Test(expected = MissingResourceException.class) + public void basicNotFound() { + assertTrue(english.containsKey(I18nUtils.convertMethodName("Something not translated"))); + assertFalse(spanish.containsKey(I18nUtils.convertMethodName("Something not translated"))); + assertEquals("Something not translated", + spanish.getString(I18nUtils.convertMethodName("Something not translated"))); + } + + @Before + public void before() { + english = ResourceBundle.getBundle("ConstantsTest", Locale.ENGLISH); + spanish = ResourceBundle.getBundle("ConstantsTest", new Locale("es")); + Locale.setDefault(Locale.ENGLISH); + } + + @Test + public void multipleLines() { + assertEquals("some multiple lines", + english.getString(I18nUtils.convertMethodName("some multiple lines"))); + } +} Added: trunk/src/test/java/cc/kune/core/client/i18n/I18nUtilsTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/client/i18n/I18nUtilsTest.java (rev 0) +++ trunk/src/test/java/cc/kune/core/client/i18n/I18nUtilsTest.java 2011-08-03 17:07:42 UTC (rev 1478) @@ -0,0 +1,39 @@ +package cc.kune.core.client.i18n; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class I18nUtilsTest { + + @Test + public void basicLongMessage() { + assertEquals( + "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789", + I18nUtils.convertMethodName("0123456789 0123456789 0123456789 0123456789 0123456789 0123456789 0123456789 0123456789 0123456789 0123456789 0123456789 ")); + } + + @Test + public void basicMultipleReservedChars() { + assertEquals("yesOrNoMaybe", I18nUtils.convertMethodName("Yes, or; & no? maybe")); + assertEquals("yesOrNoMaybe", I18nUtils.convertMethodName("Yes, or; & no? (maybe)")); + assertEquals("yesOrNoMaybeGiveSomeAnyPerCent", + I18nUtils.convertMethodName("Yes, or; & no?! (maybe): 'give' \"some/any\" % per-cent")); + } + + @Test + public void basicTests() { + assertEquals("yesOrNo", I18nUtils.convertMethodName("yes, or & no?")); + } + + @Test + public void testParams() { + assertEquals("nOfParamItems", I18nUtils.convertMethodName("[%d] of [%s] items")); + assertEquals("nOfNItems", I18nUtils.convertMethodName("[%d] of [%d] items")); + } + + @Test + public void testParent() { + assertEquals("ofItems", I18nUtils.convertMethodName("() of [] {} items")); + } +}

1 0

r1477 - trunk/src/test/java/cc/kune/core/server/manager
by Vicente J. Ruiz Jurado 29 Jul '11

29 Jul '11

Author: vjrj_ Date: 2011-07-29 23:04:15 +0200 (Fri, 29 Jul 2011) New Revision: 1477 Modified: trunk/src/test/java/cc/kune/core/server/manager/ContainerManagerDefaultTest.java trunk/src/test/java/cc/kune/core/server/manager/ContentManagerDefaultTest.java Log: Test fixed Modified: trunk/src/test/java/cc/kune/core/server/manager/ContainerManagerDefaultTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/ContainerManagerDefaultTest.java 2011-07-29 20:59:39 UTC (rev 1476) +++ trunk/src/test/java/cc/kune/core/server/manager/ContainerManagerDefaultTest.java 2011-07-29 21:04:15 UTC (rev 1477) @@ -8,6 +8,7 @@ import org.junit.Test; import cc.kune.core.client.errors.AccessViolationException; +import cc.kune.core.client.errors.MoveOnSameContainerException; import cc.kune.core.client.errors.NameInUseException; import cc.kune.core.server.PersistencePreLoadedDataTest; import cc.kune.docs.shared.DocsConstants; @@ -65,11 +66,10 @@ containerManager.moveContainer(folderToMove, newParentFolder); } - @Test + @Test(expected = MoveOnSameContainerException.class) public void testMoveFolderToSame() { final Container folderToMove = createContainer(rootFolder); containerManager.moveContainer(folderToMove, rootFolder); - // Do nothing (in silence) } @Test Modified: trunk/src/test/java/cc/kune/core/server/manager/ContentManagerDefaultTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/ContentManagerDefaultTest.java 2011-07-29 20:59:39 UTC (rev 1476) +++ trunk/src/test/java/cc/kune/core/server/manager/ContentManagerDefaultTest.java 2011-07-29 21:04:15 UTC (rev 1477) @@ -27,6 +27,7 @@ import org.junit.Ignore; import org.junit.Test; +import cc.kune.core.client.errors.MoveOnSameContainerException; import cc.kune.core.client.errors.NameInUseException; import cc.kune.core.server.PersistencePreLoadedDataTest; import cc.kune.core.server.manager.impl.SearchResult; @@ -118,6 +119,12 @@ assertEquals(1, search.getSize()); } + @Test(expected = MoveOnSameContainerException.class) + public void testMoveFolderToSame() { + final Content content = createContent(); + contentManager.moveContent(content, content.getContainer()); + } + @Ignore @Test public void testtMimeSearch() {

1 0

r1476 - in trunk/src/main/java/cc/kune: common/client/tooltip core/client/dnd core/client/errors core/public core/server/content gspace/client/viewers
by Vicente J. Ruiz Jurado 29 Jul '11

29 Jul '11

Author: vjrj_ Date: 2011-07-29 22:59:39 +0200 (Fri, 29 Jul 2011) New Revision: 1476 Added: trunk/src/main/java/cc/kune/core/client/errors/MoveOnSameContainerException.java Modified: trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.java trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java Log: Folder/content move minor changes Modified: trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.java 2011-07-29 19:44:18 UTC (rev 1475) +++ trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.java 2011-07-29 20:59:39 UTC (rev 1476) @@ -48,6 +48,8 @@ interface TooltipUiBinder extends UiBinder<Widget, Tooltip> { } + static Tooltip current; + private static TooltipUiBinder uiBinder = GWT.create(TooltipUiBinder.class); private static final int WIDTH_NOT_DEFINED = -1; @@ -146,6 +148,10 @@ public void show() { if (!Tooltip.this.isShowing() && ofWidget.isAttached() && ofWidget.isVisible()) { Tooltip.super.show(); + if (Tooltip.current != null) { + Tooltip.current.hide(); + } + Tooltip.current = this; Tooltip.this.showAt(TooltipPositionCalculator.calculate(Window.getClientWidth(), Window.getClientHeight(), ofWidget.getAbsoluteLeft(), ofWidget.getAbsoluteTop(), ofWidget.getOffsetWidth(), ofWidget.getOffsetHeight(), Tooltip.this.getWidth(), Modified: trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java 2011-07-29 19:44:18 UTC (rev 1475) +++ trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java 2011-07-29 20:59:39 UTC (rev 1476) @@ -64,6 +64,7 @@ NotifyUser.showProgress(i18n.t("Moving")); if (target != null) { final StateToken destToken = (StateToken) target; + widget.removeFromParent(); contentService.moveContent(session.getUserHash(), ((FolderItemWidget) widget).getToken(), destToken, new AsyncCallback<StateContainerDTO>() { @Override @@ -75,7 +76,6 @@ @Override public void onSuccess(final StateContainerDTO result) { - stateManager.refreshCurrentState(); NotifyUser.hideProgress(); } }); Modified: trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-07-29 19:44:18 UTC (rev 1475) +++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-07-29 20:59:39 UTC (rev 1476) @@ -132,6 +132,10 @@ logException(caught); eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, i18n.t("This user is already a group member"))); + } else if (caught instanceof MoveOnSameContainerException) { + logException(caught); + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.info, + i18n.t("You are trying to move this to the same location"))); } else if (caught instanceof UnderDevelopmentException) { logException(caught); eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.info, i18n.t(TextUtils.IN_DEVELOPMENT))); Added: trunk/src/main/java/cc/kune/core/client/errors/MoveOnSameContainerException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/MoveOnSameContainerException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/MoveOnSameContainerException.java 2011-07-29 20:59:39 UTC (rev 1476) @@ -0,0 +1,24 @@ +/* + * + * 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.errors; + +public class MoveOnSameContainerException extends DefaultException { + private static final long serialVersionUID = -4785135366930710863L; +} Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-07-29 19:44:18 UTC (rev 1475) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-07-29 20:59:39 UTC (rev 1476) @@ -1430,5 +1430,5 @@ button.k-drop-allowed-hover, .k-drop-allowed-hover { - border: dashed 2px #3a9fd6; + border: dashed 2px #3a9fd6 !important; } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java 2011-07-29 19:44:18 UTC (rev 1475) +++ trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java 2011-07-29 20:59:39 UTC (rev 1476) @@ -28,6 +28,7 @@ import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.client.errors.MoveOnSameContainerException; import cc.kune.core.client.errors.NameInUseException; import cc.kune.core.server.manager.file.FileUtils; import cc.kune.core.server.manager.impl.DefaultManager; @@ -98,11 +99,10 @@ @Override public void moveContainer(final Container container, final Container newContainer) { - final String title = container.getName(); if (newContainer.equals(container.getParent())) { - // Do nothing (trying to move to the same location) - return; + throw new MoveOnSameContainerException(); } + final String title = container.getName(); if (findIfExistsTitle(newContainer, title)) { throw new NameInUseException(); } Modified: trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java 2011-07-29 19:44:18 UTC (rev 1475) +++ trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java 2011-07-29 20:59:39 UTC (rev 1476) @@ -35,6 +35,7 @@ import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.errors.I18nNotFoundException; +import cc.kune.core.client.errors.MoveOnSameContainerException; import cc.kune.core.client.errors.NameInUseException; import cc.kune.core.client.errors.UserNotFoundException; import cc.kune.core.server.access.FinderService; @@ -190,7 +191,11 @@ } } + @Override public Content moveContent(final Content content, final Container newContainer) { + if (newContainer.equals(content.getContainer())) { + throw new MoveOnSameContainerException(); + } final String title = content.getTitle(); if (findIfExistsTitle(newContainer, title)) { throw new NameInUseException(); Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java 2011-07-29 19:44:18 UTC (rev 1475) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java 2011-07-29 20:59:39 UTC (rev 1476) @@ -26,7 +26,6 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; -import cc.kune.common.client.tooltip.Tooltip; import cc.kune.core.client.dnd.FolderViewerDropController; import cc.kune.core.client.dnd.KuneDragController; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; @@ -145,9 +144,10 @@ flex.setWidget(rowCount + 1, 0, itemWidget); if (item.isDraggable()) { dragController.makeDraggable(itemWidget, itemWidget.getTitleWidget()); - Tooltip.to(itemWidget, i18n.t("Drag and drop to move this. Double click to open")); + // Tooltip.to(itemWidget, + // i18n.t("Drag and drop to move this. Double click to open")); } else { - Tooltip.to(itemWidget, i18n.t("Double click to open")); + // Tooltip.to(itemWidget, i18n.t("Double click to open")); } if (item.isDroppable()) { final FolderViewerDropController dropController = dropControllerProv.get(); Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java 2011-07-29 19:44:18 UTC (rev 1475) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java 2011-07-29 20:59:39 UTC (rev 1476) @@ -239,6 +239,11 @@ if (pathLength > 0) { for (int i = pathLength - 1; i >= 0; i--) { final ButtonDescriptor btn = createPathButton(path[i], pathLength, i); + if (i != pathLength - 1) { + final FolderViewerDropController dropTarget = dropController.get(); + dropTarget.setTarget(path[i].getStateToken()); + btn.setDropTarget(dropTarget); + } actions.add(btn); } } @@ -251,9 +256,6 @@ final ButtonDescriptor btn = new ButtonDescriptor(new GotoTokenAction( iconsRegistry.getContentTypeIcon(container.getTypeId()), container.getName(), container.getStateToken(), style, stateManager, getEventBus())); - final FolderViewerDropController dropTarget = dropController.get(); - dropTarget.setTarget(container.getStateToken()); - btn.setDropTarget(dropTarget); return btn; }

1 0

r1475 - in trunk/src/main/java/cc/kune: common/client/tooltip core/client/dnd core/public gspace/client/resources gspace/client/tool/selector gspace/client/viewers
by Vicente J. Ruiz Jurado 29 Jul '11

29 Jul '11

Author: vjrj_ Date: 2011-07-29 21:44:18 +0200 (Fri, 29 Jul 2011) New Revision: 1475 Modified: trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.java trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmorTheme.css trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorPanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderItemWidget.ui.xml trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java Log: Drag&Drop look improved Modified: trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.java 2011-07-29 18:12:12 UTC (rev 1474) +++ trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.java 2011-07-29 19:44:18 UTC (rev 1475) @@ -144,7 +144,7 @@ @Override public void show() { - if (!Tooltip.this.isShowing() && ofWidget.isVisible()) { + if (!Tooltip.this.isShowing() && ofWidget.isAttached() && ofWidget.isVisible()) { Tooltip.super.show(); Tooltip.this.showAt(TooltipPositionCalculator.calculate(Window.getClientWidth(), Window.getClientHeight(), ofWidget.getAbsoluteLeft(), ofWidget.getAbsoluteTop(), Modified: trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java 2011-07-29 18:12:12 UTC (rev 1474) +++ trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java 2011-07-29 19:44:18 UTC (rev 1475) @@ -8,6 +8,7 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateContainerDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.viewers.FolderItemWidget; import com.allen_sauer.gwt.dnd.client.DragContext; @@ -33,6 +34,7 @@ private final KuneDragController dragController; private SimpleDropController dropController; private final ErrorHandler erroHandler; + private final I18nTranslationService i18n; private final Session session; private final StateManager stateManager; private Object target; @@ -40,12 +42,13 @@ @Inject public FolderViewerDropController(final KuneDragController dragController, final ContentServiceAsync contentService, final Session session, final StateManager stateManager, - final ErrorHandler erroHandler) { + final ErrorHandler erroHandler, final I18nTranslationService i18n) { this.dragController = dragController; this.contentService = contentService; this.session = session; this.stateManager = stateManager; this.erroHandler = erroHandler; + this.i18n = i18n; } @Override @@ -58,6 +61,7 @@ for (final Widget widget : context.selectedWidgets) { if (widget instanceof FolderItemWidget) { getDropTarget().removeStyleName("k-drop-allowed-hover"); + NotifyUser.showProgress(i18n.t("Moving")); if (target != null) { final StateToken destToken = (StateToken) target; contentService.moveContent(session.getUserHash(), ((FolderItemWidget) widget).getToken(), @@ -66,15 +70,18 @@ public void onFailure(final Throwable caught) { erroHandler.process(caught); stateManager.refreshCurrentState(); + NotifyUser.hideProgress(); } @Override public void onSuccess(final StateContainerDTO result) { stateManager.refreshCurrentState(); + NotifyUser.hideProgress(); } }); } else { NotifyUser.info(TextUtils.IN_DEVELOPMENT); + NotifyUser.hideProgress(); } } } @@ -114,6 +121,9 @@ }; dropTarget.addStyleName("k-drop-allowed"); + if (dropTarget.isAttached()) { + dragController.registerDropController(dropController); + } dropTarget.addAttachHandler(new Handler() { @Override public void onAttachOrDetach(final AttachEvent event) { Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-07-29 18:12:12 UTC (rev 1474) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-07-29 19:44:18 UTC (rev 1475) @@ -1428,6 +1428,7 @@ border-radius: 4px; } +button.k-drop-allowed-hover, .k-drop-allowed-hover { border: dashed 2px #3a9fd6; } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmorTheme.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmorTheme.css 2011-07-29 18:12:12 UTC (rev 1474) +++ trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmorTheme.css 2011-07-29 19:44:18 UTC (rev 1475) @@ -33,11 +33,11 @@ } -.k-sn-2nd-spanel { +.k-sn-2nd-panel { background-color: bc2; } -.k-sn-2nd-spanel span { +.k-sn-2nd-panel span { color: c2; } Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java 2011-07-29 18:12:12 UTC (rev 1474) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java 2011-07-29 19:44:18 UTC (rev 1475) @@ -29,6 +29,7 @@ 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.FlowPanel; import com.google.gwt.user.client.ui.FocusPanel; import com.google.gwt.user.client.ui.HTMLPanel; import com.google.gwt.user.client.ui.HasText; @@ -46,6 +47,8 @@ @UiField HTMLPanel arrow; @UiField + FlowPanel flow; + @UiField Image iconLeft; @UiField Image iconRight; @@ -70,15 +73,15 @@ self.removeStyleDependentName("nofocus"); } - public Widget getFlow() { - return self; - } - @Override public HasClickHandlers getFocus() { return self; } + public Widget getFocusPanel() { + return flow; + } + @Override public HasText getLabel() { return label; @@ -89,16 +92,6 @@ unfocus(); } - // public void setTheme(final WsTheme oldTheme, final WsTheme newTheme) { - // if (oldTheme != null) { - // final String oldName = oldTheme.getName(); - // hl.removeStyleDependentName(oldName); - // } - // final String newName = newTheme.getName(); - // hl.addStyleDependentName(newName); - // super.setCornerStyleName(hl.getStyleName()); - // } - @UiHandler("self") void onSelfMouseOver(final MouseOverEvent event) { focus(); Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorPanel.java 2011-07-29 18:12:12 UTC (rev 1474) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorPanel.java 2011-07-29 19:44:18 UTC (rev 1475) @@ -49,7 +49,6 @@ public ToolSelectorPanel(final GSpaceArmor wsArmor, final Provider<FolderViewerDropController> dropControllerProv) { this.dropControllerProv = dropControllerProv; - wsArmor.getEntityToolsCenter().add(uiBinder.createAndBindUi(this)); } @@ -57,7 +56,9 @@ public void addItem(final ToolSelectorItemView item) { final Widget widget = item.asWidget(); flow.add(widget); - dropControllerProv.get().init(((ToolSelectorItemPanel) widget).getParent()); + // dropControllerProv.get().init((InlineLabel) ((ToolSelectorItemPanel) + // widget).getLabel()); + dropControllerProv.get().init(((ToolSelectorItemPanel) widget).getFocusPanel()); } @Override Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderItemWidget.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderItemWidget.ui.xml 2011-07-29 18:12:12 UTC (rev 1474) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderItemWidget.ui.xml 2011-07-29 19:44:18 UTC (rev 1475) @@ -9,6 +9,10 @@ @external .k-folderitem-focus-nofocused; .k-folderitem-focus { background-color: none; + border: solid 2px transparent; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; } .k-folderitem-focus-focused { @@ -65,11 +69,11 @@ </ui:style> <g:FocusPanel ui:field="focusPanel" styleName="{style.k-folderitem-focus}"> <g:FlowPanel styleName="{style.flow}" ui:field="flow"> - <g:Image styleName="{style.icon}" ui:field="icon" /> - <g:InlineLabel styleName="{style.title}" ui:field="title" /> - <g:SimplePanel styleName="{style.menu}" ui:field="menu" /> + <g:Image styleName="{style.icon}" ui:field="icon"/> + <g:InlineLabel styleName="{style.title}" ui:field="title"/> + <g:SimplePanel styleName="{style.menu}" ui:field="menu"/> <g:InlineLabel styleName="{style.modified}" - ui:field="modified" /> + ui:field="modified"/> </g:FlowPanel> </g:FocusPanel> </ui:UiBinder> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java 2011-07-29 18:12:12 UTC (rev 1474) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java 2011-07-29 19:44:18 UTC (rev 1475) @@ -26,6 +26,7 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; +import cc.kune.common.client.tooltip.Tooltip; import cc.kune.core.client.dnd.FolderViewerDropController; import cc.kune.core.client.dnd.KuneDragController; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; @@ -144,6 +145,9 @@ flex.setWidget(rowCount + 1, 0, itemWidget); if (item.isDraggable()) { dragController.makeDraggable(itemWidget, itemWidget.getTitleWidget()); + Tooltip.to(itemWidget, i18n.t("Drag and drop to move this. Double click to open")); + } else { + Tooltip.to(itemWidget, i18n.t("Double click to open")); } if (item.isDroppable()) { final FolderViewerDropController dropController = dropControllerProv.get();

1 0

r1474 - in trunk/src: main/java/cc/kune/common/client/actions/ui main/java/cc/kune/common/client/actions/ui/descrip main/java/cc/kune/core/client/dnd main/java/cc/kune/core/server/content main/java/cc/kune/domain main/java/cc/kune/gspace/client/tool/selector main/java/cc/kune/gspace/client/viewers test/java/cc/kune/core/server/manager test/java/cc/kune/core/server/mapper test/java/cc/kune/gspace/client/viewers
by Vicente J. Ruiz Jurado 29 Jul '11

29 Jul '11

Author: vjrj_ Date: 2011-07-29 20:12:12 +0200 (Fri, 29 Jul 2011) New Revision: 1474 Added: trunk/src/main/java/cc/kune/core/client/dnd/DropTarget.java Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java trunk/src/main/java/cc/kune/domain/Container.java trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorPanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java trunk/src/test/java/cc/kune/core/server/manager/ContainerManagerDefaultTest.java trunk/src/test/java/cc/kune/core/server/mapper/MapperTest.java trunk/src/test/java/cc/kune/gspace/client/viewers/FolderViewerPresenterTest.java Log: CLOSED - # 77: D&D from folder to parent http://kune.ourproject.org/issues/ticket/77 CLOSED - # 71: D-and-D folder into folder fails http://kune.ourproject.org/issues/ticket/71 Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java 2011-07-29 12:48:57 UTC (rev 1473) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java 2011-07-29 18:12:12 UTC (rev 1474) @@ -28,6 +28,7 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.errors.NotImplementedException; import cc.kune.common.client.utils.TextUtils; +import cc.kune.core.client.dnd.DropTarget; import cc.kune.core.client.resources.IconConstants; import com.google.gwt.resources.client.ImageResource; @@ -79,6 +80,7 @@ setEnabled((Boolean) descriptor.getValue(AbstractAction.ENABLED)); setVisible((Boolean) descriptor.getValue(GuiActionDescrip.VISIBLE)); setStyles((String) descriptor.getValue(Action.STYLES)); + setDropTarget((DropTarget) descriptor.getValue(GuiActionDescrip.DROP_TARGET)); } @Override @@ -103,6 +105,8 @@ toogleTooltipVisible(); } else if (event.getPropertyName().equals(Action.STYLES)) { setStyles((String) newValue); + } else if (event.getPropertyName().equals(GuiActionDescrip.DROP_TARGET)) { + setDropTarget((DropTarget) newValue); } } }; @@ -114,6 +118,12 @@ // the action, if not we only pass the menuitem return descriptor.hasTarget() ? descriptor.getTarget() : descriptor.isChild() ? descriptor.getParent().getTarget() : ActionEvent.NO_TARGET; + }; + + private void setDropTarget(final DropTarget dropTarget) { + if (dropTarget != null) { + dropTarget.init(this); + } } protected abstract void setEnabled(boolean enabled); @@ -162,11 +172,6 @@ protected abstract void setText(String text); - protected void toogleTooltipVisible() { - // do nothing by default - return; - } - protected abstract void setToolTipText(String text); private void setVisible(final Boolean visible) { @@ -179,4 +184,9 @@ public boolean shouldBeAdded() { // NOPMD by vjrj on 18/01/11 0:48 return true; } + + protected void toogleTooltipVisible() { + // do nothing by default + return; + } } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java 2011-07-29 12:48:57 UTC (rev 1473) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java 2011-07-29 18:12:12 UTC (rev 1474) @@ -27,6 +27,7 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ChangeableObject; import cc.kune.common.client.actions.KeyStroke; +import cc.kune.core.client.dnd.DropTarget; /** * The Class AbstractUIActionDescriptor. @@ -164,6 +165,11 @@ } @Override + public void setDropTarget(final DropTarget dropTarget) { + putValue(DROP_TARGET, dropTarget); + } + + @Override public void setEnabled(final boolean enabled) { putValue(Action.ENABLED, enabled); } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java 2011-07-29 12:48:57 UTC (rev 1473) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java 2011-07-29 18:12:12 UTC (rev 1474) @@ -23,9 +23,12 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.KeyStroke; import cc.kune.common.client.actions.PropertyChangeListener; +import cc.kune.core.client.dnd.DropTarget; public interface GuiActionDescrip { + public static final String DROP_TARGET = "dropTarget"; + public static final AbstractGuiActionDescrip NO_PARENT = new NoParentGuiActionDescriptor(); public static final int NO_POSITION = -1; @@ -38,7 +41,6 @@ public static final String TARGET = "target"; public static final String TOOGLE_TOOLTIP_VISIBLE = "toogle-tooltip-visible"; - public static final String VISIBLE = "visibleprop"; void add(final GuiAddCondition addCondition); @@ -81,6 +83,8 @@ void removePropertyChangeListener(final PropertyChangeListener listener); + void setDropTarget(DropTarget dropTarget); + void setEnabled(final boolean enabled); void setId(final String id); Added: trunk/src/main/java/cc/kune/core/client/dnd/DropTarget.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/dnd/DropTarget.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/dnd/DropTarget.java 2011-07-29 18:12:12 UTC (rev 1474) @@ -0,0 +1,9 @@ +package cc.kune.core.client.dnd; + +import com.google.gwt.user.client.ui.Widget; + +public interface DropTarget { + + void init(Widget dropTarget); + +} Modified: trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java 2011-07-29 12:48:57 UTC (rev 1473) +++ trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java 2011-07-29 18:12:12 UTC (rev 1474) @@ -6,6 +6,7 @@ import cc.kune.core.client.rpcservices.ContentServiceAsync; 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.StateContainerDTO; import cc.kune.gspace.client.viewers.FolderItemWidget; @@ -18,16 +19,23 @@ import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; -public class FolderViewerDropController { +/** + * @author vjrj + * + */ +/** + * @author vjrj + * + */ +public class FolderViewerDropController implements DropTarget { private final ContentServiceAsync contentService; private final KuneDragController dragController; - private SimpleDropController dropController; - private final ErrorHandler erroHandler; private final Session session; private final StateManager stateManager; + private Object target; @Inject public FolderViewerDropController(final KuneDragController dragController, @@ -38,9 +46,9 @@ this.session = session; this.stateManager = stateManager; this.erroHandler = erroHandler; - } + @Override public void init(final Widget dropTarget) { dropController = new SimpleDropController(dropTarget) { @@ -50,13 +58,10 @@ for (final Widget widget : context.selectedWidgets) { if (widget instanceof FolderItemWidget) { getDropTarget().removeStyleName("k-drop-allowed-hover"); - if (getDropTarget() instanceof FolderItemWidget) { - // NotifyUser.info("" + ((FolderItemWidget) - // getDropTarget()).getToken().toString() + " receive: " - // + ((FolderItemWidget) widget).getToken().toString()); + if (target != null) { + final StateToken destToken = (StateToken) target; contentService.moveContent(session.getUserHash(), ((FolderItemWidget) widget).getToken(), - ((FolderItemWidget) getDropTarget()).getToken(), - new AsyncCallback<StateContainerDTO>() { + destToken, new AsyncCallback<StateContainerDTO>() { @Override public void onFailure(final Throwable caught) { erroHandler.process(caught); @@ -121,4 +126,8 @@ }); } + public void setTarget(final Object target) { + this.target = target; + } + } Modified: trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java 2011-07-29 12:48:57 UTC (rev 1473) +++ trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java 2011-07-29 18:12:12 UTC (rev 1474) @@ -19,9 +19,6 @@ */ package cc.kune.core.server.content; -import java.util.ArrayList; -import java.util.List; - import javax.persistence.EntityManager; import org.apache.lucene.analysis.standard.StandardAnalyzer; @@ -68,7 +65,6 @@ FilenameUtils.checkBasicFilename(name); final String newtitle = findInexistentName(parent, name); final Container child = new Container(newtitle, group, parent.getToolName()); - child.setAbsolutePath(setAbsolutePath(child, parent)); child.setLanguage(language); child.setTypeId(typeId); parent.addChild(child); @@ -81,9 +77,6 @@ final String type) { final Container container = new Container(name, group, toolName); container.setTypeId(type); - final List<Container> absolutePath = new ArrayList<Container>(); - absolutePath.add(container); - container.setAbsolutePath(absolutePath); return persist(container); } @@ -106,6 +99,10 @@ @Override public void moveContainer(final Container container, final Container newContainer) { final String title = container.getName(); + if (newContainer.equals(container.getParent())) { + // Do nothing (trying to move to the same location) + return; + } if (findIfExistsTitle(newContainer, title)) { throw new NameInUseException(); } @@ -116,8 +113,6 @@ final Container oldContainer = container.getParent(); oldContainer.removeChild(container); newContainer.addChild(container); - // AbsolutePath - container.setAbsolutePath(setAbsolutePath(container, newContainer)); persist(container); } @@ -156,18 +151,6 @@ return super.search(query, firstResult, maxResults); } - private List<Container> setAbsolutePath(final Container child, final Container parent) { - final List<Container> parentAbsolutePath = parent.getAbsolutePath(); - final List<Container> childAbsolutePath = new ArrayList<Container>(); - for (final Container parentRef : parentAbsolutePath) { - childAbsolutePath.add(parentRef); - } - // FIXME: use (tested but change this in other time, not in a pre-release) - // childAbsolutePath.addAll(parentAbsolutePath); - childAbsolutePath.add(child); - return childAbsolutePath; - } - @Override public void setAccessList(final Container container, final AccessLists accessList) { container.setAccessLists(accessList); Modified: trunk/src/main/java/cc/kune/domain/Container.java =================================================================== --- trunk/src/main/java/cc/kune/domain/Container.java 2011-07-29 12:48:57 UTC (rev 1473) +++ trunk/src/main/java/cc/kune/domain/Container.java 2011-07-29 18:12:12 UTC (rev 1474) @@ -33,7 +33,6 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.JoinColumn; -import javax.persistence.ManyToMany; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.OneToOne; @@ -62,10 +61,6 @@ @Table(name = "containers") public class Container implements HasId, HasStateToken { - @LazyCollection(LazyCollectionOption.FALSE) - @ManyToMany(cascade = CascadeType.ALL) - private List<Container> absolutePath; - @OneToOne(cascade = CascadeType.ALL) private AccessLists accessLists; @@ -129,7 +124,6 @@ this.toolName = toolName; this.contents = new HashSet<Content>(); this.childs = new HashSet<Container>(); - this.absolutePath = new ArrayList<Container>(); this.createdOn = System.currentTimeMillis(); } @@ -145,8 +139,16 @@ contents.add(descriptor); } + @Transient public List<Container> getAbsolutePath() { - return absolutePath; + ArrayList<Container> path; + if (isRoot()) { + path = new ArrayList<Container>(); + } else { + path = new ArrayList<Container>((getParent().getAbsolutePath())); + } + path.add(this); + return path; } @Transient @@ -248,10 +250,6 @@ contents.remove(content); } - public void setAbsolutePath(final List<Container> absolutePath) { - this.absolutePath = absolutePath; - } - public void setAccessLists(final AccessLists accessLists) { this.accessLists = accessLists; } Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorPanel.java 2011-07-29 12:48:57 UTC (rev 1473) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorPanel.java 2011-07-29 18:12:12 UTC (rev 1474) @@ -57,7 +57,7 @@ public void addItem(final ToolSelectorItemView item) { final Widget widget = item.asWidget(); flow.add(widget); - dropControllerProv.get().init(((ToolSelectorItemPanel) widget).getFlow()); + dropControllerProv.get().init(((ToolSelectorItemPanel) widget).getParent()); } @Override Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java 2011-07-29 12:48:57 UTC (rev 1473) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java 2011-07-29 18:12:12 UTC (rev 1474) @@ -162,7 +162,7 @@ channel = webClient.getChannel(); profiles = webClient.getProfiles(); idGenerator = ClientIdGenerator.create(); - loading.addClassName("kune-Margin-40-tb"); + // loading.addClassName("kune-Margin-40-tb"); } } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java 2011-07-29 12:48:57 UTC (rev 1473) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java 2011-07-29 18:12:12 UTC (rev 1474) @@ -146,7 +146,9 @@ dragController.makeDraggable(itemWidget, itemWidget.getTitleWidget()); } if (item.isDroppable()) { - dropControllerProv.get().init(itemWidget); + final FolderViewerDropController dropController = dropControllerProv.get(); + dropController.init(itemWidget); + dropController.setTarget(item.getStateToken()); } } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java 2011-07-29 12:48:57 UTC (rev 1473) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java 2011-07-29 18:12:12 UTC (rev 1474) @@ -27,6 +27,7 @@ import cc.kune.common.client.ui.EditEvent.EditHandler; import cc.kune.common.client.ui.HasEditHandler; import cc.kune.core.client.actions.ActionRegistryByType; +import cc.kune.core.client.dnd.FolderViewerDropController; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.registry.IconsRegistry; import cc.kune.core.client.services.FileDownloadUtils; @@ -110,6 +111,7 @@ private final ContentCapabilitiesRegistry capabilitiesRegistry; private final Provider<FileDownloadUtils> downloadUtilsProvider; + private final Provider<FolderViewerDropController> dropController; private HandlerRegistration editHandler; private final I18nTranslationService i18n; private final IconsRegistry iconsRegistry; @@ -123,7 +125,8 @@ final FolderViewerProxy proxy, final Session session, final StateManager stateManager, final I18nTranslationService i18n, final ActionRegistryByType actionsRegistry, final Provider<FileDownloadUtils> downloadUtilsProvider, - final Provider<RenameAction> renameAction, final ContentCapabilitiesRegistry capabilitiesRegistry) { + final Provider<RenameAction> renameAction, final ContentCapabilitiesRegistry capabilitiesRegistry, + final Provider<FolderViewerDropController> dropController) { super(eventBus, view, proxy); this.session = session; this.stateManager = stateManager; @@ -131,6 +134,7 @@ this.actionsRegistry = actionsRegistry; this.downloadUtilsProvider = downloadUtilsProvider; this.capabilitiesRegistry = capabilitiesRegistry; + this.dropController = dropController; iconsRegistry = capabilitiesRegistry.getIconsRegistry(); useGenericImageIcon = false; this.renameAction = renameAction; @@ -247,6 +251,9 @@ final ButtonDescriptor btn = new ButtonDescriptor(new GotoTokenAction( iconsRegistry.getContentTypeIcon(container.getTypeId()), container.getName(), container.getStateToken(), style, stateManager, getEventBus())); + final FolderViewerDropController dropTarget = dropController.get(); + dropTarget.setTarget(container.getStateToken()); + btn.setDropTarget(dropTarget); return btn; } Modified: trunk/src/test/java/cc/kune/core/server/manager/ContainerManagerDefaultTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/ContainerManagerDefaultTest.java 2011-07-29 12:48:57 UTC (rev 1473) +++ trunk/src/test/java/cc/kune/core/server/manager/ContainerManagerDefaultTest.java 2011-07-29 18:12:12 UTC (rev 1474) @@ -24,9 +24,13 @@ } private Container createContainer(final Container parent) { - return containerManager.createFolder(user.getUserGroup(), parent, "Some title", english, TYPE_FOLDER); + return createContainer(parent, "Some title"); } + private Container createContainer(final Container parent, final String title) { + return containerManager.createFolder(user.getUserGroup(), parent, title, english, TYPE_FOLDER); + } + @Test public void testCreateFolder() { final Container newFolder = createContainer(rootFolder); @@ -61,6 +65,56 @@ containerManager.moveContainer(folderToMove, newParentFolder); } + @Test + public void testMoveFolderToSame() { + final Container folderToMove = createContainer(rootFolder); + containerManager.moveContainer(folderToMove, rootFolder); + // Do nothing (in silence) + } + + @Test + public void testMoveFolderUp() { + final Container parentFolder = createContainer(rootFolder); + final Container folderToMove = createContainer(parentFolder, "Other title"); + assertEquals(0, folderToMove.getChilds().size()); + assertEquals(1, parentFolder.getChilds().size()); + containerManager.moveContainer(folderToMove, rootFolder); + assertEquals(rootFolder, folderToMove.getParent()); + assertEquals(0, parentFolder.getChilds().size()); + assertEquals(2, rootFolder.getChilds().size()); + assertEquals(2, folderToMove.getAbsolutePath().size()); + assertEquals(rootFolder, folderToMove.getAbsolutePath().get(0)); + assertEquals(folderToMove, folderToMove.getAbsolutePath().get(1)); + } + + @Test + public void testMoveMiddleFolder() { + final Container parentFolder = createContainer(rootFolder); + final Container middleFolder = createContainer(parentFolder, "Middle"); + final Container childFolder = createContainer(middleFolder, "Child"); + assertEquals(0, childFolder.getChilds().size()); + assertEquals(1, parentFolder.getChilds().size()); + assertEquals(1, middleFolder.getChilds().size()); + assertEquals(4, childFolder.getAbsolutePath().size()); + assertEquals(rootFolder, childFolder.getAbsolutePath().get(0)); + assertEquals(parentFolder, childFolder.getAbsolutePath().get(1)); + assertEquals(middleFolder, childFolder.getAbsolutePath().get(2)); + assertEquals(childFolder, childFolder.getAbsolutePath().get(3)); + containerManager.moveContainer(middleFolder, rootFolder); + assertEquals(rootFolder, middleFolder.getParent()); + assertEquals(0, parentFolder.getChilds().size()); + assertEquals(2, rootFolder.getChilds().size()); + assertEquals(3, childFolder.getAbsolutePath().size()); + assertEquals(rootFolder, childFolder.getAbsolutePath().get(0)); + assertEquals(middleFolder, childFolder.getAbsolutePath().get(1)); + assertEquals(childFolder, childFolder.getAbsolutePath().get(2)); + assertEquals(1, rootFolder.getAbsolutePath().size()); + assertEquals(rootFolder, rootFolder.getAbsolutePath().get(0)); + assertEquals(2, parentFolder.getAbsolutePath().size()); + assertEquals(rootFolder, parentFolder.getAbsolutePath().get(0)); + assertEquals(parentFolder, parentFolder.getAbsolutePath().get(1)); + } + @Test(expected = AccessViolationException.class) public void testMoveRootFolderFails() { containerManager.moveContainer(rootFolder, rootFolder); Modified: trunk/src/test/java/cc/kune/core/server/mapper/MapperTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/mapper/MapperTest.java 2011-07-29 12:48:57 UTC (rev 1473) +++ trunk/src/test/java/cc/kune/core/server/mapper/MapperTest.java 2011-07-29 18:12:12 UTC (rev 1474) @@ -233,7 +233,6 @@ container.addChild(containerChild); final List<Container> absolutePathChild = new ArrayList<Container>(); absolutePathChild.add(container); - containerChild.setAbsolutePath(absolutePathChild); final ContainerDTO dto = mapper.map(container, ContainerDTO.class); assertEquals(3, dto.getChilds().size()); Modified: trunk/src/test/java/cc/kune/gspace/client/viewers/FolderViewerPresenterTest.java =================================================================== --- trunk/src/test/java/cc/kune/gspace/client/viewers/FolderViewerPresenterTest.java 2011-07-29 12:48:57 UTC (rev 1473) +++ trunk/src/test/java/cc/kune/gspace/client/viewers/FolderViewerPresenterTest.java 2011-07-29 18:12:12 UTC (rev 1474) @@ -38,7 +38,7 @@ @Before public void before() { presenter = new FolderViewerPresenter(null, null, null, null, null, null, null, null, null, - Mockito.mock(ContentCapabilitiesRegistry.class)); + Mockito.mock(ContentCapabilitiesRegistry.class), null); } @Test

1 0

r1473 - in trunk/src: main/java/cc/kune/core/server/content main/java/cc/kune/domain main/java/cc/kune/gspace/client main/java/cc/kune/gspace/client/resources main/webapp/others test/java/cc/kune/core/server/manager
by Vicente J. Ruiz Jurado 29 Jul '11

29 Jul '11

Author: vjrj_ Date: 2011-07-29 14:48:57 +0200 (Fri, 29 Jul 2011) New Revision: 1473 Added: trunk/src/test/java/cc/kune/core/server/manager/ContainerManagerDefaultTest.java Modified: trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java trunk/src/main/java/cc/kune/domain/Container.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/resources/gSpaceArmor.css trunk/src/main/webapp/others/kune-client-actions.xml Log: CLOSED - # 71: D-and-D folder into folder fails http://kune.ourproject.org/issues/ticket/71 CLOSED - # 76: RootPanel setSize for drag and d. arise height problems in chrommium http://kune.ourproject.org/issues/ticket/76 Modified: trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java 2011-07-29 01:24:35 UTC (rev 1472) +++ trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java 2011-07-29 12:48:57 UTC (rev 1473) @@ -29,9 +29,9 @@ import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.search.Query; +import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.errors.NameInUseException; -import cc.kune.core.client.errors.UnderDevelopmentException; import cc.kune.core.server.manager.file.FileUtils; import cc.kune.core.server.manager.impl.DefaultManager; import cc.kune.core.server.manager.impl.SearchResult; @@ -67,18 +67,9 @@ final I18nLanguage language, final String typeId) { FilenameUtils.checkBasicFilename(name); final String newtitle = findInexistentName(parent, name); - final List<Container> parentAbsolutePath = parent.getAbsolutePath(); - final List<Container> childAbsolutePath = new ArrayList<Container>(); - - for (final Container parentRef : parentAbsolutePath) { - childAbsolutePath.add(parentRef); - } - // FIXME: use - // childAbsolutePath.addAll(parentAbsolutePath); final Container child = new Container(newtitle, group, parent.getToolName()); - childAbsolutePath.add(child); + child.setAbsolutePath(setAbsolutePath(child, parent)); child.setLanguage(language); - child.setAbsolutePath(childAbsolutePath); child.setTypeId(typeId); parent.addChild(child); persist(child); @@ -114,7 +105,20 @@ @Override public void moveContainer(final Container container, final Container newContainer) { - throw new UnderDevelopmentException(); + final String title = container.getName(); + if (findIfExistsTitle(newContainer, title)) { + throw new NameInUseException(); + } + if (container.isRoot()) { + // Cannot move root container + throw new AccessViolationException(); + } + final Container oldContainer = container.getParent(); + oldContainer.removeChild(container); + newContainer.addChild(container); + // AbsolutePath + container.setAbsolutePath(setAbsolutePath(container, newContainer)); + persist(container); } @Override @@ -152,6 +156,18 @@ return super.search(query, firstResult, maxResults); } + private List<Container> setAbsolutePath(final Container child, final Container parent) { + final List<Container> parentAbsolutePath = parent.getAbsolutePath(); + final List<Container> childAbsolutePath = new ArrayList<Container>(); + for (final Container parentRef : parentAbsolutePath) { + childAbsolutePath.add(parentRef); + } + // FIXME: use (tested but change this in other time, not in a pre-release) + // childAbsolutePath.addAll(parentAbsolutePath); + childAbsolutePath.add(child); + return childAbsolutePath; + } + @Override public void setAccessList(final Container container, final AccessLists accessList) { container.setAccessLists(accessList); Modified: trunk/src/main/java/cc/kune/domain/Container.java =================================================================== --- trunk/src/main/java/cc/kune/domain/Container.java 2011-07-29 01:24:35 UTC (rev 1472) +++ trunk/src/main/java/cc/kune/domain/Container.java 2011-07-29 12:48:57 UTC (rev 1473) @@ -238,6 +238,11 @@ return parent == null; } + public void removeChild(final Container child) { + child.setParent(null); + childs.remove(child); + } + public void removeContent(final Content content) { contents.size(); contents.remove(content); Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java 2011-07-29 01:24:35 UTC (rev 1472) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java 2011-07-29 12:48:57 UTC (rev 1473) @@ -41,7 +41,6 @@ import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.SplitLayoutPanel; import com.google.gwt.user.client.ui.TabLayoutPanel; -import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; import com.google.inject.Provider; @@ -70,7 +69,7 @@ @UiField FlowPanel entityHeader; @UiField - VerticalPanel entityToolsCenter; + FlowPanel entityToolsCenter; @UiField FlowPanel entityToolsContainer; @UiField Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml 2011-07-29 01:24:35 UTC (rev 1472) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml 2011-07-29 12:48:57 UTC (rev 1473) @@ -93,9 +93,9 @@ <g:FlowPanel ui:field="entityToolsContainer"> <g:FlowPanel width="100%" ui:field="entityToolsNorth" styleName="{res.style.entityToolsNorth}"></g:FlowPanel> - <g:VerticalPanel width="100%" + <g:FlowPanel width="100%" ui:field="entityToolsCenter" styleName="{res.style.entityToolsCenter}"> - </g:VerticalPanel> + </g:FlowPanel> </g:FlowPanel> </g:center> <g:south size="98"> Modified: trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmor.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmor.css 2011-07-29 01:24:35 UTC (rev 1472) +++ trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmor.css 2011-07-29 12:48:57 UTC (rev 1473) @@ -209,7 +209,8 @@ .entityToolsCenter { /* margin: 10px; */ overflow: visible !important; - margin-top: 10px; + padding-top: 10px; + clear: both; } .entityToolsCenter span { Modified: trunk/src/main/webapp/others/kune-client-actions.xml =================================================================== --- trunk/src/main/webapp/others/kune-client-actions.xml 2011-07-29 01:24:35 UTC (rev 1472) +++ trunk/src/main/webapp/others/kune-client-actions.xml 2011-07-29 12:48:57 UTC (rev 1473) @@ -193,6 +193,18 @@ <iconCss></iconCss> </extension> + <extension> + <name>troco</name> + <installerUrl>http://troco.ourproject.org/gadget/troco-extension.xml + </installerUrl> + <gadgetUrl> + http://troco.ourproject.org/gadget/org.ourproject.troco.client.TrocoWaveGad… + </gadgetUrl> + <iconUrl>http://troco.ourproject.org/gadget/images/icon.png + </iconUrl> + <iconCss></iconCss> + </extension> + </waveExtensions>  @@ -655,7 +667,8 @@ <description>Make a vector image with others in real-time </description> <new-content-title>New Vector Image</new-content-title> - <new-content-textintro>With this gadget you can make a vector image with others in real-time</new-content-textintro> + <new-content-textintro>With this gadget you can make a vector + image with others in real-time</new-content-textintro> <enabled>true</enabled> <typeIds> <typeId origTypeId="docs.folder" destTypeId="docs.doc"/> @@ -672,6 +685,33 @@ <participants>ask</participants> </guiActionDescriptor> + <guiActionDescriptor> + <type>wave-gadget</type> + <extensionName>troco</extensionName> + <name>New Barter</name> + <path>New Gadget»Others</path> + <description>Propose a barter deal to others + </description> + <new-content-title>New Barter</new-content-title> + <new-content-textintro>With this gadget you can propose barters to + others. Fill up with something you want to give or you something you are looking for, and share with your groups or with the general public. Also you can write more details instead of this text. </new-content-textintro> + <enabled>true</enabled> + <typeIds> + <typeId origTypeId="docs.folder" destTypeId="docs.doc"/> + <typeId origTypeId="docs.root" destTypeId="docs.doc"/> + <typeId origTypeId="blogs.blog" destTypeId="blogs.post"/> + </typeIds> + <rol> +  + <rolRequired>Editor</rolRequired> + <authNeed>true</authNeed> + </rol> +  + <participants>ask</participants> + </guiActionDescriptor> + + </guiActionDescriptors> </kuneClientActions> Added: trunk/src/test/java/cc/kune/core/server/manager/ContainerManagerDefaultTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/ContainerManagerDefaultTest.java (rev 0) +++ trunk/src/test/java/cc/kune/core/server/manager/ContainerManagerDefaultTest.java 2011-07-29 12:48:57 UTC (rev 1473) @@ -0,0 +1,68 @@ +package cc.kune.core.server.manager; + +import static cc.kune.docs.shared.DocsConstants.TYPE_FOLDER; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import org.junit.Before; +import org.junit.Test; + +import cc.kune.core.client.errors.AccessViolationException; +import cc.kune.core.client.errors.NameInUseException; +import cc.kune.core.server.PersistencePreLoadedDataTest; +import cc.kune.docs.shared.DocsConstants; +import cc.kune.domain.Container; + +public class ContainerManagerDefaultTest extends PersistencePreLoadedDataTest { + + private Container rootFolder; + + @Before + public void before() { + rootFolder = containerManager.createRootFolder(user.getUserGroup(), DocsConstants.NAME, + DocsConstants.ROOT_NAME, TYPE_FOLDER); + } + + private Container createContainer(final Container parent) { + return containerManager.createFolder(user.getUserGroup(), parent, "Some title", english, TYPE_FOLDER); + } + + @Test + public void testCreateFolder() { + final Container newFolder = createContainer(rootFolder); + assertNotNull(newFolder.getParent()); + assertEquals(1, rootFolder.getChilds().size()); + assertEquals(0, newFolder.getChilds().size()); + assertEquals(1, rootFolder.getAbsolutePath().size()); + assertEquals(2, newFolder.getAbsolutePath().size()); + } + + @Test + public void testMoveFolder() { + final Container folderToMove = createContainer(rootFolder); + final Container newParentFolder = createContainer(rootFolder); + assertEquals(0, newParentFolder.getChilds().size()); + containerManager.moveContainer(folderToMove, newParentFolder); + assertEquals(newParentFolder, folderToMove.getParent()); + assertEquals(1, newParentFolder.getChilds().size()); + assertEquals(1, rootFolder.getChilds().size()); + assertEquals(3, folderToMove.getAbsolutePath().size()); + assertEquals(rootFolder, folderToMove.getAbsolutePath().get(0)); + assertEquals(newParentFolder, folderToMove.getAbsolutePath().get(1)); + assertEquals(folderToMove, folderToMove.getAbsolutePath().get(2)); + } + + @Test(expected = NameInUseException.class) + public void testMoveFolderNameExists() { + final Container folderToMove = createContainer(rootFolder); + final Container newParentFolder = createContainer(rootFolder); + // Create a folder with the same name + createContainer(newParentFolder); + containerManager.moveContainer(folderToMove, newParentFolder); + } + + @Test(expected = AccessViolationException.class) + public void testMoveRootFolderFails() { + containerManager.moveContainer(rootFolder, rootFolder); + } +}

1 0

r1472 - in trunk: script src/main/java/cc/kune/core/client/dnd src/main/java/cc/kune/core/public src/main/java/cc/kune/gspace/client
by Vicente J. Ruiz Jurado 29 Jul '11

29 Jul '11

Author: vjrj_ Date: 2011-07-29 03:24:35 +0200 (Fri, 29 Jul 2011) New Revision: 1472 Modified: trunk/script/css-update.sh trunk/src/main/java/cc/kune/core/client/dnd/KuneDragController.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/core/public/ws.html 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 Log: CLOSED - # 76: RootPanel setSize for drag and d. arise height problems in chrommium http://kune.ourproject.org/issues/ticket/76 Modified: trunk/script/css-update.sh =================================================================== --- trunk/script/css-update.sh 2011-07-28 23:36:39 UTC (rev 1471) +++ trunk/script/css-update.sh 2011-07-29 01:24:35 UTC (rev 1472) @@ -9,7 +9,7 @@ #rsync -aC $APPPUB/css/ $WEBAPP/css #rsync -aC $APPPUB/images/ $WEBAPP/images -VERSION=0.0.8 +VERSION=0.1.0-SNAPSHOT cp src/main/java/cc/kune/chat/public/kune-chat.css target/kune-$VERSION/ws/ cp src/main/java/cc/kune/chat/public/kune-hablar.css target/kune-$VERSION/ws/ Modified: trunk/src/main/java/cc/kune/core/client/dnd/KuneDragController.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/dnd/KuneDragController.java 2011-07-28 23:36:39 UTC (rev 1471) +++ trunk/src/main/java/cc/kune/core/client/dnd/KuneDragController.java 2011-07-29 01:24:35 UTC (rev 1472) @@ -1,5 +1,7 @@ package cc.kune.core.client.dnd; +import cc.kune.gspace.client.GSpaceArmor; + import com.allen_sauer.gwt.dnd.client.PickupDragController; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; @@ -7,11 +9,17 @@ import com.google.gwt.event.logical.shared.ResizeHandler; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.RootPanel; +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; public class KuneDragController extends PickupDragController { - public KuneDragController() { + private final Widget mainPanel; + + @Inject + public KuneDragController(final GSpaceArmor armor) { super(RootPanel.get(), false); + mainPanel = (Widget) armor.getMainpanel(); setBehaviorDragProxy(true); setBehaviorMultipleSelection(false); setBehaviorScrollIntoView(false); @@ -20,18 +28,11 @@ @Override public void onResize(final ResizeEvent event) { - final int width = event.getWidth(); - final int height = event.getHeight(); - setRootPanelSize(width, height); + setRootPanelSize(); } }); - Scheduler.get().scheduleDeferred(new ScheduledCommand() { - @Override - public void execute() { - setRootPanelSize(Window.getClientWidth(), Window.getClientHeight()); - } - }); + setRootPanelSize(); } @Override @@ -40,8 +41,14 @@ clearSelection(); } - private void setRootPanelSize(final int width, final int height) { - RootPanel.get().setPixelSize(width, height); + private void setRootPanelSize() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override + public void execute() { + // - 100 because of problems in chrommium (issue #76), not needed in ff + RootPanel.get().setPixelSize(mainPanel.getOffsetWidth(), mainPanel.getOffsetHeight() - 100); + } + }); } } Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-07-28 23:36:39 UTC (rev 1471) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-07-29 01:24:35 UTC (rev 1472) @@ -1,4 +1,6 @@ -CHARSET "UTF-8 "; body { +CHARSET "UTF-8 "; + +body { background-color: transparent; color: black; font-family: 'Ubuntu', Arial; Modified: trunk/src/main/java/cc/kune/core/public/ws.html =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.html 2011-07-28 23:36:39 UTC (rev 1471) +++ trunk/src/main/java/cc/kune/core/public/ws.html 2011-07-29 01:24:35 UTC (rev 1472) @@ -62,6 +62,7 @@ <script type="text/javascript" src="http://wave.google.com/gadgets/js/core:rpc.js?c=1"></script> <style type="text/css"> + body { background-color: white; color: black; Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmor.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmor.java 2011-07-28 23:36:39 UTC (rev 1471) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmor.java 2011-07-29 01:24:35 UTC (rev 1472) @@ -22,6 +22,7 @@ import cc.kune.common.client.actions.ui.IsActionExtensible; import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget; +import com.google.gwt.user.client.ui.IsWidget; import com.google.gwt.user.client.ui.SimplePanel; public interface GSpaceArmor { @@ -52,6 +53,8 @@ IsActionExtensible getHeaderToolbar(); + IsWidget getMainpanel(); + SimplePanel getPublicSpace(); ForIsWidget getSitebar(); Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java 2011-07-28 23:36:39 UTC (rev 1471) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java 2011-07-29 01:24:35 UTC (rev 1472) @@ -35,6 +35,7 @@ import com.google.gwt.user.client.ui.DockLayoutPanel; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget; +import com.google.gwt.user.client.ui.IsWidget; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.ScrollPanel; import com.google.gwt.user.client.ui.SimplePanel; @@ -75,7 +76,7 @@ @UiField FlowPanel entityToolsNorth; @UiField - VerticalPanel entityToolsSouth; + FlowPanel entityToolsSouth; private final ActionFlowPanel footerToolbar; @UiField SplitLayoutPanel groupSpace; @@ -194,6 +195,11 @@ } @Override + public IsWidget getMainpanel() { + return mainpanel; + } + + @Override public SimplePanel getPublicSpace() { return publicSpace; } Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml 2011-07-28 23:36:39 UTC (rev 1471) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml 2011-07-29 01:24:35 UTC (rev 1472) @@ -99,8 +99,7 @@ </g:FlowPanel> </g:center> <g:south size="98"> - <g:VerticalPanel width="100%" - styleName="{res.style.entityToolsSouth}" ui:field="entityToolsSouth"></g:VerticalPanel> + <g:FlowPanel styleName="{res.style.entityToolsSouth}" ui:field="entityToolsSouth" width="100%" /> </g:south> </g:DockLayoutPanel> </g:west>

1 0