Author: vjrj_ Date: 2011-10-20 03:06:02 +0200 (Thu, 20 Oct 2011) New Revision: 1563 Added: trunk/img/triptych-2011-twopages.pdf Modified: trunk/.classpath trunk/TODO trunk/img/triptych-2011-2.svg trunk/img/triptych-2011.svg trunk/pom.xml trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.java trunk/src/main/java/cc/kune/common/client/tooltip/TooltipTimers.java trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java trunk/src/main/java/cc/kune/domain/finders/I18nTranslationFinder.java trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java trunk/src/main/java/cc/kune/pspace/client/PSpaceInDevelopment.java trunk/src/main/java/cc/kune/pspace/client/PSpaceInDevelopment.ui.xml trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.ui.xml trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java trunk/src/main/java/cc/kune/wave/client/KuneWaveProfileManager.java trunk/src/test/java/cc/kune/gspace/client/viewers/FolderViewerPresenterTest.java Log: CLOSED - # 143: Home of users: index of Documents, not bio http://kune.ourproject.org/issues/ticket/143 NEW - # 144: Resolve some i18n typos (sizes, no translated, etc) http://kune.ourproject.org/issues/ticket/144 CLOSED - # 140: Store all generated files in /var/lib/kune/ http://kune.ourproject.org/issues/ticket/140 NEW - # 141: Kune client is always "connecting" in chrome/chromium http://kune.ourproject.org/issues/ticket/141 Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2011-10-19 01:26:56 UTC (rev 1562) +++ trunk/.classpath 2011-10-20 01:06:02 UTC (rev 1563) @@ -12,19 +12,19 @@ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/> <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box/0.3.2/box-0.3.2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.2/box-src-0.3.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box/0.3.3/box-0.3.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.3/box-src-0.3.3.jar"/> <classpathentry kind="var" path="M2_REPO/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/> <classpathentry kind="var" path="M2_REPO/c3p0/c3p0/0.9.1/c3p0-0.9.1.jar" sourcepath="M2_REPO/c3p0/c3p0/0.9.1/c3p0-0.9.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client/0.3.2/client-0.3.2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common/0.3.2/client-common-0.3.2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.2/client-common-src-0.3.2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.2/client-scheduler-src-0.3.2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-src/0.3.2/client-src-0.3.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client/0.3.3/client-0.3.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common/0.3.3/client-common-0.3.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.3/client-common-src-0.3.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.3/client-scheduler-src-0.3.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-src/0.3.3/client-src-0.3.3.jar"/> <classpathentry kind="var" path="M2_REPO/org/cobogw/gwt/cobogw/1.3.1/cobogw-1.3.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/common-src/0.3.2/common-src-0.3.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/common-src/0.3.3/common-src-0.3.3.jar"/> <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar" sourcepath="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/> @@ -33,8 +33,8 @@ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar" sourcepath="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/communication-src/0.3.2/communication-src-0.3.2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.2/concurrencycontrol-src-0.3.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/communication-src/0.3.3/communication-src-0.3.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.3/concurrencycontrol-src-0.3.3.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5.jar" sourcepath="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0.jar" sourcepath="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0-sources.jar"/> @@ -55,7 +55,7 @@ <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/log/gwt-log/gwt-log/3.0.1/gwt-log-3.0.1.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/gwt-util-src/0.3.2/gwt-util-src-0.3.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/gwt-util-src/0.3.3/gwt-util-src-0.3.3.jar"/> <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/voices/gwt-voices/gwt-voices/2.0.0/gwt-voices-2.0.0.jar"/> <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-all/0.5/gwtp-all-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-all/0.5/gwtp-all-0.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-clients-common/0.5/gwtp-clients-common-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-clients-common/0.5/gwtp-clients-common-0.5-sources.jar"/> @@ -110,16 +110,16 @@ <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/media-src/0.3.2/media-src-0.3.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/media-src/0.3.3/media-src-0.3.3.jar"/> <classpathentry kind="var" path="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar" sourcepath="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model-src/0.3.2/model-src-0.3.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model-src/0.3.3/model-src-0.3.3.jar"/> <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.jar" sourcepath="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16-sources.jar"/> <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.13/mysql-connector-java-5.1.13.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.15/nekohtml-1.9.15.jar" sourcepath="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.15/nekohtml-1.9.15-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar" sourcepath="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-msg/0.3.2/proto-msg-0.3.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-msg/0.3.3/proto-msg-0.3.3.jar"/> <classpathentry kind="var" path="M2_REPO/org/w3c/css/sac/1.3/sac-1.3.jar" sourcepath="M2_REPO/org/w3c/css/sac/1.3/sac-1.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-android-driver/2.6.0/selenium-android-driver-2.6.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-android-driver/2.6.0/selenium-android-driver-2.6.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-api/2.6.0/selenium-api-2.6.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-api/2.6.0/selenium-api-2.6.0-sources.jar"/> @@ -141,9 +141,9 @@ <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/> <classpathentry kind="var" path="M2_REPO/org/testng/testng/6.2.1/testng-6.2.1.jar" sourcepath="M2_REPO/org/testng/testng/6.2.1/testng-6.2.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/tigase/tigase-xmltools/3.3.5/tigase-xmltools-3.3.5.jar" sourcepath="M2_REPO/tigase/tigase-xmltools/3.3.5/tigase-xmltools-3.3.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util-src/0.3.2/util-src-0.3.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util-src/0.3.3/util-src-0.3.3.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/waveinabox-server-0.3/0.3.2/waveinabox-server-0.3-0.3.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/waveinabox-server-0.3/0.3.3/waveinabox-server-0.3-0.3.3.jar"/> <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1.jar" sourcepath="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/> <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/> Modified: trunk/TODO =================================================================== --- trunk/TODO 2011-10-19 01:26:56 UTC (rev 1562) +++ trunk/TODO 2011-10-20 01:06:02 UTC (rev 1563) @@ -12,6 +12,39 @@ nick == assigned to * SHORT-TERM (URGENT) +** TODO workaround websocket issues +Our situation when "use_socketio = false" + +| Browser w/ Websocket | Client Side | Server side | +| yes | native websocket | jetty 7.1.6 (fails) | +| no | (fails) | (fails) | + +Our situation when "use_socketio = true" + +| Browser w/ Websocket | Client Side | Server side | +| yes | native websocket | jetty 7.1.6 (fails) | +| no | socket-io.js (0.6) | socket-io-java (works) | + + +My proposal: + +| Browser w/ Websocket | Client Side | Server side | +| yes | native websocket | jetty 8 (works) | +| no | socket-io.js (0.6) | socket-io-java (works) | +*** client side +public interface WaveSocket { + interface WaveSocketCallback { + void onConnect(); + void onDisconnect(); + void onMessage(String message); + } + + void connect(); + void disconnect(); + void sendMessage(String message); +} +*** server side (see SocketIOServlet.java) + ** TODO Lists tool *** title *** description! Modified: trunk/img/triptych-2011-2.svg =================================================================== --- trunk/img/triptych-2011-2.svg 2011-10-19 01:26:56 UTC (rev 1562) +++ trunk/img/triptych-2011-2.svg 2011-10-20 01:06:02 UTC (rev 1563) @@ -17,9 +17,9 @@ inkscape:version="0.48.1 r9760" sodipodi:docname="triptych-2011-2.svg" style="display:inline" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/triptych-2011-2.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/triptych-2011-2-big.png" + inkscape:export-xdpi="180" + inkscape:export-ydpi="180"> <sodipodi:namedview inkscape:document-units="mm" pagecolor="#ffffff" @@ -29,7 +29,7 @@ inkscape:pageshadow="2" inkscape:zoom="0.92078565" inkscape:cx="526.18109" - inkscape:cy="372.04724" + inkscape:cy="285.16491" inkscape:current-layer="layer1" id="namedview8233" showgrid="false" Added: trunk/img/triptych-2011-twopages.pdf =================================================================== (Binary files differ) Property changes on: trunk/img/triptych-2011-twopages.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/img/triptych-2011.svg =================================================================== --- trunk/img/triptych-2011.svg 2011-10-19 01:26:56 UTC (rev 1562) +++ trunk/img/triptych-2011.svg 2011-10-20 01:06:02 UTC (rev 1563) @@ -17,9 +17,9 @@ inkscape:version="0.48.1 r9760" sodipodi:docname="triptych-2011.svg" style="display:inline" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/triptych-2011.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/triptych-2011-big.png" + inkscape:export-xdpi="180.02357" + inkscape:export-ydpi="180.02357"> <sodipodi:namedview inkscape:document-units="mm" pagecolor="#ffffff" @@ -29,7 +29,7 @@ inkscape:pageshadow="2" inkscape:zoom="0.90178079" inkscape:cx="526.18109" - inkscape:cy="372.04724" + inkscape:cy="505.11727" inkscape:current-layer="layer1" id="namedview8233" showgrid="false" @@ -1220,7 +1220,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-19 01:26:56 UTC (rev 1562) +++ trunk/pom.xml 2011-10-20 01:06:02 UTC (rev 1563) @@ -527,18 +527,68 @@ <!-- wave --> <dependency> <groupId>org.waveprotocol</groupId> + <artifactId>proto-msg</artifactId> + <version>0.3.3</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>gwt-util-src</artifactId> + <version>0.3.3</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava-gwt</artifactId> + <version>r09</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>box</artifactId> + <version>0.3.3</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>box-src</artifactId> + <version>0.3.3</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>model-src</artifactId> + <version>0.3.3</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>client</artifactId> + <version>0.3.3</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>client-src</artifactId> + <version>0.3.3</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>client-common</artifactId> + <version>0.3.3</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>client-common-src</artifactId> + <version>0.3.3</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> <artifactId>waveinabox-server-0.3</artifactId> - <version>0.3.2</version> + <version>0.3.3</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>proto-msg</artifactId> - <version>0.3.2</version> + <version>0.3.3</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>gwt-util-src</artifactId> - <version>0.3.2</version> + <version>0.3.3</version> </dependency> <dependency> <groupId>com.google.guava</groupId> @@ -548,67 +598,67 @@ <dependency> <groupId>org.waveprotocol</groupId> <artifactId>box</artifactId> - <version>0.3.2</version> + <version>0.3.3</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>box-src</artifactId> - <version>0.3.2</version> + <version>0.3.3</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>model-src</artifactId> - <version>0.3.2</version> + <version>0.3.3</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>client</artifactId> - <version>0.3.2</version> + <version>0.3.3</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>client-src</artifactId> - <version>0.3.2</version> + <version>0.3.3</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>client-common</artifactId> - <version>0.3.2</version> + <version>0.3.3</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>client-common-src</artifactId> - <version>0.3.2</version> + <version>0.3.3</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>common-src</artifactId> - <version>0.3.2</version> + <version>0.3.3</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>util-src</artifactId> - <version>0.3.2</version> + <version>0.3.3</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>concurrencycontrol-src</artifactId> - <version>0.3.2</version> + <version>0.3.3</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>client-scheduler-src</artifactId> - <version>0.3.2</version> + <version>0.3.3</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>media-src</artifactId> - <version>0.3.2</version> + <version>0.3.3</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>communication-src</artifactId> - <version>0.3.2</version> + <version>0.3.3</version> </dependency> <dependency> <groupId>net.sourceforge.findbugs</groupId> Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java 2011-10-19 01:26:56 UTC (rev 1562) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java 2011-10-20 01:06:02 UTC (rev 1563) @@ -176,7 +176,7 @@ @Override protected void toogleTooltipVisible() { if (tooltip != null) { - if (tooltip.isVisible()) { + if (tooltip.isVisibleOrWillBe()) { tooltip.hide(); } else { tooltip.showTemporally(); Modified: trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.java 2011-10-19 01:26:56 UTC (rev 1562) +++ trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.java 2011-10-20 01:06:02 UTC (rev 1563) @@ -151,6 +151,10 @@ return super.isShowing(); } + public boolean isVisibleOrWillBe() { + return tooltip.isVisible() || timers.showIsScheduled(); + } + private void setContent(final Widget widget) { content.clear(); content.add(widget); Modified: trunk/src/main/java/cc/kune/common/client/tooltip/TooltipTimers.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/tooltip/TooltipTimers.java 2011-10-19 01:26:56 UTC (rev 1562) +++ trunk/src/main/java/cc/kune/common/client/tooltip/TooltipTimers.java 2011-10-20 01:06:02 UTC (rev 1563) @@ -64,6 +64,10 @@ } } + public boolean showIsScheduled() { + return showTimer.isScheduled(); + } + public void showTemporally() { if (showTimer.isScheduled()) { showTimer.cancel(); Modified: trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java 2011-10-19 01:26:56 UTC (rev 1562) +++ trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java 2011-10-20 01:06:02 UTC (rev 1563) @@ -171,7 +171,7 @@ } /** - * Generates a href link + * Generates a href link (with target="_blank") * */ public static String generateHtmlLink(final String href, final String text) { Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-10-19 01:26:56 UTC (rev 1562) +++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-10-20 01:06:02 UTC (rev 1563) @@ -192,14 +192,7 @@ @Override public void onSuccess(final Void result) { - // onSignIn(userInfoDTO); NewUserRegisteredEvent.fire(getEventBus()); - // Scheduler.get().scheduleDeferred(new ScheduledCommand() { - // @Override - // public void execute() { - // stateManager.gotoHistoryToken(session.getCurrentUserInfo().getHomePage()); - // } - // }); getView().hide(); getView().unMask(); if (wantHomepage) { Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java 2011-10-19 01:26:56 UTC (rev 1562) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java 2011-10-20 01:06:02 UTC (rev 1563) @@ -23,6 +23,7 @@ import cc.kune.core.client.i18n.I18nUITranslationService; 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.I18nLanguageDTO; import cc.kune.core.shared.dto.UserInfoDTO; @@ -84,7 +85,7 @@ i18n.changeCurrentLanguage(language.getCode()); session.setCurrentLanguage(language); if (gotoHomePage) { - stateManager.gotoHistoryToken(userInfoDTO.getHomePage()); + stateManager.gotoStateToken(new StateToken(userInfoDTO.getHomePage()).clearDocument()); } else { stateManager.redirectOrRestorePreviousToken(); } Modified: trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java 2011-10-19 01:26:56 UTC (rev 1562) +++ trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java 2011-10-20 01:06:02 UTC (rev 1563) @@ -80,7 +80,7 @@ } }); } else { - NotifyUser.info(TextUtils.IN_DEVELOPMENT); + NotifyUser.info(i18n.t(TextUtils.IN_DEVELOPMENT)); NotifyUser.hideProgress(); } } Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-10-19 01:26:56 UTC (rev 1562) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-10-20 01:06:02 UTC (rev 1563) @@ -19,12 +19,14 @@ */ package cc.kune.core.client.i18n; +import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.MissingResourceException; import cc.kune.common.client.log.Log; import cc.kune.common.client.utils.Location; +import cc.kune.common.client.utils.Pair; import cc.kune.common.client.utils.TextUtils; import cc.kune.common.client.utils.WindowUtils; import cc.kune.core.client.rpcservices.I18nServiceAsync; @@ -33,6 +35,8 @@ import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.emite.browser.client.PageAssist; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.RepeatingCommand; import com.google.gwt.event.shared.EventBus; import com.google.gwt.i18n.client.DateTimeFormat; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -41,6 +45,7 @@ public class I18nUITranslationService extends I18nTranslationService { private I18nLanguageDTO currentLang; private String currentLanguageCode; + private ArrayList<Pair<String, String>> earlyTexts; private final I18nServiceAsync i18nService; private final KuneConstants kuneConstants; private HashMap<String, String> lexicon; @@ -77,6 +82,18 @@ lexicon = result; session.setCurrentLanguage(currentLang); eventBus.fireEvent(new I18nReadyEvent()); + Scheduler.get().scheduleIncremental(new RepeatingCommand() { + + @Override + public boolean execute() { + if (!earlyTexts.isEmpty()) { + final Pair<String, String> pair = earlyTexts.get(0); + save(pair.getLeft(), pair.getRight()); + earlyTexts.remove(0); + } + return !earlyTexts.isEmpty(); + } + }); } }); } @@ -124,16 +141,6 @@ // Build the new href location and then send the browser there. // $wnd.location.href = locArray[0]+"?locale="+newLocale+"#"+currHistory; $wnd.location.href = locArray[0] + "?locale=" + newLocale - - // extjs part: - // commented because the error: "Ext is not defined" - // we have to try other way - // var head = document.getElementsByTagName("head")[0]; - // var script = document.createElement('script'); - // script.id = 'localScript'; - // script.type = 'text/javascript'; - // script.src = "js/ext/locale/ext-lang-"+newLocale+".js"; - // head.appendChild(script); }-*/; public String formatDateWithLocale(final Date date) { @@ -186,6 +193,7 @@ @Override public void onSuccess(final String result) { + Log.debug("Registered in db '" + text + "' as pending translation"); } }); } @@ -221,6 +229,10 @@ } catch (final MissingResourceException e) { if (lexicon == null) { Log.warn("i18n not initialized: " + text); + if (earlyTexts == null) { + earlyTexts = new ArrayList<Pair<String, String>>(); + } + earlyTexts.add(Pair.create(text, noteForTranslators)); return text; } String translation = lexicon.get(encodeText); @@ -233,7 +245,7 @@ // Not translated and not in db, make a petition for translation if (session.isLogged()) { save(text, noteForTranslators); - Log.debug("Registering in db '" + text + "' as pending translation"); + lexicon.put(encodeText, UNTRANSLATED_VALUE); } translation = encodeText; Modified: trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-10-19 01:26:56 UTC (rev 1562) +++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-10-20 01:06:02 UTC (rev 1563) @@ -288,7 +288,7 @@ if (startingUp()) { // Starting with some token like "signin": load defContent // also - processHistoryToken(""); + processHistoryToken(SiteTokens.GROUP_HOME); // SpaceSelectEvent.fire(eventBus, Space.groupSpace); } // Fire the listener of this #hash token Modified: trunk/src/main/java/cc/kune/domain/finders/I18nTranslationFinder.java =================================================================== --- trunk/src/main/java/cc/kune/domain/finders/I18nTranslationFinder.java 2011-10-19 01:26:56 UTC (rev 1562) +++ trunk/src/main/java/cc/kune/domain/finders/I18nTranslationFinder.java 2011-10-20 01:06:02 UTC (rev 1563) @@ -33,9 +33,9 @@ public interface I18nTranslationFinder { String TRANSLATED_COUNT_QUERY = "SELECT COUNT(gt.id) FROM I18nTranslation gt WHERE gt.language = :language and text!=null"; - String TRANSLATED_QUERY = "SELECT NEW cc.kune.core.shared.dto.I18nTranslationDTO(gt.id, gt.trKey, gt.text, gt.parent.id, gt.parent.trKey, gt.parent.noteForTranslators) FROM I18nTranslation gt LEFT JOIN gt.parent gp WHERE gt.language = :language AND gt.text!=null"; + String TRANSLATED_QUERY = "SELECT NEW cc.kune.core.shared.dto.I18nTranslationDTO(gt.id, gt.trKey, gt.text, gt.parent.id, gt.parent.trKey, gt.parent.noteForTranslators) FROM I18nTranslation gt LEFT JOIN gt.parent gp WHERE gt.language = :language AND gt.text!=null ORDER BY gt.parent.trKey"; String UNTRANSLATED_COUNT_QUERY = "SELECT COUNT(gt.id) FROM I18nTranslation gt WHERE gt.language = :language and text=null"; - String UNTRANSLATED_QUERY = "SELECT NEW cc.kune.core.shared.dto.I18nTranslationDTO(gt.id, gt.trKey, gt.text, gt.parent.id, gt.parent.trKey, gt.parent.noteForTranslators) FROM I18nTranslation gt LEFT JOIN gt.parent gp WHERE gt.language = :language AND gt.text=null"; + String UNTRANSLATED_QUERY = "SELECT NEW cc.kune.core.shared.dto.I18nTranslationDTO(gt.id, gt.trKey, gt.text, gt.parent.id, gt.parent.trKey, gt.parent.noteForTranslators) FROM I18nTranslation gt LEFT JOIN gt.parent gp WHERE gt.language = :language AND gt.text=null ORDER BY gt.parent.trKey"; @Finder(query = "SELECT gt FROM I18nTranslation gt JOIN gt.language gl WHERE gl.code = :language", returnAs = ArrayList.class) public List<I18nTranslation> findByLanguage(@Named("language") final String language); Modified: trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java 2011-10-19 01:26:56 UTC (rev 1562) +++ trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java 2011-10-20 01:06:02 UTC (rev 1563) @@ -24,6 +24,6 @@ public interface EntityOptionsView extends AbstractTabbedDialogView { int HEIGHT = 270; - int WIDTH = 440; - int WIDTH_WOUT_MARGIN = 420; + int WIDTH = 500; + int WIDTH_WOUT_MARGIN = 480; } Modified: trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java 2011-10-19 01:26:56 UTC (rev 1562) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java 2011-10-20 01:06:02 UTC (rev 1563) @@ -105,7 +105,7 @@ @Override public void onClick(final ClickEvent event) { - NotifyUser.info(TextUtils.IN_DEVELOPMENT); + NotifyUser.info(i18n.t(TextUtils.IN_DEVELOPMENT)); } }; for (int i = 1; i <= 6; i++) { Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java 2011-10-19 01:26:56 UTC (rev 1562) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java 2011-10-20 01:06:02 UTC (rev 1563) @@ -9,6 +9,7 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.ContainerDTO; import cc.kune.core.shared.dto.ContainerSimpleDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.GotoTokenAction; import com.google.gwt.event.shared.EventBus; @@ -24,16 +25,18 @@ private final Provider<FolderViewerDropController> dropController; private final EventBus eventBus; + private final I18nTranslationService i18n; private final IconsRegistry iconsRegistry; private final StateManager stateManager; @Inject public PathToolbarUtils(final Provider<FolderViewerDropController> dropController, final StateManager stateManager, final ContentCapabilitiesRegistry capabilitiesRegistry, - final EventBus eventBus) { + final EventBus eventBus, final I18nTranslationService i18n) { this.dropController = dropController; this.stateManager = stateManager; this.eventBus = eventBus; + this.i18n = i18n; iconsRegistry = capabilitiesRegistry.getIconsRegistry(); } @@ -72,7 +75,8 @@ private ButtonDescriptor createPathButton(final ContainerSimpleDTO container, final int length, final int pos) { final String style = calculateStyle(pos, length); - final String title = container.getName(); + final String name = container.getName(); + final String title = pos == 0 ? i18n.t(name) : name; final ButtonDescriptor btn = new ButtonDescriptor(new GotoTokenAction( iconsRegistry.getContentTypeIcon(container.getTypeId()), TextUtils.ellipsis(title, 15), container.getStateToken(), style, stateManager, eventBus)); Modified: trunk/src/main/java/cc/kune/pspace/client/PSpaceInDevelopment.java =================================================================== --- trunk/src/main/java/cc/kune/pspace/client/PSpaceInDevelopment.java 2011-10-19 01:26:56 UTC (rev 1562) +++ trunk/src/main/java/cc/kune/pspace/client/PSpaceInDevelopment.java 2011-10-20 01:06:02 UTC (rev 1563) @@ -19,6 +19,7 @@ */ package cc.kune.pspace.client; +import cc.kune.common.client.utils.TextUtils; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.GroupChangedEvent; @@ -27,6 +28,7 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; @@ -34,6 +36,7 @@ import com.google.gwt.user.client.ui.AbstractImagePrototype; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.HTMLPanel; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; @@ -59,13 +62,18 @@ FlowPanel headerPanel; private final CoreResources images; @UiField + Label inDevel; + @UiField + HTMLPanel inDevelSupport; + @UiField FlowPanel mainPanel; @UiField FlowPanel photoPanel; @Inject public PSpaceInDevelopment(final StateManager stateManager, final CoreResources images, - final Session session, final Provider<FileDownloadUtils> downloadProvider) { + final Session session, final Provider<FileDownloadUtils> downloadProvider, + final I18nTranslationService i18n) { this.images = images; this.downloadProvider = downloadProvider; initWidget(uiBinder.createAndBindUi(this)); @@ -75,6 +83,10 @@ setGroupLogo(session.getCurrentState().getGroup()); } }); + inDevel.setText(i18n.t("Right now, the public web space of this group, it's under construction")); + inDevelSupport.getElement().setInnerHTML( + i18n.t("[%s] the development", + TextUtils.generateHtmlLink("http://kune.ourproject.org/join/", i18n.t("Please support")))); } void setGroupLogo(final GroupDTO group) { Modified: trunk/src/main/java/cc/kune/pspace/client/PSpaceInDevelopment.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/pspace/client/PSpaceInDevelopment.ui.xml 2011-10-19 01:26:56 UTC (rev 1562) +++ trunk/src/main/java/cc/kune/pspace/client/PSpaceInDevelopment.ui.xml 2011-10-20 01:06:02 UTC (rev 1563) @@ -42,6 +42,14 @@ width: 100%; } + .contentHtmlSupport { + font-size: 32px; + color: #c92106; + float: right; + width: 510px; + padding: 30px; + } + .contentHtml { font-size: 32px; color: #c92106; @@ -51,7 +59,7 @@ padding: 30px; } - .contentHtml a { + .contentHtmlSupport a { color: #912312; } @@ -69,26 +77,17 @@ <g:FlowPanel ui:field="container" addStyleNames="{style.container}"> <g:FlowPanel ui:field="mainPanel" addStyleNames="{style.mainPanel}"> <g:FlowPanel ui:field="headerPanel" height="70px"> - <g:Image ui:field="entityLogo" addStyleNames="{style.entityLogo}" - /> - <g:Label text="" ui:field="entityName" addStyleNames="{style.entityName}" /> + <g:Image ui:field="entityLogo" addStyleNames="{style.entityLogo}"/> + <g:Label text="" ui:field="entityName" addStyleNames="{style.entityName}"/> </g:FlowPanel> <g:FlowPanel ui:field="photoPanel" addStyleNames="{style.photoPanel}"> <g:InlineLabel addStyleNames="{style.photo} {style.right}" - ui:field="logo" /> + ui:field="logo"/> </g:FlowPanel> <g:FlowPanel ui:field="contentPanel"> - <g:HTMLPanel addStyleNames="{style.contentHtml}"> - Right now, the public web space of this group, it's under - construction - <br /> - <br /> - <a href='http://kune.ourproject.org/join/' target='_blank'>Please - support</a> - the development - <br /> - <br /> - </g:HTMLPanel> + <g:Label addStyleNames="{style.contentHtml}" ui:field="inDevel"/> + <g:HTMLPanel addStyleNames="{style.contentHtmlSupport}" + ui:field="inDevelSupport"/> </g:FlowPanel> </g:FlowPanel> </g:FlowPanel> Modified: trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.ui.xml 2011-10-19 01:26:56 UTC (rev 1562) +++ trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.ui.xml 2011-10-20 01:06:02 UTC (rev 1563) @@ -18,8 +18,8 @@ <g:HTMLPanel ui:field="mask" styleName="k-publicspace-mask" width="100%" height="100%" /> </g:layer> - <g:layer left="50px" width="250px" height="100px" bottom="50px"> - <g:FlowPanel width="250px" height="100px" ui:field="messagePanel" + <g:layer left="55px" width="300px" height="150px" bottom="50px"> + <g:FlowPanel width="300px" ui:field="messagePanel" addStyleNames="k-publicspace-panel"> <g:SimplePanel addStyleNames="k-publicspace-icon"> <g:Image ui:field="icon" /> Modified: trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java 2011-10-19 01:26:56 UTC (rev 1562) +++ trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java 2011-10-20 01:06:02 UTC (rev 1563) @@ -94,19 +94,19 @@ } private void setContentNotPublic() { - getView().getTitle().setText(i18n.t("Not Published yet") + TextUtils.IN_DEVELOPMENT_P); + getView().getTitle().setText(i18n.t("Not Published yet") + i18n.t(TextUtils.IN_DEVELOPMENT_P)); getView().getDescription().setText( i18n.t("This is only a preview of how this webpage would look like to the general public on the internet.")); } private void setContentNotPublicable() { - getView().getTitle().setText(i18n.t("Not Publisable") + TextUtils.IN_DEVELOPMENT_P); + getView().getTitle().setText(i18n.t("Not Publisable") + i18n.t(TextUtils.IN_DEVELOPMENT_P)); getView().getDescription().setText(i18n.t("This page is not publisable")); getView().setContentGotoPublicUrl("about:blank"); } private void setContentPublic() { - getView().getTitle().setText(i18n.t("Preview") + TextUtils.IN_DEVELOPMENT_P); + getView().getTitle().setText(i18n.t("Preview") + i18n.t(TextUtils.IN_DEVELOPMENT_P)); getView().getDescription().setText( i18n.t("This is only a preview of how this page would look like to the general public on the internet.")); } Modified: trunk/src/main/java/cc/kune/wave/client/KuneWaveProfileManager.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/KuneWaveProfileManager.java 2011-10-19 01:26:56 UTC (rev 1562) +++ trunk/src/main/java/cc/kune/wave/client/KuneWaveProfileManager.java 2011-10-20 01:06:02 UTC (rev 1563) @@ -54,7 +54,7 @@ final String address = profile.getAddress(); if (address.equals(localDomain) || address.equals("@")) { updateProfileAvatar(profile, FileConstants.WORLD_AVATAR_IMAGE); - } else if (address.contains(Session.get().getDomain())) { + } else if (Session.get().getDomain() != null && address.contains(Session.get().getDomain())) { updateProfileAvatar(profile, downloadUtils.getUserAvatar(address.split("@")[0])); } } Modified: trunk/src/test/java/cc/kune/gspace/client/viewers/FolderViewerPresenterTest.java =================================================================== --- trunk/src/test/java/cc/kune/gspace/client/viewers/FolderViewerPresenterTest.java 2011-10-19 01:26:56 UTC (rev 1562) +++ trunk/src/test/java/cc/kune/gspace/client/viewers/FolderViewerPresenterTest.java 2011-10-20 01:06:02 UTC (rev 1563) @@ -37,7 +37,8 @@ @Before public void before() { - presenter = new PathToolbarUtils(null, null, Mockito.mock(ContentCapabilitiesRegistry.class), null); + presenter = new PathToolbarUtils(null, null, Mockito.mock(ContentCapabilitiesRegistry.class), null, + null); } @Test