kune-commits

Download

[email protected]

1587 discussions

r1608 - in trunk: . img src/main/java/cc/kune/core/server src/main/java/cc/kune/core/server/i18n src/main/java/cc/kune/core/server/init src/main/java/cc/kune/core/server/manager/impl src/main/webapp src/main/webapp/WEB-INF
by Vicente J. Ruiz Jurado 16 Nov '11

16 Nov '11

Author: vjrj_ Date: 2011-11-16 11:13:38 +0100 (Wed, 16 Nov 2011) New Revision: 1608 Added: trunk/img/kunecc-logo-16px.png trunk/img/logo-big-home-kunecc.png Removed: trunk/src/main/webapp/WEB-INF/gems/ trunk/src/main/webapp/WEB-INF/publicspace/ trunk/src/main/webapp/WEB-INF/web.xml.wiab-int-sample trunk/src/main/webapp/images trunk/src/main/webapp/javascripts trunk/src/main/webapp/stylesheets trunk/src/main/webapp/templates Modified: trunk/INSTALL trunk/TODO trunk/TROUBLESHOOT trunk/img/kune-logos.svg trunk/src/main/java/cc/kune/core/server/KuneContainerListener.java trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java trunk/src/main/java/cc/kune/core/server/manager/impl/DefaultManager.java Log: NEW - # 147: Add again the multimedia gallery tool http://kune.ourproject.org/issues/ticket/147 NEW - # 159: When Drag&Drop or Renaming, clear Content Cache http://kune.ourproject.org/issues/ticket/159 Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/INSTALL 2011-11-16 10:13:38 UTC (rev 1608) @@ -71,6 +71,8 @@ # (in the trunk directory) mvn compile -Dliquibase.should.run=false && mvn gwt:compile +NOTE: If you change these db passwords after compiling, you have to repeat the "mvn compile" because if not, probably you are using a old persistence.xml. See TROUBLESHOOT for more details. + ===Configure upload directory=== sudo mkdir -p /var/lib/kune/uploads/ @@ -184,6 +186,9 @@ Works in most of the openfire server versions after 3.5.1. See emite (our xmpp software) Server Compatibility: https://code.google.com/p/emite/wiki/ServerAndClientsCompatibility +If your openfire don't start, chech the JAVA_HOME in /etc/init.d/openfire whe usually add this line there: + t=/usr/lib/jvm/java-6-openjdk && test -d $t && JAVA_HOME=$t + Connect to openfire administration: http://localhost:9090/ If you dont want to change the settings and use kune only for developing, use "localhost" as domain name. (Change kune.chat.domain in <trunk>/src/main/resources/kune.properties if you want to use other values). Modified: trunk/TODO =================================================================== --- trunk/TODO 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/TODO 2011-11-16 10:13:38 UTC (rev 1608) @@ -12,6 +12,8 @@ nick == assigned to * SHORT-TERM (URGENT) +** Reu FLOSS Ocuppy 10pm EST + DEADLINE: <2011-11-16 mié 9pm EST> ** group.inexistentTool nasty error ** calendar support *** gwt-cal + http://ical4j.sourceforge.net/introduction.html Modified: trunk/TROUBLESHOOT =================================================================== --- trunk/TROUBLESHOOT 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/TROUBLESHOOT 2011-11-16 10:13:38 UTC (rev 1608) @@ -67,8 +67,10 @@ == Mysql: Caused by: java.sql.SQLException: Access denied for user 'kune'@'localhost' (using password: YES) == -Check that the password you have use in the database creation it's the same like the src/main/resources/META-INF/persistence.xml. If it's wrong maybe you have to remove the mysql user (DROP USER) and repeat the GRANT senteces of the INSTALL. +Check that the password you have use in the database creation it's the same like the src/main/resources/META-INF/persistence.xml. If it's wrong maybe you have to remove the mysql user (DROP USER) and repeat the GRANT sentences of the INSTALL. +Also, be sure you do a "mvn compile" if you change the persistence.xml file to not use the old one. + If you have this problem with openfire it's not enough to change the password in openfire.xml because probably it's already stored in the ofProperty openfire table and you need to change the password there. == Eclipse & GWT == Modified: trunk/img/kune-logos.svg =================================================================== --- trunk/img/kune-logos.svg 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/img/kune-logos.svg 2011-11-16 10:13:38 UTC (rev 1608) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?>  + <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" @@ -13,10 +14,10 @@ height="297mm" id="svg2531" sodipodi:version="0.32" - inkscape:version="0.46" - sodipodi:docbase="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img" + inkscape:version="0.48.2 r9819" sodipodi:docname="kune-logos.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + version="1.1"> <defs id="defs2533"> <inkscape:perspective @@ -87,18 +88,28 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="521.44602" - inkscape:cy="133.64281" + inkscape:cx="875.92904" + inkscape:cy="-80.17421" inkscape:document-units="px" inkscape:current-layer="layer1" - inkscape:window-width="1280" + inkscape:window-width="1078" inkscape:window-height="729" inkscape:window-x="0" inkscape:window-y="25" showguides="true" inkscape:guide-bbox="true" inkscape:guide-points="true" - showgrid="false" /> + showgrid="false" + inkscape:window-maximized="0"> + <sodipodi:guide + orientation="0,1" + position="830.76137,26.355188" + id="guide3703" /> + <sodipodi:guide + orientation="0,1" + position="856.74146,-93.746373" + id="guide3723" /> + </sodipodi:namedview> <metadata id="metadata2536"> <rdf:RDF> @@ -107,6 +118,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -747,47 +759,50 @@ d="M 372.87905,411.27704 L 437.81346,411.27704" style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> </g> + <path + inkscape:connector-curvature="0" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + d="m 245.82057,974.99995 c -0.74303,0 -1.45723,0.003 -2.17391,0.0494 -0.0669,0.0136 -0.13033,0.0368 -0.19763,0.0494 -0.66715,0.12461 -1.32536,0.23087 -2.02569,0.24704 -0.097,0.0136 -0.19995,-0.0145 -0.29644,0 -5.71605,0.86055 -10.54554,3.34248 -14.42688,7.46047 -4.53271,4.78706 -6.81817,10.52182 -6.81818,17.19368 0,6.74676 2.28548,12.52046 6.81818,17.29246 4.90667,5.1461 11.2818,7.7075 19.12055,7.7076 4.15869,-10e-5 8.15681,-1.0333 11.95652,-3.1127 3.79965,-2.0195 7.10345,-4.8778 9.93083,-8.498 l -8.54743,-4.7431 c -3.68005,4.9067 -8.20158,7.3617 -13.58695,7.3617 -3.73988,0 -7.0931,-1.2132 -9.98024,-3.6068 -2.93207,-2.3935 -4.39727,-5.3089 -4.39723,-8.7944 l 39.08102,0 0,-1.9763 c -4e-5,-8.45207 -2.86291,-15.2201 -8.54743,-20.30635 -4.78705,-4.23347 -10.0899,-6.32405 -15.90909,-6.32411 z m -181.719366,0.34585 0,18.92292 -6.62055,0 0,9.68378 6.62055,0 0,19.7629 10.07905,0 0,-19.7629 6.07708,0 12.40119,19.7629 11.956516,0 -16.650196,-25.09885 15.909086,-22.33202 -12.203556,0 -12.30237,17.98419 -5.18775,0 0,-18.92292 -10.07905,0 z m 123.666006,0 c -1.73503,0.30966 -3.35171,0.81366 -4.8419,1.58103 -2.5132,1.34638 -4.49729,3.12201 -5.97826,5.33597 l 0,-5.97827 -10.12846,0 0,47.43087 10.12846,0 0,-26.58106 c -1e-5,-3.79965 1.07224,-6.71507 3.21147,-8.79447 2.15413,-2.07932 4.88507,-3.11262 8.25098,-3.11265 3.56032,3e-5 6.34065,0.95537 8.3004,2.91502 1.95964,1.95972 2.91496,5.03102 2.91502,9.18973 l 0,26.38343 10.12846,0 0,-28.60675 c -5e-5,-5.8192 -1.77567,-10.62715 -5.33597,-14.42688 -2.67029,-2.84973 -5.76,-4.62351 -9.28854,-5.33597 l -7.36166,0 z m -76.77865,0.93873 0,27.47037 c -2e-5,6.4326 2.16853,11.6334 6.52173,15.6127 4.03904,3.7398 9.04189,5.6323 14.92095,5.6324 5.93886,-10e-5 10.91633,-1.8926 14.97036,-5.6324 4.35315,-3.9793 6.52169,-9.1801 6.52174,-15.6127 l 0,-27.47037 -10.12846,0 0,26.58107 c -5e-5,3.5005 -1.0723,6.3484 -3.21146,8.5474 -2.21404,2.2738 -4.906,3.4091 -8.15218,3.4091 -3.12654,0 -5.83938,-1.1502 -8.05336,-3.4091 -2.19905,-2.2738 -3.2609,-5.1067 -3.26087,-8.5474 l 0,-26.58107 -10.12845,0 z m 133.54743,7.80633 c 3.306,5e-5 6.19285,0.92683 8.64624,2.7668 2.37851,1.88491 4.13014,4.63084 5.23716,8.25099 l -27.22332,0 c 0.79283,-3.48552 2.43792,-6.19246 4.8913,-8.15218 2.37853,-1.89981 5.18745,-2.86556 8.44862,-2.86561 z" + id="path2689" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854" /> <g - id="g2737"> + id="g2691" + transform="matrix(0.347343,0,0,0.346901,262.945,672.94005)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854"> <path - inkscape:export-ydpi="399.59854" - inkscape:export-xdpi="399.59854" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" - id="path2689" - d="M 298.07933,890.09763 C 297.3363,890.09763 296.6221,890.10025 295.90542,890.14704 C 295.83851,890.16067 295.77509,890.18388 295.70779,890.19644 C 295.04064,890.32105 294.38243,890.42731 293.6821,890.44348 C 293.58509,890.45708 293.48215,890.42895 293.38566,890.44348 C 287.66961,891.30403 282.84012,893.78596 278.95878,897.90395 C 274.42607,902.69101 272.14061,908.42577 272.1406,915.09763 C 272.1406,921.84435 274.42608,927.61807 278.95878,932.39012 C 283.86545,937.53616 290.24058,940.09761 298.07933,940.09763 C 302.23802,940.09761 306.23614,939.06435 310.03585,936.98498 C 313.8355,934.96547 317.1393,932.10715 319.96668,928.48696 L 311.41925,923.74388 C 307.7392,928.65056 303.21767,931.10554 297.8323,931.10554 C 294.09242,931.10554 290.7392,929.89235 287.85206,927.49882 C 284.91999,925.10531 283.45479,922.18991 283.45483,918.70435 L 322.53585,918.70435 L 322.53585,916.72806 C 322.53581,908.27602 319.67294,901.50799 313.98842,896.42174 C 309.20137,892.18827 303.89852,890.09769 298.07933,890.09763 z M 116.35996,890.44348 L 116.35996,909.3664 L 109.73941,909.3664 L 109.73941,919.0502 L 116.35996,919.0502 L 116.35996,938.81305 L 126.43901,938.81305 L 126.43901,919.0502 L 132.51609,919.0502 L 144.91728,938.81305 L 156.8738,938.81305 L 140.2236,913.71423 L 156.13269,891.38221 L 143.92913,891.38221 L 131.62676,909.3664 L 126.43901,909.3664 L 126.43901,890.44348 L 116.35996,890.44348 z M 240.02597,890.44348 C 238.29094,890.75314 236.67426,891.25714 235.18407,892.02451 C 232.67087,893.37089 230.68678,895.14652 229.20581,897.36048 L 229.20581,891.38221 L 219.07735,891.38221 L 219.07735,938.81305 L 229.20581,938.81305 L 229.20581,912.23202 C 229.2058,908.43237 230.27805,905.51695 232.41728,903.43755 C 234.57141,901.35823 237.30235,900.32493 240.66826,900.3249 C 244.22858,900.32493 247.00891,901.28027 248.96866,903.23992 C 250.9283,905.19964 251.88362,908.27094 251.88368,912.42965 L 251.88368,938.81305 L 262.01214,938.81305 L 262.01214,910.20633 C 262.01209,904.38713 260.23647,899.57918 256.67617,895.77945 C 254.00588,892.92972 250.91617,891.15594 247.38763,890.44348 L 240.02597,890.44348 z M 163.24732,891.38221 L 163.24732,918.85257 C 163.2473,925.28514 165.41585,930.48601 169.76905,934.46522 C 173.80809,938.20508 178.81094,940.09761 184.69,940.09763 C 190.62886,940.09761 195.60633,938.20508 199.66036,934.46522 C 204.01351,930.48601 206.18205,925.28514 206.1821,918.85257 L 206.1821,891.38221 L 196.05364,891.38221 L 196.05364,917.96324 C 196.05359,921.46376 194.98134,924.31165 192.84218,926.51067 C 190.62814,928.78452 187.93618,929.91976 184.69,929.91976 C 181.56346,929.91978 178.85062,928.76957 176.63664,926.51067 C 174.43759,924.23686 173.37574,921.40394 173.37577,917.96324 L 173.37577,891.38221 L 163.24732,891.38221 z M 296.79475,899.18854 C 300.10075,899.18859 302.9876,900.11537 305.44099,901.95534 C 307.8195,903.84025 309.57113,906.58618 310.67815,910.20633 L 283.45483,910.20633 C 284.24766,906.72081 285.89275,904.01387 288.34613,902.05415 C 290.72466,900.15434 293.53358,899.18859 296.79475,899.18854 z" - style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem" /> - <g - inkscape:export-ydpi="399.59854" - inkscape:export-xdpi="399.59854" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" - transform="matrix(0.347343,0,0,0.346901,34.203754,588.03773)" - id="g2691"> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path2693" - d="M 60.321717,411.99998 L 437.33633,411.99998" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path2695" - d="M 252.61203,788.60332 L 252.61203,411.59154" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path2697" - d="M 252.86937,597.15755 L 629.88177,597.15755" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path2699" - d="M 437.45588,596.97447 L 437.45588,219.95956" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path2701" - d="M 372.87905,411.27704 L 437.81346,411.27704" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> - </g> + inkscape:connector-curvature="0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" + id="path2693" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" + id="path2695" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" + id="path2697" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" + id="path2699" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" + id="path2701" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> </g> <text xml:space="preserve" @@ -1004,5 +1019,417 @@ id="tspan2601" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#999999;font-family:Emblem;-inkscape-font-specification:Emblem">lpha</tspan></tspan></text> </g> + <text + sodipodi:linespacing="100%" + id="text3654" + y="1023.4772" + x="-438.89853" + style="font-size:91.92100525px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" + xml:space="preserve" + transform="scale(-1,1)"><tspan + y="1023.4772" + x="-438.89853" + id="tspan3656" + sodipodi:role="line">cc</tspan></text> + <path + inkscape:export-ydpi="399.59854" + inkscape:export-xdpi="399.59854" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + id="path3705" + d="m 245.82057,1095 c -0.74303,0 -1.45723,0 -2.17391,0.049 -0.0669,0.014 -0.13033,0.037 -0.19763,0.049 -0.66715,0.1247 -1.32536,0.2309 -2.02569,0.2471 -0.097,0.014 -0.19995,-0.014 -0.29644,0 -5.71605,0.8605 -10.54554,3.3425 -14.42688,7.4605 -4.53271,4.787 -6.81817,10.5218 -6.81818,17.1936 0,6.7468 2.28548,12.5205 6.81818,17.2925 4.90667,5.1461 11.2818,7.7075 19.12055,7.7076 4.15869,-10e-5 8.15681,-1.0333 11.95652,-3.1127 3.79965,-2.0195 7.10345,-4.8778 9.93083,-8.498 l -8.54743,-4.7431 c -3.68005,4.9067 -8.20158,7.3617 -13.58695,7.3617 -3.73988,0 -7.0931,-1.2132 -9.98024,-3.6068 -2.93207,-2.3935 -4.39727,-5.3089 -4.39723,-8.7944 l 39.08102,0 0,-1.9763 c -4e-5,-8.4521 -2.86291,-15.2201 -8.54743,-20.3064 -4.78705,-4.2334 -10.0899,-6.324 -15.90909,-6.3241 z m -181.719366,0.3458 0,18.9229 -6.62055,0 0,9.6838 6.62055,0 0,19.7629 10.07905,0 0,-19.7629 6.07708,0 12.40119,19.7629 11.956516,0 -16.650196,-25.0989 15.909086,-22.332 -12.203556,0 -12.30237,17.9842 -5.18775,0 0,-18.9229 -10.07905,0 z m 123.666006,0 c -1.73503,0.3097 -3.35171,0.8137 -4.8419,1.581 -2.5132,1.3464 -4.49729,3.122 -5.97826,5.336 l 0,-5.9783 -10.12846,0 0,47.4309 10.12846,0 0,-26.5811 c -1e-5,-3.7996 1.07224,-6.715 3.21147,-8.7944 2.15413,-2.0794 4.88507,-3.1126 8.25098,-3.1127 3.56032,10e-5 6.34065,0.9554 8.3004,2.915 1.95964,1.9598 2.91496,5.0311 2.91502,9.1898 l 0,26.3834 10.12846,0 0,-28.6067 c -5e-5,-5.8193 -1.77567,-10.6272 -5.33597,-14.4269 -2.67029,-2.8498 -5.76,-4.6235 -9.28854,-5.336 l -7.36166,0 z m -76.77865,0.9387 0,27.4704 c -2e-5,6.4326 2.16853,11.6334 6.52173,15.6127 4.03904,3.7398 9.04189,5.6323 14.92095,5.6324 5.93886,-10e-5 10.91633,-1.8926 14.97036,-5.6324 4.35315,-3.9793 6.52169,-9.1801 6.52174,-15.6127 l 0,-27.4704 -10.12846,0 0,26.5811 c -5e-5,3.5005 -1.0723,6.3484 -3.21146,8.5474 -2.21404,2.2738 -4.906,3.4091 -8.15218,3.4091 -3.12654,0 -5.83938,-1.1502 -8.05336,-3.4091 -2.19905,-2.2738 -3.2609,-5.1067 -3.26087,-8.5474 l 0,-26.5811 -10.12845,0 z m 133.54743,7.8064 c 3.306,0 6.19285,0.9268 8.64624,2.7668 2.37851,1.8849 4.13014,4.6308 5.23716,8.2509 l -27.22332,0 c 0.79283,-3.4855 2.43792,-6.1924 4.8913,-8.1521 2.37853,-1.8998 5.18745,-2.8656 8.44862,-2.8656 z" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + inkscape:connector-curvature="0" /> + <g + inkscape:export-ydpi="399.59854" + inkscape:export-xdpi="399.59854" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + transform="matrix(0.347343,0,0,0.346901,262.945,792.94005)" + id="g3707"> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3709" + d="m 60.321717,411.99998 377.014613,0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3711" + d="m 252.61203,788.60332 0,-377.01178" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3713" + d="m 252.86937,597.15755 377.0124,0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3715" + d="m 437.45588,596.97447 0,-377.01491" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3717" + d="m 372.87905,411.27704 64.93441,0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + </g> + <text + transform="scale(-1,1)" + xml:space="preserve" + style="font-size:66.18188477px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" + x="-412.51364" + y="1143.8353" + id="text3719" + sodipodi:linespacing="100%"><tspan + sodipodi:role="line" + id="tspan3721" + x="-412.51364" + y="1143.8353">cc</tspan></text> + <path + inkscape:connector-curvature="0" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + d="m 117.74846,1199.0003 c -0.23776,0 -0.4663,0 -0.69564,0.016 -0.0214,0 -0.0417,0.012 -0.0632,0.016 -0.21348,0.04 -0.42411,0.074 -0.64821,0.079 -0.031,0 -0.064,-0 -0.0949,0 -1.8291,0.2753 -3.37452,1.0696 -4.61653,2.3873 -1.45044,1.5318 -2.18177,3.3669 -2.18178,5.5019 0,2.1589 0.73134,4.0065 2.18178,5.5335 1.57011,1.6467 3.61012,2.4663 6.11848,2.4664 1.33076,-10e-5 2.61014,-0.3307 3.82603,-0.9961 1.21587,-0.6462 2.27307,-1.5608 3.17781,-2.7193 l -2.73513,-1.5178 c -1.1776,1.5702 -2.62446,2.3558 -4.34776,2.3558 -1.19674,0 -2.26975,-0.3883 -3.19362,-1.1542 -0.93825,-0.7659 -1.40711,-1.6988 -1.40709,-2.8142 l 12.50572,0 0,-0.6324 c -1e-5,-2.7046 -0.91611,-4.8703 -2.73513,-6.4979 -1.53183,-1.3547 -3.22872,-2.0237 -5.09083,-2.0237 z m -58.149264,0.1106 0,6.0552 -2.118542,0 0,3.0988 2.118542,0 0,6.324 3.225244,0 0,-6.324 1.944635,0 3.968317,6.324 3.826024,0 -5.327977,-8.0315 5.090826,-7.1461 -3.905076,0 -3.936695,5.7548 -1.660054,0 0,-6.0552 -3.225244,0 z m 39.572489,0 c -0.555201,0.099 -1.07253,0.2604 -1.549383,0.5059 -0.804211,0.4309 -1.43911,0.999 -1.913013,1.7075 l 0,-1.913 -3.241055,0 0,15.1776 3.241055,0 0,-8.5058 c -3e-6,-1.2158 0.343111,-2.1487 1.027654,-2.8141 0.689311,-0.6654 1.563197,-0.9961 2.640271,-0.9961 1.139286,0 2.028976,0.3057 2.656086,0.9328 0.62707,0.6271 0.93277,1.6099 0.93279,2.9407 l 0,8.4425 3.24106,0 0,-9.154 c -2e-5,-1.8621 -0.56821,-3.4006 -1.70749,-4.6165 -0.85448,-0.9119 -1.84317,-1.4795 -2.97228,-1.7075 l -2.355695,0 z m -24.568775,0.3004 0,8.7904 c -6e-6,2.0584 0.693918,3.7226 2.08692,4.996 1.292472,1.1967 2.893359,1.8023 4.774628,1.8023 1.900405,0 3.493169,-0.6056 4.790438,-1.8023 1.392986,-1.2734 2.086908,-2.9376 2.086924,-4.996 l 0,-8.7904 -3.241056,0 0,8.5058 c -1.6e-5,1.1201 -0.34313,2.0315 -1.02765,2.7351 -0.708482,0.7276 -1.569895,1.0909 -2.608656,1.0909 -1.000477,0 -1.868572,-0.368 -2.577034,-1.0909 -0.703685,-0.7276 -1.043471,-1.6341 -1.043462,-2.7351 l 0,-8.5058 -3.241052,0 z m 42.73449,2.498 c 1.05791,0 1.98168,0.2966 2.76676,0.8854 0.76111,0.6031 1.32162,1.4818 1.67586,2.6402 l -8.71132,0 c 0.2537,-1.1153 0.78012,-1.9815 1.56519,-2.6086 0.76112,-0.608 1.65996,-0.917 2.70351,-0.917 z" + id="path3725" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854" /> + <g + id="g3727" + transform="matrix(0.11114798,0,0,0.11100654,123.22819,1102.3426)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854"> + <path + inkscape:connector-curvature="0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" + id="path3729" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" + id="path3731" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" + id="path3733" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" + id="path3735" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" + id="path3737" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + </g> + <text + sodipodi:linespacing="100%" + id="text3739" + y="1214.6273" + x="-171.08939" + style="font-size:21.17786407px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" + xml:space="preserve" + transform="scale(-1,1)"><tspan + y="1214.6273" + x="-171.08939" + id="tspan3741" + sodipodi:role="line">cc</tspan></text> + <g + id="g3808" + transform="translate(-124,22)"> + <g + transform="matrix(0.31999488,0,0,0.31999488,389.01174,869.40895)" + id="g3788"> + <path + inkscape:connector-curvature="0" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + d="m 818.32888,1096.181 c -0.74303,0 -1.45723,0 -2.17391,0.049 -0.0669,0.014 -0.13033,0.037 -0.19763,0.049 -0.66715,0.1246 -1.32536,0.2309 -2.02569,0.247 -0.097,0.014 -0.19995,-0.014 -0.29644,0 -5.71605,0.8606 -10.54554,3.3425 -14.42688,7.4605 -4.53271,4.7871 -6.81817,10.5218 -6.81818,17.1937 0,6.7467 2.28548,12.5204 6.81818,17.2925 4.90667,5.146 11.2818,7.7075 19.12055,7.7075 4.15869,0 8.15681,-1.0333 11.95652,-3.1127 3.79965,-2.0195 7.10345,-4.8778 9.93083,-8.498 l -8.54743,-4.7431 c -3.68005,4.9067 -8.20158,7.3617 -13.58695,7.3617 -3.73988,0 -7.0931,-1.2132 -9.98024,-3.6067 -2.93207,-2.3935 -4.39727,-5.3089 -4.39723,-8.7945 l 39.08102,0 0,-1.9763 c -4e-5,-8.452 -2.86291,-15.2201 -8.54743,-20.3063 -4.78705,-4.2335 -10.0899,-6.324 -15.90909,-6.3241 z m -181.71937,0.3459 0,18.9229 -6.62055,0 0,9.6838 6.62055,0 0,19.7628 10.07905,0 0,-19.7628 6.07708,0 12.40119,19.7628 11.95652,0 -16.6502,-25.0988 15.90909,-22.332 -12.20356,0 -12.30237,17.9842 -5.18775,0 0,-18.9229 -10.07905,0 z m 123.66601,0 c -1.73503,0.3096 -3.35171,0.8136 -4.8419,1.581 -2.5132,1.3464 -4.49729,3.122 -5.97826,5.336 l 0,-5.9783 -10.12846,0 0,47.4308 10.12846,0 0,-26.581 c -1e-5,-3.7997 1.07224,-6.7151 3.21147,-8.7945 2.15413,-2.0793 4.88507,-3.1126 8.25098,-3.1126 3.56032,0 6.34065,0.9553 8.3004,2.915 1.95964,1.9597 2.91496,5.031 2.91502,9.1897 l 0,26.3834 10.12846,0 0,-28.6067 c -5e-5,-5.8192 -1.77567,-10.6272 -5.33597,-14.4269 -2.67029,-2.8497 -5.76,-4.6235 -9.28854,-5.336 l -7.36166,0 z m -76.77865,0.9387 0,27.4703 c -2e-5,6.4326 2.16853,11.6335 6.52173,15.6127 4.03904,3.7399 9.04189,5.6324 14.92095,5.6324 5.93886,0 10.91633,-1.8925 14.97036,-5.6324 4.35315,-3.9792 6.52169,-9.1801 6.52174,-15.6127 l 0,-27.4703 -10.12846,0 0,26.581 c -5e-5,3.5005 -1.0723,6.3484 -3.21146,8.5474 -2.21404,2.2739 -4.906,3.4091 -8.15218,3.4091 -3.12654,0 -5.83938,-1.1502 -8.05336,-3.4091 -2.19905,-2.2738 -3.2609,-5.1067 -3.26087,-8.5474 l 0,-26.581 -10.12845,0 z m 133.54743,7.8063 c 3.306,10e-5 6.19285,0.9268 8.64624,2.7668 2.37851,1.8849 4.13014,4.6309 5.23716,8.251 l -27.22332,0 c 0.79283,-3.4855 2.43792,-6.1925 4.8913,-8.1522 2.37853,-1.8998 5.18745,-2.8655 8.44862,-2.8656 z" + id="path3790" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854" /> + <g + id="g3792" + transform="matrix(0.347343,0,0,0.346901,554.4533,794.1211)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854"> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" + id="path3794" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" + id="path3796" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" + id="path3798" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" + id="path3800" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" + id="path3802" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + </g> + </g> + <text + sodipodi:linespacing="100%" + id="text3804" + y="1231.8833" + x="-677.91302" + style="font-size:14.34666634px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" + xml:space="preserve" + transform="scale(-1,1)"><tspan + y="1231.8833" + x="-677.91302" + id="tspan3806" + sodipodi:role="line">cc</tspan></text> + </g> + <g + id="g3844" + transform="translate(0,140)"> + <g + id="g3846"> + <path + inkscape:connector-curvature="0" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + d="m 818.32888,1096.181 c -0.74303,0 -1.45723,0 -2.17391,0.049 -0.0669,0.014 -0.13033,0.037 -0.19763,0.049 -0.66715,0.1246 -1.32536,0.2309 -2.02569,0.247 -0.097,0.014 -0.19995,-0.014 -0.29644,0 -5.71605,0.8606 -10.54554,3.3425 -14.42688,7.4605 -4.53271,4.7871 -6.81817,10.5218 -6.81818,17.1937 0,6.7467 2.28548,12.5204 6.81818,17.2925 4.90667,5.146 11.2818,7.7075 19.12055,7.7075 4.15869,0 8.15681,-1.0333 11.95652,-3.1127 3.79965,-2.0195 7.10345,-4.8778 9.93083,-8.498 l -8.54743,-4.7431 c -3.68005,4.9067 -8.20158,7.3617 -13.58695,7.3617 -3.73988,0 -7.0931,-1.2132 -9.98024,-3.6067 -2.93207,-2.3935 -4.39727,-5.3089 -4.39723,-8.7945 l 39.08102,0 0,-1.9763 c -4e-5,-8.452 -2.86291,-15.2201 -8.54743,-20.3063 -4.78705,-4.2335 -10.0899,-6.324 -15.90909,-6.3241 z m -181.71937,0.3459 0,18.9229 -6.62055,0 0,9.6838 6.62055,0 0,19.7628 10.07905,0 0,-19.7628 6.07708,0 12.40119,19.7628 11.95652,0 -16.6502,-25.0988 15.90909,-22.332 -12.20356,0 -12.30237,17.9842 -5.18775,0 0,-18.9229 -10.07905,0 z m 123.66601,0 c -1.73503,0.3096 -3.35171,0.8136 -4.8419,1.581 -2.5132,1.3464 -4.49729,3.122 -5.97826,5.336 l 0,-5.9783 -10.12846,0 0,47.4308 10.12846,0 0,-26.581 c -1e-5,-3.7997 1.07224,-6.7151 3.21147,-8.7945 2.15413,-2.0793 4.88507,-3.1126 8.25098,-3.1126 3.56032,0 6.34065,0.9553 8.3004,2.915 1.95964,1.9597 2.91496,5.031 2.91502,9.1897 l 0,26.3834 10.12846,0 0,-28.6067 c -5e-5,-5.8192 -1.77567,-10.6272 -5.33597,-14.4269 -2.67029,-2.8497 -5.76,-4.6235 -9.28854,-5.336 l -7.36166,0 z m -76.77865,0.9387 0,27.4703 c -2e-5,6.4326 2.16853,11.6335 6.52173,15.6127 4.03904,3.7399 9.04189,5.6324 14.92095,5.6324 5.93886,0 10.91633,-1.8925 14.97036,-5.6324 4.35315,-3.9792 6.52169,-9.1801 6.52174,-15.6127 l 0,-27.4703 -10.12846,0 0,26.581 c -5e-5,3.5005 -1.0723,6.3484 -3.21146,8.5474 -2.21404,2.2739 -4.906,3.4091 -8.15218,3.4091 -3.12654,0 -5.83938,-1.1502 -8.05336,-3.4091 -2.19905,-2.2738 -3.2609,-5.1067 -3.26087,-8.5474 l 0,-26.581 -10.12845,0 z m 133.54743,7.8063 c 3.306,10e-5 6.19285,0.9268 8.64624,2.7668 2.37851,1.8849 4.13014,4.6309 5.23716,8.251 l -27.22332,0 c 0.79283,-3.4855 2.43792,-6.1925 4.8913,-8.1522 2.37853,-1.8998 5.18745,-2.8655 8.44862,-2.8656 z" + id="path3848" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854" /> + <g + id="g3850" + transform="matrix(0.347343,0,0,0.346901,554.4533,794.1211)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854"> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" + id="path3852" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" + id="path3854" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" + id="path3856" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" + id="path3858" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" + id="path3860" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + </g> + </g> + <text + sodipodi:linespacing="100%" + id="text3862" + y="1132.7504" + x="-902.83093" + style="font-size:44.83404922px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" + xml:space="preserve" + transform="scale(-1,1)"><tspan + y="1132.7504" + x="-902.83093" + id="tspan3864" + sodipodi:role="line">cc</tspan></text> + </g> + <g + id="g3983" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/logo-big-home-kunecc.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <g + transform="translate(-0.07178157,0.14078373)" + id="g3779"> + <path + inkscape:export-ydpi="399.59854" + inkscape:export-xdpi="399.59854" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + id="path3743" + d="m 818.32888,1096.181 c -0.74303,0 -1.45723,0 -2.17391,0.049 -0.0669,0.014 -0.13033,0.037 -0.19763,0.049 -0.66715,0.1246 -1.32536,0.2309 -2.02569,0.247 -0.097,0.014 -0.19995,-0.014 -0.29644,0 -5.71605,0.8606 -10.54554,3.3425 -14.42688,7.4605 -4.53271,4.7871 -6.81817,10.5218 -6.81818,17.1937 0,6.7467 2.28548,12.5204 6.81818,17.2925 4.90667,5.146 11.2818,7.7075 19.12055,7.7075 4.15869,0 8.15681,-1.0333 11.95652,-3.1127 3.79965,-2.0195 7.10345,-4.8778 9.93083,-8.498 l -8.54743,-4.7431 c -3.68005,4.9067 -8.20158,7.3617 -13.58695,7.3617 -3.73988,0 -7.0931,-1.2132 -9.98024,-3.6067 -2.93207,-2.3935 -4.39727,-5.3089 -4.39723,-8.7945 l 39.08102,0 0,-1.9763 c -4e-5,-8.452 -2.86291,-15.2201 -8.54743,-20.3063 -4.78705,-4.2335 -10.0899,-6.324 -15.90909,-6.3241 z m -181.71937,0.3459 0,18.9229 -6.62055,0 0,9.6838 6.62055,0 0,19.7628 10.07905,0 0,-19.7628 6.07708,0 12.40119,19.7628 11.95652,0 -16.6502,-25.0988 15.90909,-22.332 -12.20356,0 -12.30237,17.9842 -5.18775,0 0,-18.9229 -10.07905,0 z m 123.66601,0 c -1.73503,0.3096 -3.35171,0.8136 -4.8419,1.581 -2.5132,1.3464 -4.49729,3.122 -5.97826,5.336 l 0,-5.9783 -10.12846,0 0,47.4308 10.12846,0 0,-26.581 c -1e-5,-3.7997 1.07224,-6.7151 3.21147,-8.7945 2.15413,-2.0793 4.88507,-3.1126 8.25098,-3.1126 3.56032,0 6.34065,0.9553 8.3004,2.915 1.95964,1.9597 2.91496,5.031 2.91502,9.1897 l 0,26.3834 10.12846,0 0,-28.6067 c -5e-5,-5.8192 -1.77567,-10.6272 -5.33597,-14.4269 -2.67029,-2.8497 -5.76,-4.6235 -9.28854,-5.336 l -7.36166,0 z m -76.77865,0.9387 0,27.4703 c -2e-5,6.4326 2.16853,11.6335 6.52173,15.6127 4.03904,3.7399 9.04189,5.6324 14.92095,5.6324 5.93886,0 10.91633,-1.8925 14.97036,-5.6324 4.35315,-3.9792 6.52169,-9.1801 6.52174,-15.6127 l 0,-27.4703 -10.12846,0 0,26.581 c -5e-5,3.5005 -1.0723,6.3484 -3.21146,8.5474 -2.21404,2.2739 -4.906,3.4091 -8.15218,3.4091 -3.12654,0 -5.83938,-1.1502 -8.05336,-3.4091 -2.19905,-2.2738 -3.2609,-5.1067 -3.26087,-8.5474 l 0,-26.581 -10.12845,0 z m 133.54743,7.8063 c 3.306,10e-5 6.19285,0.9268 8.64624,2.7668 2.37851,1.8849 4.13014,4.6309 5.23716,8.251 l -27.22332,0 c 0.79283,-3.4855 2.43792,-6.1925 4.8913,-8.1522 2.37853,-1.8998 5.18745,-2.8655 8.44862,-2.8656 z" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + inkscape:connector-curvature="0" /> + <g + inkscape:export-ydpi="399.59854" + inkscape:export-xdpi="399.59854" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + transform="matrix(0.347343,0,0,0.346901,554.4533,794.1211)" + id="g3745"> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3747" + d="m 60.321717,411.99998 377.014613,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3749" + d="m 252.61203,788.60332 0,-377.01178" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3751" + d="m 252.86937,597.15755 377.0124,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3753" + d="m 437.45588,596.97447 0,-377.01491" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3755" + d="m 372.87905,411.27704 64.93441,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + </g> + </g> + <text + transform="scale(-1,1)" + xml:space="preserve" + style="font-size:58.94304657px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" + x="-925.99481" + y="1145.4236" + id="text3757" + sodipodi:linespacing="100%"><tspan + sodipodi:role="line" + id="tspan3759" + x="-925.99481" + y="1145.4236">cc</tspan></text> + <text + xml:space="preserve" + style="font-size:87.16403198px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#cc6633;fill-opacity:1;stroke:none;font-family:Emblem" + x="838.10248" + y="1145.1492" + id="text3941" + sodipodi:linespacing="100%"><tspan + sodipodi:role="line" + id="tspan3943" + x="838.10248" + y="1145.1492">.</tspan></text> + </g> + <g + id="g3969" + transform="matrix(0.31973654,0,0,0.31973654,675.58786,768.46541)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kunecc-logo-16px.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <g + transform="translate(380,-30)" + id="g3945"> + <path + inkscape:connector-curvature="0" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + d="m 818.32888,1096.181 c -0.74303,0 -1.45723,0 -2.17391,0.049 -0.0669,0.014 -0.13033,0.037 -0.19763,0.049 -0.66715,0.1246 -1.32536,0.2309 -2.02569,0.247 -0.097,0.014 -0.19995,-0.014 -0.29644,0 -5.71605,0.8606 -10.54554,3.3425 -14.42688,7.4605 -4.53271,4.7871 -6.81817,10.5218 -6.81818,17.1937 0,6.7467 2.28548,12.5204 6.81818,17.2925 4.90667,5.146 11.2818,7.7075 19.12055,7.7075 4.15869,0 8.15681,-1.0333 11.95652,-3.1127 3.79965,-2.0195 7.10345,-4.8778 9.93083,-8.498 l -8.54743,-4.7431 c -3.68005,4.9067 -8.20158,7.3617 -13.58695,7.3617 -3.73988,0 -7.0931,-1.2132 -9.98024,-3.6067 -2.93207,-2.3935 -4.39727,-5.3089 -4.39723,-8.7945 l 39.08102,0 0,-1.9763 c -4e-5,-8.452 -2.86291,-15.2201 -8.54743,-20.3063 -4.78705,-4.2335 -10.0899,-6.324 -15.90909,-6.3241 z m -181.71937,0.3459 0,18.9229 -6.62055,0 0,9.6838 6.62055,0 0,19.7628 10.07905,0 0,-19.7628 6.07708,0 12.40119,19.7628 11.95652,0 -16.6502,-25.0988 15.90909,-22.332 -12.20356,0 -12.30237,17.9842 -5.18775,0 0,-18.9229 -10.07905,0 z m 123.66601,0 c -1.73503,0.3096 -3.35171,0.8136 -4.8419,1.581 -2.5132,1.3464 -4.49729,3.122 -5.97826,5.336 l 0,-5.9783 -10.12846,0 0,47.4308 10.12846,0 0,-26.581 c -1e-5,-3.7997 1.07224,-6.7151 3.21147,-8.7945 2.15413,-2.0793 4.88507,-3.1126 8.25098,-3.1126 3.56032,0 6.34065,0.9553 8.3004,2.915 1.95964,1.9597 2.91496,5.031 2.91502,9.1897 l 0,26.3834 10.12846,0 0,-28.6067 c -5e-5,-5.8192 -1.77567,-10.6272 -5.33597,-14.4269 -2.67029,-2.8497 -5.76,-4.6235 -9.28854,-5.336 l -7.36166,0 z m -76.77865,0.9387 0,27.4703 c -2e-5,6.4326 2.16853,11.6335 6.52173,15.6127 4.03904,3.7399 9.04189,5.6324 14.92095,5.6324 5.93886,0 10.91633,-1.8925 14.97036,-5.6324 4.35315,-3.9792 6.52169,-9.1801 6.52174,-15.6127 l 0,-27.4703 -10.12846,0 0,26.581 c -5e-5,3.5005 -1.0723,6.3484 -3.21146,8.5474 -2.21404,2.2739 -4.906,3.4091 -8.15218,3.4091 -3.12654,0 -5.83938,-1.1502 -8.05336,-3.4091 -2.19905,-2.2738 -3.2609,-5.1067 -3.26087,-8.5474 l 0,-26.581 -10.12845,0 z m 133.54743,7.8063 c 3.306,10e-5 6.19285,0.9268 8.64624,2.7668 2.37851,1.8849 4.13014,4.6309 5.23716,8.251 l -27.22332,0 c 0.79283,-3.4855 2.43792,-6.1925 4.8913,-8.1522 2.37853,-1.8998 5.18745,-2.8655 8.44862,-2.8656 z" + id="path3947" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854" /> + <g + id="g3949" + transform="matrix(0.347343,0,0,0.346901,554.4533,794.1211)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854"> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" + id="path3951" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" + id="path3953" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" + id="path3955" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" + id="path3957" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" + id="path3959" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + </g> + </g> + <text + sodipodi:linespacing="100%" + id="text3961" + y="1115.2828" + x="-1306.0667" + style="font-size:58.94304657px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" + xml:space="preserve" + transform="scale(-1,1)"><tspan + y="1115.2828" + x="-1306.0667" + id="tspan3963" + sodipodi:role="line">cc</tspan></text> + <text + sodipodi:linespacing="100%" + id="text3965" + y="1115.0084" + x="1218.1743" + style="font-size:87.16403198px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#cc6633;fill-opacity:1;stroke:none;font-family:Emblem" + xml:space="preserve"><tspan + y="1115.0084" + x="1218.1743" + id="tspan3967" + sodipodi:role="line">.</tspan></text> + </g> </g> </svg> Added: trunk/img/kunecc-logo-16px.png =================================================================== (Binary files differ) Property changes on: trunk/img/kunecc-logo-16px.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/logo-big-home-kunecc.png =================================================================== (Binary files differ) Property changes on: trunk/img/logo-big-home-kunecc.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/core/server/KuneContainerListener.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/KuneContainerListener.java 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/src/main/java/cc/kune/core/server/KuneContainerListener.java 2011-11-16 10:13:38 UTC (rev 1608) @@ -34,7 +34,9 @@ import cc.kune.core.server.rack.ContainerListener; import com.google.inject.Inject; +import com.google.inject.Singleton; +@Singleton public class KuneContainerListener implements ContainerListener { private final Logger logger; // NOPMD by vjrj on 16/07/09 22:38 private final KunePersistenceService persistenceService; Modified: trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java 2011-11-16 10:13:38 UTC (rev 1608) @@ -32,6 +32,7 @@ @Singleton public class I18nTranslationServiceDefault extends I18nTranslationService { + private boolean initiliazied = false; private final I18nTranslationManager translationManager; private final Provider<UserSessionManager> userSessionManager; @@ -42,6 +43,10 @@ this.userSessionManager = userSessionManager; } + public void init() { + initiliazied = true; + } + @Override public boolean isRTL() { return userSessionManager.get().isUserLoggedIn() ? userSessionManager.get().getUser().getLanguage().getDirection().equals( @@ -78,7 +83,7 @@ @Override public String tWithNT(final String text, final String noteForTranslators) { String language; - if (userSessionManager.get().isUserLoggedIn()) { + if (initiliazied && userSessionManager.get().isUserLoggedIn()) { language = userSessionManager.get().getUser().getLanguage().getCode(); } else { language = I18nTranslation.DEFAULT_LANG; Modified: trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java 2011-11-16 10:13:38 UTC (rev 1608) @@ -29,6 +29,7 @@ import cc.kune.core.client.errors.UserMustBeLoggedException; import cc.kune.core.server.content.ContentManager; +import cc.kune.core.server.i18n.I18nTranslationServiceDefault; import cc.kune.core.server.manager.GroupManager; import cc.kune.core.server.manager.I18nCountryManager; import cc.kune.core.server.manager.I18nLanguageManager; @@ -46,22 +47,22 @@ import cc.kune.domain.I18nTranslation; import cc.kune.domain.License; import cc.kune.domain.User; -import cc.kune.wave.server.KuneWaveService; import com.google.inject.Inject; +import com.google.inject.Singleton; import com.google.inject.persist.Transactional; +@Singleton public class DatabaseInitializer { private static final Log LOG = LogFactory.getLog(DatabaseInitializer.class); private final ContentManager contentManager; private final I18nCountryManager countryManager; private final GroupManager groupManager; - private final KuneWaveService kuneWaveManager; private final I18nLanguageManager languageManager; private final LicenseManager licenseManager; private final KuneBasicProperties properties; private final I18nTranslationManager translationManager; - + private final I18nTranslationServiceDefault translationService; private final UserManager userManager; @Inject @@ -69,7 +70,7 @@ final GroupManager groupManager, final LicenseManager licenseManager, final I18nLanguageManager languageManager, final I18nCountryManager countryManager, final I18nTranslationManager translationManager, final ContentManager contentManager, - final KuneWaveService kuneWaveManager) { + final I18nTranslationServiceDefault translationService) { this.properties = properties; this.userManager = userManager; this.groupManager = groupManager; @@ -77,8 +78,8 @@ this.languageManager = languageManager; this.countryManager = countryManager; this.translationManager = translationManager; + this.translationService = translationService; this.contentManager = contentManager; - this.kuneWaveManager = kuneWaveManager; } private void createDefUsersGroup() throws Exception, UserMustBeLoggedException { @@ -210,11 +211,12 @@ try { groupManager.getSiteDefaultGroup(); } catch (final NoResultException e) { - LOG.info("The default group '" + properties.getDefaultSiteName() + LOG.warn("The default group '" + properties.getDefaultSiteName() + "' does not exist in Database, " + "creating it (see kune.default.site.shortName in kune.properties for more details)"); initDatabase(); } + translationService.init(); } @Transactional Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/DefaultManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/impl/DefaultManager.java 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/DefaultManager.java 2011-11-16 10:13:38 UTC (rev 1608) @@ -37,117 +37,122 @@ import com.google.inject.Provider; public abstract class DefaultManager<T, K> { - private final Provider<EntityManager> provider; - private final Class<T> entityClass; - protected final Log log; + private final Class<T> entityClass; + protected final Log log; + private final Provider<EntityManager> provider; - public DefaultManager(final Provider<EntityManager> provider, final Class<T> entityClass) { - this.provider = provider; - this.entityClass = entityClass; - log = LogFactory.getLog(entityClass); - } + public DefaultManager(final Provider<EntityManager> provider, final Class<T> entityClass) { + this.provider = provider; + this.entityClass = entityClass; + log = LogFactory.getLog(entityClass); + } - public void clear() { - getEntityManager().clear(); - } + public void clear() { + getEntityManager().clear(); + } - public T find(final Long primaryKey) { - return getEntityManager().find(entityClass, primaryKey); - } + /** + * use carefully!!! + */ + protected <X> X find(final Class<X> entityClass, final Long primaryKey) { + return getEntityManager().find(entityClass, primaryKey); + } - public <E> E merge(final E entity, final Class<E> entityClass) { - getEntityManager().merge(entity); - return entity; - } + public T find(final Long primaryKey) { + return getEntityManager().find(entityClass, primaryKey); + } - public T merge(final T entity) { - return getEntityManager().merge(entity); - } + private EntityManager getEntityManager() { + return provider.get(); + } - public <E> E persist(final E entity, final Class<E> entityClass) { - getEntityManager().persist(entity); - return entity; - } + protected javax.persistence.Query getQuery(final String qlString) { + return getEntityManager().createQuery(qlString); + } - public T persist(final T entity) { - return persist(entity, entityClass); - } + public <E> E merge(final E entity, final Class<E> entityClass) { + getEntityManager().merge(entity); + return entity; + } - @SuppressWarnings("unchecked") - public void reIndex() { - // Inject this? - final FullTextEntityManager fullTextEm = Search.getFullTextEntityManager(getEntityManager()); - fullTextEm.purgeAll(entityClass); - fullTextEm.getTransaction().commit(); - fullTextEm.getTransaction().begin(); - final List<T> entities = fullTextEm.createQuery("SELECT e FROM " + entityClass.getSimpleName() + " AS e").getResultList(); - for (final T e : entities) { - fullTextEm.index(e); - } - fullTextEm.getSearchFactory().optimize(entityClass); - } + public T merge(final T entity) { + return getEntityManager().merge(entity); + } - public void remove(final T entity) { - getEntityManager().remove(entity); - } + public <E> E persist(final E entity, final Class<E> entityClass) { + getEntityManager().persist(entity); + return entity; + } - public SearchResult<T> search(final Query query) { - return search(query, null, null); - } + public T persist(final T entity) { + return persist(entity, entityClass); + } - @SuppressWarnings("unchecked") - public SearchResult<T> search(final Query query, final Integer firstResult, final Integer maxResults) { - final FullTextQuery emQuery = Search.getFullTextEntityManager(getEntityManager()).createFullTextQuery(query, - entityClass); - if (firstResult != null && maxResults != null) { - emQuery.setFirstResult(firstResult); - emQuery.setMaxResults(maxResults); - } - return new SearchResult<T>(emQuery.getResultSize(), emQuery.getResultList()); + @SuppressWarnings("unchecked") + public void reIndex() { + // Inject this? + final FullTextEntityManager fullTextEm = Search.getFullTextEntityManager(getEntityManager()); + fullTextEm.purgeAll(entityClass); + fullTextEm.getTransaction().commit(); + fullTextEm.getTransaction().begin(); + final List<T> entities = fullTextEm.createQuery( + "SELECT e FROM " + entityClass.getSimpleName() + " AS e").getResultList(); + for (final T e : entities) { + fullTextEm.index(e); } + fullTextEm.getSearchFactory().optimize(entityClass); + } - public SearchResult<T> search(final String query, final String[] fields, final BooleanClause.Occur[] flags, - final Integer firstResult, final Integer maxResults) { - Query queryQ; - try { - queryQ = MultiFieldQueryParser.parse(query, fields, flags, new StandardAnalyzer()); - } catch (final ParseException e) { - throw new ServerManagerException("Error parsing search", e); - } - return search(queryQ, firstResult, maxResults); - } + public void remove(final T entity) { + getEntityManager().remove(entity); + } - public SearchResult<T> search(final String[] queries, final String[] fields, final BooleanClause.Occur[] flags, - final Integer firstResult, final Integer maxResults) { - Query query; - try { - query = MultiFieldQueryParser.parse(queries, fields, flags, new StandardAnalyzer()); - } catch (final ParseException e) { - throw new ServerManagerException("Error parsing search", e); - } - return search(query, firstResult, maxResults); + public SearchResult<T> search(final Query query) { + return search(query, null, null); + } + + @SuppressWarnings("unchecked") + public SearchResult<T> search(final Query query, final Integer firstResult, final Integer maxResults) { + final FullTextQuery emQuery = Search.getFullTextEntityManager(getEntityManager()).createFullTextQuery( + query, entityClass); + if (firstResult != null && maxResults != null) { + emQuery.setFirstResult(firstResult); + emQuery.setMaxResults(maxResults); } + return new SearchResult<T>(emQuery.getResultSize(), emQuery.getResultList()); + } - public SearchResult<T> search(final String[] queries, final String[] fields, final Integer firstResult, - final Integer maxResults) { - Query query; - try { - query = MultiFieldQueryParser.parse(queries, fields, new StandardAnalyzer()); - } catch (final ParseException e) { - throw new ServerManagerException("Error parsing search", e); - } - return search(query, firstResult, maxResults); + public SearchResult<T> search(final String query, final String[] fields, + final BooleanClause.Occur[] flags, final Integer firstResult, final Integer maxResults) { + Query queryQ; + try { + queryQ = MultiFieldQueryParser.parse(query, fields, flags, new StandardAnalyzer()); + } catch (final ParseException e) { + throw new ServerManagerException("Error parsing search", e); } + return search(queryQ, firstResult, maxResults); + } - /** - * use carefully!!! - */ - protected <X> X find(final Class<X> entityClass, final Long primaryKey) { - return getEntityManager().find(entityClass, primaryKey); + public SearchResult<T> search(final String[] queries, final String[] fields, + final BooleanClause.Occur[] flags, final Integer firstResult, final Integer maxResults) { + Query query; + try { + query = MultiFieldQueryParser.parse(queries, fields, flags, new StandardAnalyzer()); + } catch (final ParseException e) { + throw new ServerManagerException("Error parsing search", e); } + return search(query, firstResult, maxResults); + } - private EntityManager getEntityManager() { - return provider.get(); + public SearchResult<T> search(final String[] queries, final String[] fields, + final Integer firstResult, final Integer maxResults) { + Query query; + try { + query = MultiFieldQueryParser.parse(queries, fields, new StandardAnalyzer()); + } catch (final ParseException e) { + throw new ServerManagerException("Error parsing search", e); } + return search(query, firstResult, maxResults); + } } Deleted: trunk/src/main/webapp/WEB-INF/web.xml.wiab-int-sample =================================================================== --- trunk/src/main/webapp/WEB-INF/web.xml.wiab-int-sample 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/src/main/webapp/WEB-INF/web.xml.wiab-int-sample 2011-11-16 10:13:38 UTC (rev 1608) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE web-app - PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" - "http://java.sun.com/dtd/web-app_2_3.dtd"> - -<web-app> - - <filter> - <filter-name>guiceFilter</filter-name> - <filter-class>com.example.CustomGuiceFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>guiceFilter</filter-name> - <url-pattern>/hw/*</url-pattern> - </filter-mapping> -</web-app> Deleted: trunk/src/main/webapp/images =================================================================== --- trunk/src/main/webapp/images 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/src/main/webapp/images 2011-11-16 10:13:38 UTC (rev 1608) @@ -1 +0,0 @@ -link WEB-INF/publicspace/public/images/ \ No newline at end of file Deleted: trunk/src/main/webapp/javascripts =================================================================== --- trunk/src/main/webapp/javascripts 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/src/main/webapp/javascripts 2011-11-16 10:13:38 UTC (rev 1608) @@ -1 +0,0 @@ -link WEB-INF/publicspace/public/javascripts/ \ No newline at end of file Deleted: trunk/src/main/webapp/stylesheets =================================================================== --- trunk/src/main/webapp/stylesheets 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/src/main/webapp/stylesheets 2011-11-16 10:13:38 UTC (rev 1608) @@ -1 +0,0 @@ -link WEB-INF/publicspace/public/stylesheets/ \ No newline at end of file Deleted: trunk/src/main/webapp/templates =================================================================== --- trunk/src/main/webapp/templates 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/src/main/webapp/templates 2011-11-16 10:13:38 UTC (rev 1608) @@ -1 +0,0 @@ -link WEB-INF/publicspace/public/templates/ \ No newline at end of file

1 0

14 Nov '11

Author: vjrj_ Date: 2011-11-14 15:09:30 +0100 (Mon, 14 Nov 2011) New Revision: 1607 Modified: trunk/TODO trunk/src/main/java/cc/kune/chat/client/actions/StartAssemblyWithMembersAction.java 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/BlinkAnimation.java trunk/src/main/java/cc/kune/common/client/ui/DottedTab.java trunk/src/main/java/cc/kune/common/client/ui/DottedTabPanel.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/TabTitleGenerator.java trunk/src/main/java/cc/kune/common/client/utils/MetaUtils.java trunk/src/main/java/cc/kune/common/public/kune-common-rtl.css trunk/src/main/java/cc/kune/core/client/auth/AnonUsersManager.java trunk/src/main/java/cc/kune/core/client/auth/UserFieldFactory.java trunk/src/main/java/cc/kune/core/client/dnd/DebugDropController.java trunk/src/main/java/cc/kune/core/client/dnd/DropTarget.java trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java trunk/src/main/java/cc/kune/core/client/dnd/KuneDragController.java trunk/src/main/java/cc/kune/core/client/dnd/NotAllowedDropController.java trunk/src/main/java/cc/kune/core/client/dnd/NotImplementedDropController.java trunk/src/main/java/cc/kune/core/client/dnd/NotImplementedDropManager.java trunk/src/main/java/cc/kune/core/client/events/InboxUnreadUpdatedEvent.java trunk/src/main/java/cc/kune/core/client/events/NewUserRegisteredEvent.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/GroupFieldFactory.java trunk/src/main/java/cc/kune/core/client/i18n/I18nConstants.java trunk/src/main/java/cc/kune/core/client/i18n/I18nConvertMethodName.java trunk/src/main/java/cc/kune/core/client/i18n/I18nStyles.java trunk/src/main/java/cc/kune/core/client/i18n/I18nUrlUtils.java trunk/src/main/java/cc/kune/core/client/i18n/I18nUtils.java trunk/src/main/java/cc/kune/core/client/registry/IdGenerator.java trunk/src/main/java/cc/kune/core/client/sitebar/SiteOptions.java trunk/src/main/java/cc/kune/core/client/sitebar/search/OnEntitySelectedInSearch.java trunk/src/main/java/cc/kune/core/client/sitebar/search/OnExactMatch.java trunk/src/main/java/cc/kune/core/client/sitebar/search/SearchBoxFactory.java trunk/src/main/java/cc/kune/core/client/sn/actions/AddBuddieSearchPanel.java trunk/src/main/java/cc/kune/core/client/sn/actions/AddMemberSearchPanel.java trunk/src/main/java/cc/kune/core/client/sn/actions/EventTargetUtils.java trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAction.java trunk/src/main/java/cc/kune/core/client/sub/SubtitlesManager.java trunk/src/main/java/cc/kune/core/client/sub/SubtitlesWidget.java trunk/src/main/java/cc/kune/core/public/ws-rtl.css trunk/src/main/java/cc/kune/core/server/AbstractServerTool.java trunk/src/main/java/cc/kune/core/server/LogThis.java trunk/src/main/java/cc/kune/core/server/UserSessionManager.java trunk/src/main/java/cc/kune/core/server/access/AccessRightsUtils.java trunk/src/main/java/cc/kune/core/server/mail/MailService.java trunk/src/main/java/cc/kune/core/server/mail/MailServiceDefault.java trunk/src/main/java/cc/kune/core/server/manager/KuneWaveManager.java trunk/src/main/java/cc/kune/core/server/manager/impl/KuneWaveManagerDefault.java trunk/src/main/java/cc/kune/core/server/properties/ReservedWordsRegistry.java trunk/src/main/java/cc/kune/core/server/rpc/StatsRPC.java trunk/src/main/java/cc/kune/core/server/stats/HomeStats.java trunk/src/main/java/cc/kune/core/server/stats/StatsService.java trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java trunk/src/main/java/cc/kune/core/shared/dto/HomeStatsDTO.java trunk/src/main/java/cc/kune/gspace/client/actions/GiveUsFeedbackAction.java trunk/src/main/java/cc/kune/gspace/client/actions/GiveUsFeedbackBtn.java trunk/src/main/java/cc/kune/gspace/client/actions/NewContentAction.java trunk/src/main/java/cc/kune/gspace/client/actions/RefreshCurrentStateAction.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nToTranslateGridPanel.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslateRecomendPanel.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatedGridPanel.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPresenter.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorSaver.java trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorPanel.java trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorWithoutEnglishPanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java trunk/src/main/java/cc/kune/hspace/client/GroupContentHomeLink.java trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java trunk/src/main/java/cc/kune/lists/client/actions/SetListOpenessAction.java trunk/src/main/java/cc/kune/lists/client/actions/SetListOpenessMenuItem.java trunk/src/main/java/cc/kune/lists/client/actions/ShowSubscribersOfListBtn.java trunk/src/main/java/cc/kune/lists/client/actions/SubscribeToListBtn.java trunk/src/main/java/cc/kune/lists/client/actions/SubscriteToListAction.java trunk/src/main/java/cc/kune/lists/client/rpc/ListsService.java trunk/src/main/java/cc/kune/lists/client/rpc/ListsServiceAsync.java trunk/src/main/java/cc/kune/lists/server/rpc/ListsRPC.java trunk/src/main/java/cc/kune/wave/client/KuneWaveResources.java trunk/src/main/java/cc/kune/wave/client/WaveClientProvider.java trunk/src/main/java/cc/kune/wave/client/WaveClientView.java trunk/src/main/java/cc/kune/wave/client/WebClientMock.java trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPanel.java trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPresenter.java trunk/src/main/java/cc/kune/wave/server/KuneWaveUtils.java trunk/src/test/java/cc/kune/core/client/i18n/ConstantsTest.java trunk/src/test/java/cc/kune/core/client/i18n/I18nUrlUtilsTest.java trunk/src/test/java/cc/kune/core/client/i18n/I18nUtilsTest.java trunk/src/test/java/cc/kune/core/client/registry/IdGeneratorTest.java trunk/src/test/java/cc/kune/core/server/auth/SuperAdminMethodInterceptorTest.java trunk/src/test/java/cc/kune/core/server/manager/ContainerManagerDefaultTest.java trunk/src/test/java/cc/kune/lists/server/ListsServiceTest.java trunk/src/test/java/cc/kune/selenium/CustomWebDriverEventListener.java trunk/src/test/java/cc/kune/selenium/SeleniumUtils.java trunk/src/test/java/cc/kune/selenium/login/AbstractLoginObject.java Log: Added copyright Modified: trunk/TODO =================================================================== --- trunk/TODO 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/TODO 2011-11-14 14:09:30 UTC (rev 1607) @@ -13,17 +13,8 @@ * SHORT-TERM (URGENT) ** group.inexistentTool nasty error -** styles/styl2.png" and /lic/ instead or /lic/ in group options -styl2.png -"NetworkError: 404 Not Found - http://beta.eurosur.org/images/styles/styl3.png" -styl3.png -"NetworkError: 404 Not Found - http://beta.eurosur.org/images/styles/styl4.png" -styl4.png -"NetworkError: 404 Not Found - http://beta.eurosur.org/images/styles/styl5.png" -styl5.png -"NetworkError: 404 Not Found - http://beta.eurosur.org/images/styles/styl6.png" -styl6.png -"NetworkError: 404 Not Found - http://beta.eurosur.org/images/lic/ +** calendar support +*** gwt-cal + http://ical4j.sourceforge.net/introduction.html ** i18n usecase | logged | locale in URL | i18n supported | useDB | | false | false | false | true | @@ -39,6 +30,7 @@ meta? ** TODO multi uploader +http://code.google.com/p/upload4gwt/ http://code.google.com/p/gwt-plupload/ http://www.plupload.com/example_all_runtimes.php http://gxt-multiupload-demo.appspot.com/ Modified: trunk/src/main/java/cc/kune/chat/client/actions/StartAssemblyWithMembersAction.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/StartAssemblyWithMembersAction.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/chat/client/actions/StartAssemblyWithMembersAction.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.chat.client.actions; import java.util.Date; Modified: 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 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractParentGuiActionDescrip.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.actions.ui.descrip; import cc.kune.common.client.actions.AbstractAction; Modified: 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 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/HasChilds.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.actions.ui.descrip; public interface HasChilds { Modified: trunk/src/main/java/cc/kune/common/client/ui/BlinkAnimation.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/BlinkAnimation.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/common/client/ui/BlinkAnimation.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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; import com.google.gwt.user.client.Timer; Modified: trunk/src/main/java/cc/kune/common/client/ui/DottedTab.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/DottedTab.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/common/client/ui/DottedTab.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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; import com.google.gwt.core.client.GWT; Modified: trunk/src/main/java/cc/kune/common/client/ui/DottedTabPanel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/DottedTabPanel.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/common/client/ui/DottedTabPanel.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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; import com.google.gwt.core.client.GWT; Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/TabTitleGenerator.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/TabTitleGenerator.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/TabTitleGenerator.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.tooltip.Tooltip; Modified: trunk/src/main/java/cc/kune/common/client/utils/MetaUtils.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/utils/MetaUtils.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/common/client/utils/MetaUtils.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ package cc.kune.common.client.utils; import com.google.gwt.dom.client.Document; Modified: trunk/src/main/java/cc/kune/common/public/kune-common-rtl.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/kune-common-rtl.css 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/common/public/kune-common-rtl.css 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,4 +1,4 @@ -/* Here the styles of cc.kune.commom (reused by other projects like gadgets and so on) */ +/* Here the styles of cc.kune.commom (reused by other projects like gadgets and so on) but for RTL langs */ .k-iconlabel-text { float: left; } @@ -18,16 +18,3 @@ .k-menuimtem-title { float: right; } - -.k-tool-panel { - text-align: rigth; -} - -.entityTools { - text-align: right; -} - -.docHeader { - text-align: right; - padding-right: 10px; -} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/auth/AnonUsersManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/AnonUsersManager.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/auth/AnonUsersManager.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.auth; import cc.kune.common.client.notify.NotifyUser; Modified: trunk/src/main/java/cc/kune/core/client/auth/UserFieldFactory.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/UserFieldFactory.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/auth/UserFieldFactory.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.auth; import cc.kune.common.client.utils.TextUtils; Modified: trunk/src/main/java/cc/kune/core/client/dnd/DebugDropController.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/dnd/DebugDropController.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/dnd/DebugDropController.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.dnd; import cc.kune.common.client.notify.NotifyUser; Modified: trunk/src/main/java/cc/kune/core/client/dnd/DropTarget.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/dnd/DropTarget.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/dnd/DropTarget.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.dnd; import com.google.gwt.user.client.ui.Widget; Modified: trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.dnd; import cc.kune.common.client.notify.NotifyUser; Modified: trunk/src/main/java/cc/kune/core/client/dnd/KuneDragController.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/dnd/KuneDragController.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/dnd/KuneDragController.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.dnd; import cc.kune.gspace.client.GSpaceArmor; Modified: trunk/src/main/java/cc/kune/core/client/dnd/NotAllowedDropController.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/dnd/NotAllowedDropController.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/dnd/NotAllowedDropController.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.dnd; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/cc/kune/core/client/dnd/NotImplementedDropController.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/dnd/NotImplementedDropController.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/dnd/NotImplementedDropController.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.dnd; import cc.kune.common.client.notify.NotifyUser; Modified: trunk/src/main/java/cc/kune/core/client/dnd/NotImplementedDropManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/dnd/NotImplementedDropManager.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/dnd/NotImplementedDropManager.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.dnd; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/cc/kune/core/client/events/InboxUnreadUpdatedEvent.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/events/InboxUnreadUpdatedEvent.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/events/InboxUnreadUpdatedEvent.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.events; import com.google.gwt.event.shared.EventHandler; Modified: trunk/src/main/java/cc/kune/core/client/events/NewUserRegisteredEvent.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/events/NewUserRegisteredEvent.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/events/NewUserRegisteredEvent.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.events; import com.google.gwt.event.shared.EventHandler; Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/GroupFieldFactory.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/GroupFieldFactory.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/GroupFieldFactory.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.groups.newgroup; import cc.kune.core.client.resources.CoreMessages; Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nConstants.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nConstants.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nConstants.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.i18n; import com.google.gwt.i18n.client.ConstantsWithLookup; Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nConvertMethodName.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nConvertMethodName.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nConvertMethodName.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.i18n; public class I18nConvertMethodName { Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nStyles.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nStyles.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nStyles.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.i18n; import com.google.gwt.dom.client.Document; Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nUrlUtils.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nUrlUtils.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUrlUtils.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.i18n; import cc.kune.common.client.utils.TextUtils; Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nUtils.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nUtils.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUtils.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.i18n; import cc.kune.common.client.errors.UIException; Modified: trunk/src/main/java/cc/kune/core/client/registry/IdGenerator.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/registry/IdGenerator.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/registry/IdGenerator.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.registry; import cc.kune.common.client.utils.TextUtils; Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SiteOptions.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SiteOptions.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SiteOptions.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.sitebar; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/OnEntitySelectedInSearch.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/OnEntitySelectedInSearch.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/OnEntitySelectedInSearch.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.sitebar.search; public interface OnEntitySelectedInSearch { Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/OnExactMatch.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/OnExactMatch.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/OnExactMatch.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.sitebar.search; public interface OnExactMatch { Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/SearchBoxFactory.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/SearchBoxFactory.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SearchBoxFactory.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.sitebar.search; import cc.kune.common.client.tooltip.Tooltip; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/AddBuddieSearchPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/AddBuddieSearchPanel.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/AddBuddieSearchPanel.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.sn.actions; import cc.kune.core.client.i18n.I18nUITranslationService; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/AddMemberSearchPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/AddMemberSearchPanel.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/AddMemberSearchPanel.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.sn.actions; import cc.kune.core.client.i18n.I18nUITranslationService; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/EventTargetUtils.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/EventTargetUtils.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/EventTargetUtils.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.sn.actions; import cc.kune.common.client.actions.ActionEvent; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAction.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAction.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.sn.actions; import cc.kune.common.client.actions.AbstractAction; Modified: trunk/src/main/java/cc/kune/core/client/sub/SubtitlesManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sub/SubtitlesManager.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/sub/SubtitlesManager.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.sub; import cc.kune.common.client.utils.Base64Utils; Modified: trunk/src/main/java/cc/kune/core/client/sub/SubtitlesWidget.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sub/SubtitlesWidget.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/client/sub/SubtitlesWidget.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.sub; import org.adamtacy.client.ui.effects.events.EffectCompletedEvent; Modified: trunk/src/main/java/cc/kune/core/public/ws-rtl.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws-rtl.css 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/public/ws-rtl.css 2011-11-14 14:09:30 UTC (rev 1607) @@ -0,0 +1,18 @@ +/* CSS for RTL langs (Arabic, etc) */ + +.docHeader { + text-align: right; +} + +.docHeader span { + padding-right: 10px; +} + +.k-tool-panel { + text-align: rigth; +} + +.entityTools { + text-align: right; +} + Modified: trunk/src/main/java/cc/kune/core/server/AbstractServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/AbstractServerTool.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/server/AbstractServerTool.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.server; import java.util.Date; Modified: trunk/src/main/java/cc/kune/core/server/LogThis.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/LogThis.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/server/LogThis.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.server; import java.lang.annotation.Retention; Modified: trunk/src/main/java/cc/kune/core/server/UserSessionManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/UserSessionManager.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/server/UserSessionManager.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.server; import cc.kune.core.server.manager.UserManager; Modified: trunk/src/main/java/cc/kune/core/server/access/AccessRightsUtils.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/access/AccessRightsUtils.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/server/access/AccessRightsUtils.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.server.access; import cc.kune.core.shared.domain.AccessRol; Modified: trunk/src/main/java/cc/kune/core/server/mail/MailService.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/mail/MailService.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/server/mail/MailService.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.server.mail; import cc.kune.core.server.mail.MailServiceDefault.FormatedString; Modified: trunk/src/main/java/cc/kune/core/server/mail/MailServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/mail/MailServiceDefault.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/server/mail/MailServiceDefault.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.server.mail; import java.util.Properties; Modified: trunk/src/main/java/cc/kune/core/server/manager/KuneWaveManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/KuneWaveManager.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/server/manager/KuneWaveManager.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.server.manager; import cc.kune.domain.User; Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/KuneWaveManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/impl/KuneWaveManagerDefault.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/KuneWaveManagerDefault.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.server.manager.impl; import java.util.ArrayList; Modified: trunk/src/main/java/cc/kune/core/server/properties/ReservedWordsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/properties/ReservedWordsRegistry.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/server/properties/ReservedWordsRegistry.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.server.properties; import java.util.ArrayList; Modified: trunk/src/main/java/cc/kune/core/server/rpc/StatsRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/StatsRPC.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/server/rpc/StatsRPC.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.server.rpc; import cc.kune.core.client.errors.SessionExpiredException; Modified: trunk/src/main/java/cc/kune/core/server/stats/HomeStats.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/stats/HomeStats.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/server/stats/HomeStats.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.server.stats; import java.util.List; Modified: trunk/src/main/java/cc/kune/core/server/stats/StatsService.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/stats/StatsService.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/server/stats/StatsService.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.server.stats; import cc.kune.domain.Group; Modified: trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.server.stats; import cc.kune.core.shared.domain.ContentStatus; Modified: trunk/src/main/java/cc/kune/core/shared/dto/HomeStatsDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/HomeStatsDTO.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/core/shared/dto/HomeStatsDTO.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.shared.dto; import java.util.List; Modified: trunk/src/main/java/cc/kune/gspace/client/actions/GiveUsFeedbackAction.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/GiveUsFeedbackAction.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/gspace/client/actions/GiveUsFeedbackAction.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.actions; import cc.kune.common.client.actions.AbstractExtendedAction; Modified: trunk/src/main/java/cc/kune/gspace/client/actions/GiveUsFeedbackBtn.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/GiveUsFeedbackBtn.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/gspace/client/actions/GiveUsFeedbackBtn.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.actions; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContentAction.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/NewContentAction.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContentAction.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.actions; import cc.kune.common.client.actions.ActionEvent; Modified: trunk/src/main/java/cc/kune/gspace/client/actions/RefreshCurrentStateAction.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/RefreshCurrentStateAction.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/gspace/client/actions/RefreshCurrentStateAction.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.actions; import cc.kune.common.client.actions.AbstractExtendedAction; Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nToTranslateGridPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nToTranslateGridPanel.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nToTranslateGridPanel.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.core.shared.dto.I18nLanguageSimpleDTO; Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslateRecomendPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslateRecomendPanel.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslateRecomendPanel.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatedGridPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatedGridPanel.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatedGridPanel.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.core.shared.dto.I18nLanguageSimpleDTO; Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.notify.NotifyLevelImages; Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPresenter.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPresenter.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.ui.dialogs.tabbed.AbstractTabbedDialog; Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorSaver.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorSaver.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorSaver.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.notify.NotifyUser; Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorPanel.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorPanel.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.core.client.state.Session; Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorWithoutEnglishPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorWithoutEnglishPanel.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorWithoutEnglishPanel.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.core.client.state.Session; Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.viewers; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; Modified: trunk/src/main/java/cc/kune/hspace/client/GroupContentHomeLink.java =================================================================== --- trunk/src/main/java/cc/kune/hspace/client/GroupContentHomeLink.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/hspace/client/GroupContentHomeLink.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.hspace.client; import com.google.gwt.core.client.GWT; Modified: trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java =================================================================== --- trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.hspace.client; import java.util.List; Modified: trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.lists.client.actions; import cc.kune.common.client.actions.ActionEvent; Modified: trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.lists.client.actions; import cc.kune.common.client.actions.ActionEvent; Modified: trunk/src/main/java/cc/kune/lists/client/actions/SetListOpenessAction.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/SetListOpenessAction.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/lists/client/actions/SetListOpenessAction.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.lists.client.actions; import cc.kune.common.client.actions.ActionEvent; Modified: trunk/src/main/java/cc/kune/lists/client/actions/SetListOpenessMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/SetListOpenessMenuItem.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/lists/client/actions/SetListOpenessMenuItem.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.lists.client.actions; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; Modified: trunk/src/main/java/cc/kune/lists/client/actions/ShowSubscribersOfListBtn.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/ShowSubscribersOfListBtn.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/lists/client/actions/ShowSubscribersOfListBtn.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.lists.client.actions; import cc.kune.common.client.actions.AbstractAction; Modified: trunk/src/main/java/cc/kune/lists/client/actions/SubscribeToListBtn.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/SubscribeToListBtn.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/lists/client/actions/SubscribeToListBtn.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.lists.client.actions; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; Modified: trunk/src/main/java/cc/kune/lists/client/actions/SubscriteToListAction.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/SubscriteToListAction.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/lists/client/actions/SubscriteToListAction.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.lists.client.actions; import cc.kune.common.client.actions.ActionEvent; Modified: trunk/src/main/java/cc/kune/lists/client/rpc/ListsService.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/rpc/ListsService.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/lists/client/rpc/ListsService.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.lists.client.rpc; import cc.kune.core.shared.domain.utils.StateToken; Modified: trunk/src/main/java/cc/kune/lists/client/rpc/ListsServiceAsync.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/rpc/ListsServiceAsync.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/lists/client/rpc/ListsServiceAsync.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.lists.client.rpc; import cc.kune.core.shared.domain.utils.StateToken; Modified: trunk/src/main/java/cc/kune/lists/server/rpc/ListsRPC.java =================================================================== --- trunk/src/main/java/cc/kune/lists/server/rpc/ListsRPC.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/lists/server/rpc/ListsRPC.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.lists.server.rpc; import cc.kune.core.client.errors.AccessViolationException; Modified: trunk/src/main/java/cc/kune/wave/client/KuneWaveResources.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/KuneWaveResources.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/wave/client/KuneWaveResources.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.wave.client; import org.waveprotocol.wave.client.wavepanel.view.dom.full.TopConversationViewBuilder; Modified: trunk/src/main/java/cc/kune/wave/client/WaveClientProvider.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WaveClientProvider.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/wave/client/WaveClientProvider.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.wave.client; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/wave/client/WaveClientView.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WaveClientView.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/wave/client/WaveClientView.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.wave.client; import org.waveprotocol.box.webclient.client.RemoteViewServiceMultiplexer; Modified: trunk/src/main/java/cc/kune/wave/client/WebClientMock.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WebClientMock.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/wave/client/WebClientMock.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.wave.client; import org.waveprotocol.box.webclient.client.RemoteViewServiceMultiplexer; Modified: trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPanel.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPanel.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPanel.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.wave.client.inboxcount; import cc.kune.common.client.tooltip.Tooltip; Modified: trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPresenter.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPresenter.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.wave.client.inboxcount; import java.util.HashMap; Modified: trunk/src/main/java/cc/kune/wave/server/KuneWaveUtils.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/KuneWaveUtils.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/main/java/cc/kune/wave/server/KuneWaveUtils.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.wave.server; import org.waveprotocol.wave.model.waveref.InvalidWaveRefException; Modified: trunk/src/test/java/cc/kune/core/client/i18n/ConstantsTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/client/i18n/ConstantsTest.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/test/java/cc/kune/core/client/i18n/ConstantsTest.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.i18n; import static org.junit.Assert.assertFalse; Modified: trunk/src/test/java/cc/kune/core/client/i18n/I18nUrlUtilsTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/client/i18n/I18nUrlUtilsTest.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/test/java/cc/kune/core/client/i18n/I18nUrlUtilsTest.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.i18n; import static org.junit.Assert.assertEquals; Modified: trunk/src/test/java/cc/kune/core/client/i18n/I18nUtilsTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/client/i18n/I18nUtilsTest.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/test/java/cc/kune/core/client/i18n/I18nUtilsTest.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.i18n; import static org.junit.Assert.assertEquals; Modified: trunk/src/test/java/cc/kune/core/client/registry/IdGeneratorTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/client/registry/IdGeneratorTest.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/test/java/cc/kune/core/client/registry/IdGeneratorTest.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.registry; import static org.junit.Assert.assertEquals; Modified: trunk/src/test/java/cc/kune/core/server/auth/SuperAdminMethodInterceptorTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/auth/SuperAdminMethodInterceptorTest.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/test/java/cc/kune/core/server/auth/SuperAdminMethodInterceptorTest.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.server.auth; import java.lang.reflect.AccessibleObject; Modified: trunk/src/test/java/cc/kune/core/server/manager/ContainerManagerDefaultTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/ContainerManagerDefaultTest.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/test/java/cc/kune/core/server/manager/ContainerManagerDefaultTest.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.server.manager; import static cc.kune.docs.shared.DocsConstants.TYPE_FOLDER; Modified: trunk/src/test/java/cc/kune/lists/server/ListsServiceTest.java =================================================================== --- trunk/src/test/java/cc/kune/lists/server/ListsServiceTest.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/test/java/cc/kune/lists/server/ListsServiceTest.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.lists.server; import static org.junit.Assert.assertFalse; Modified: trunk/src/test/java/cc/kune/selenium/CustomWebDriverEventListener.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/CustomWebDriverEventListener.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/test/java/cc/kune/selenium/CustomWebDriverEventListener.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.selenium; import org.openqa.selenium.By; Modified: trunk/src/test/java/cc/kune/selenium/SeleniumUtils.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/SeleniumUtils.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/test/java/cc/kune/selenium/SeleniumUtils.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.selenium; import org.apache.commons.logging.Log; Modified: trunk/src/test/java/cc/kune/selenium/login/AbstractLoginObject.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/login/AbstractLoginObject.java 2011-11-12 21:00:14 UTC (rev 1606) +++ trunk/src/test/java/cc/kune/selenium/login/AbstractLoginObject.java 2011-11-14 14:09:30 UTC (rev 1607) @@ -1,3 +1,22 @@ +/* + * + * 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.selenium.login; import org.openqa.selenium.WebElement;

1 0

r1606 - in trunk/src/main/java/cc/kune/gspace/client: . options/license options/style tool tool/selector
by Vicente J. Ruiz Jurado 12 Nov '11

12 Nov '11

Author: vjrj_ Date: 2011-11-12 22:00:14 +0100 (Sat, 12 Nov 2011) New Revision: 1606 Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPresenter.java Log: Some fix in last changes in i18n Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml 2011-11-12 19:04:16 UTC (rev 1605) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml 2011-11-12 21:00:14 UTC (rev 1606) @@ -35,8 +35,8 @@ </g:tab> <g:tab> <g:header size='0'/> - <g:SimplePanel - ui:field="groupSpaceWrapper" styleName="k-group-space"> + <g:SimplePanel ui:field="groupSpaceWrapper" + styleName="k-group-space"> <g:SplitLayoutPanel width="100%" height="100%" styleName="k-space" ui:field="groupSpace"> <g:center size="1.0"> @@ -93,7 +93,7 @@ </g:south> </g:DockLayoutPanel> </g:center> -  +  <g:west size="200.0"> <g:DockLayoutPanel unit="PX" styleName="{res.style.entityTools}" ui:field="splitEast"> Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java 2011-11-12 19:04:16 UTC (rev 1605) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java 2011-11-12 21:00:14 UTC (rev 1606) @@ -28,6 +28,7 @@ import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.options.EntityOptionsView; +import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.Composite; @@ -86,7 +87,7 @@ @Override public void setLicense(final LicenseDTO defaultLicense) { - licenseImage.setUrl(defaultLicense.getImageUrl()); + licenseImage.setUrl(GWT.getModuleBaseURL() + defaultLicense.getImageUrl()); Tooltip.to(licenseImage, defaultLicense.getLongName()); } } 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-11-12 19:04:16 UTC (rev 1605) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java 2011-11-12 21:00:14 UTC (rev 1606) @@ -23,12 +23,9 @@ import gwtupload.client.IUploader.OnChangeUploaderHandler; import gwtupload.client.IUploader.OnFinishUploaderHandler; import gwtupload.client.IUploader.OnStartUploaderHandler; -import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.tooltip.Tooltip; -import cc.kune.common.client.ui.BasicThumb; import cc.kune.common.client.ui.IconLabel; import cc.kune.common.client.ui.dialogs.tabbed.TabTitleGenerator; -import cc.kune.common.client.utils.TextUtils; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.options.EntityOptionsView; @@ -36,8 +33,6 @@ import cc.kune.gspace.client.themes.GSpaceThemeSelectorPanel; import com.google.gwt.core.client.GWT; -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.ui.Button; @@ -104,19 +99,20 @@ // add(wsInfo); final VerticalPanel stylesPanel = new VerticalPanel(); - final ClickHandler clickHandler = new ClickHandler() { - - @Override - public void onClick(final ClickEvent event) { - NotifyUser.info(i18n.t(TextUtils.IN_DEVELOPMENT)); - } - }; - for (int i = 1; i <= 6; i++) { - final BasicThumb thumb = new BasicThumb("images/styles/styl" + i + ".png", "Style " + i, - clickHandler); - thumb.setTooltip(i18n.t("Click to select and configure this theme")); - // add(thumb); - } + // final ClickHandler clickHandler = new ClickHandler() { + // + // @Override + // public void onClick(final ClickEvent event) { + // NotifyUser.info(i18n.t(TextUtils.IN_DEVELOPMENT)); + // } + // }; + // for (int i = 1; i <= 6; i++) { + // final BasicThumb thumb = new BasicThumb( + // GWT.getModuleBaseURL() + "images/styles/styl" + i + ".png", "Style " + i, + // clickHandler); + // thumb.setTooltip(i18n.t("Click to select and configure this theme")); + // // add(thumb); + // } stylesPanel.addStyleName("oc-clean"); add(stylesPanel); setBackImageVisibleImpl(false); Modified: trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java 2011-11-12 19:04:16 UTC (rev 1605) +++ trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java 2011-11-12 21:00:14 UTC (rev 1606) @@ -23,14 +23,12 @@ import cc.kune.gspace.client.tool.selector.ToolSelectorItemPanel; import cc.kune.gspace.client.tool.selector.ToolSelectorItemPresenter; -import com.google.gwt.i18n.client.HasDirection.Direction; - public abstract class AbstractClientTool { public AbstractClientTool(final String shortName, final String longName, final String tooltip, - final ToolSelector toolSelector, final Direction direction) { + final ToolSelector toolSelector) { final ToolSelectorItemPresenter presenter = new ToolSelectorItemPresenter(shortName, longName, - tooltip, toolSelector, direction); + tooltip, toolSelector); final ToolSelectorItemPanel panel = new ToolSelectorItemPanel(); presenter.init(panel); } Modified: trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java 2011-11-12 19:04:16 UTC (rev 1605) +++ trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java 2011-11-12 21:00:14 UTC (rev 1606) @@ -38,7 +38,7 @@ public FoldableAbstractClientTool(final String shortName, final String longName, final String tooltip, final ToolSelector toolSelector, final ContentCapabilitiesRegistry contentCapabilitiesRegistry, final I18nTranslationService i18n, final NavResources navResources) { - super(shortName, longName, tooltip, toolSelector, i18n.getDirection()); + super(shortName, longName, tooltip, toolSelector); this.contentCapabilitiesRegistry = contentCapabilitiesRegistry; this.i18n = i18n; this.navResources = navResources; 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-11-12 19:04:16 UTC (rev 1605) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java 2011-11-12 21:00:14 UTC (rev 1606) @@ -33,7 +33,7 @@ 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.HasDirectionalText; +import com.google.gwt.user.client.ui.HasText; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.InlineLabel; import com.google.gwt.user.client.ui.Widget; @@ -84,7 +84,7 @@ } @Override - public HasDirectionalText getLabel() { + public HasText getLabel() { return label; } Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPresenter.java 2011-11-12 19:04:16 UTC (rev 1605) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPresenter.java 2011-11-12 21:00:14 UTC (rev 1606) @@ -24,9 +24,8 @@ 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.i18n.client.HasDirection.Direction; import com.google.gwt.user.client.History; -import com.google.gwt.user.client.ui.HasDirectionalText; +import com.google.gwt.user.client.ui.HasText; import com.google.gwt.user.client.ui.IsWidget; public class ToolSelectorItemPresenter implements ToolSelectorItem { @@ -34,7 +33,7 @@ HasClickHandlers getFocus(); - HasDirectionalText getLabel(); + HasText getLabel(); void setSelected(boolean selected); @@ -43,7 +42,6 @@ void setVisible(boolean visible); } - private final Direction direction; private final String longName; private final String shortName; private StateToken token; @@ -52,12 +50,11 @@ private ToolSelectorItemView view; public ToolSelectorItemPresenter(final String shortName, final String longName, final String tooltip, - final ToolSelector toolSelector, final Direction direction) { + final ToolSelector toolSelector) { this.shortName = shortName; this.longName = longName; this.tooltip = tooltip; this.toolSelector = toolSelector; - this.direction = direction; } @Override @@ -79,7 +76,7 @@ History.newItem(token.toString()); } }); - view.getLabel().setText(longName, direction); + view.getLabel().setText(longName); view.setTooltip(tooltip); }

1 0

r1605 - in trunk: . src/main/java/cc/kune/common/client/ui src/main/java/cc/kune/core/client/actions/xml src/main/java/cc/kune/core/shared/dto
by Vicente J. Ruiz Jurado 12 Nov '11

12 Nov '11

Author: vjrj_ Date: 2011-11-12 20:04:16 +0100 (Sat, 12 Nov 2011) New Revision: 1605 Modified: trunk/TODO trunk/pom.xml trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java trunk/src/main/java/cc/kune/core/client/actions/xml/AddGadgetAction.java trunk/src/main/java/cc/kune/core/client/actions/xml/NewGadgetAction.java trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java trunk/src/main/java/cc/kune/core/shared/dto/StateContainerDTO.java Log: Minor changes Modified: trunk/TODO =================================================================== --- trunk/TODO 2011-11-12 15:47:35 UTC (rev 1604) +++ trunk/TODO 2011-11-12 19:04:16 UTC (rev 1605) @@ -12,6 +12,18 @@ nick == assigned to * SHORT-TERM (URGENT) +** group.inexistentTool nasty error +** styles/styl2.png" and /lic/ instead or /lic/ in group options +styl2.png +"NetworkError: 404 Not Found - http://beta.eurosur.org/images/styles/styl3.png" +styl3.png +"NetworkError: 404 Not Found - http://beta.eurosur.org/images/styles/styl4.png" +styl4.png +"NetworkError: 404 Not Found - http://beta.eurosur.org/images/styles/styl5.png" +styl5.png +"NetworkError: 404 Not Found - http://beta.eurosur.org/images/styles/styl6.png" +styl6.png +"NetworkError: 404 Not Found - http://beta.eurosur.org/images/lic/ ** i18n usecase | logged | locale in URL | i18n supported | useDB | | false | false | false | true | Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-12 15:47:35 UTC (rev 1604) +++ trunk/pom.xml 2011-11-12 19:04:16 UTC (rev 1605) @@ -1022,6 +1022,7 @@ <configuration> <logLevel>INFO</logLevel> <style>OBF</style> +  <noServer>true</noServer> <gwtVersion>${gwt.version}</gwtVersion> <runTarget>/ws/ws.html?log_level=DEBUG</runTarget> Modified: trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-11-12 15:47:35 UTC (rev 1604) +++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-11-12 19:04:16 UTC (rev 1605) @@ -132,14 +132,6 @@ return flow.remove(w); } - // @Deprecated - // private void setDirection(final Direction dir) { - // setIconRTL(iconLeft, dir); - // setIconRTL(iconRight, dir); - // label.addStyleName(dir.equals(Direction.LTR) ? "k-fr" : "k-fl"); - // } - // - @Deprecated private void setIconRTL(final Widget widget, final Direction direction) { widget.addStyleName(direction.equals(Direction.LTR) ? "k-fl" : "k-fr"); } @@ -209,13 +201,11 @@ @Override public void setText(final String text) { - // setDirection(Direction.LTR); label.setText(text, Direction.LTR); } @Override public void setText(final String text, final Direction dir) { - // setDirection(dir); label.setText(text, dir); } Modified: trunk/src/main/java/cc/kune/core/client/actions/xml/AddGadgetAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/actions/xml/AddGadgetAction.java 2011-11-12 15:47:35 UTC (rev 1604) +++ trunk/src/main/java/cc/kune/core/client/actions/xml/AddGadgetAction.java 2011-11-12 19:04:16 UTC (rev 1605) @@ -35,28 +35,30 @@ public class AddGadgetAction extends RolAction { private final Provider<ContentServiceAsync> contentService; + private final String gadgetExtName; private final String gadgetName; private final I18nTranslationService i18n; private final Session session; public AddGadgetAction(final Provider<ContentServiceAsync> contentService, final Session session, final I18nTranslationService i18n, final AccessRolDTO rol, final boolean authNeeded, - final String gadgetName, final String iconUrl) { + final String gadgetExtName, final String gadgetName, final String iconUrl) { super(rol, authNeeded); this.contentService = contentService; this.i18n = i18n; + this.session = session; + this.gadgetExtName = gadgetExtName; this.gadgetName = gadgetName; - this.session = session; putValue(Action.SMALL_ICON, iconUrl); } @Override public void actionPerformed(final ActionEvent event) { contentService.get().addGadgetToContent(session.getUserHash(), session.getCurrentStateToken(), - gadgetName, new AsyncCallbackSimple<Void>() { + gadgetExtName, new AsyncCallbackSimple<Void>() { @Override public void onSuccess(final Void result) { - NotifyUser.info(i18n.t("'[%s]' created succesfully", gadgetName), + NotifyUser.info(i18n.t("'[%s]' created succesfully", i18n.t(gadgetName)), i18n.t(CoreMessages.GADGETS_EXPERIMENTAL)); } }); Modified: trunk/src/main/java/cc/kune/core/client/actions/xml/NewGadgetAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/actions/xml/NewGadgetAction.java 2011-11-12 15:47:35 UTC (rev 1604) +++ trunk/src/main/java/cc/kune/core/client/actions/xml/NewGadgetAction.java 2011-11-12 19:04:16 UTC (rev 1605) @@ -71,7 +71,7 @@ gadgetName, typeId, i18n.t(title), i18n.t(body), new AsyncCallbackSimple<StateContentDTO>() { @Override public void onSuccess(final StateContentDTO result) { - NotifyUser.info(i18n.t("'[%s]' created succesfully", title), + NotifyUser.info(i18n.t("'[%s]' created succesfully", i18n.t(title)), i18n.t(CoreMessages.GADGETS_EXPERIMENTAL)); stateManager.setRetrievedStateAndGo(result); contentViewer.blinkTitle(); 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-11-12 15:47:35 UTC (rev 1604) +++ trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java 2011-11-12 19:04:16 UTC (rev 1605) @@ -173,7 +173,7 @@ // container) action = new AddGadgetAction(contentService, session, i18n, descrip.getRol().getRolRequired(), descrip.getRol().isAuthNeed(), - extension.getExtName(), extension.getIconUrl()); + extension.getExtName(), descrip.getDescName(), extension.getIconUrl()); } else { action = new NewGadgetAction(contentService, contentViewer, stateManager, session, i18n, descrip.getRol().getRolRequired(), descrip.getRol().isAuthNeed(), Modified: trunk/src/main/java/cc/kune/core/shared/dto/StateContainerDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/StateContainerDTO.java 2011-11-12 15:47:35 UTC (rev 1604) +++ trunk/src/main/java/cc/kune/core/shared/dto/StateContainerDTO.java 2011-11-12 19:04:16 UTC (rev 1605) @@ -43,7 +43,6 @@ return accessLists; } - @Override public ContainerDTO getContainer() { return container; }

1 0

r1604 - in trunk/src/main/java/cc/kune: client common/client/actions/gwtui common/client/notify common/client/ui common/client/ui/dialogs/tabbed common/public core/client core/client/actions/xml core/client/cnt core/client/i18n core/client/resources core/client/sitebar core/client/sitebar/search core/public core/server/i18n core/shared/dto gspace/client gspace/client/options/logo gspace/client/options/style gspace/client/tool gspace/client/tool/selector gspace/client/viewers
by Vicente J. Ruiz Jurado 12 Nov '11

12 Nov '11

Author: vjrj_ Date: 2011-11-12 16:47:35 +0100 (Sat, 12 Nov 2011) New Revision: 1604 Added: trunk/src/main/java/cc/kune/common/public/kune-common-rtl.css trunk/src/main/java/cc/kune/core/client/i18n/I18nStyles.java trunk/src/main/java/cc/kune/core/public/ws-rtl.css Modified: trunk/src/main/java/cc/kune/client/KuneGinjector.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtBaseMenuItem.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/TabTitleGenerator.java trunk/src/main/java/cc/kune/common/public/kune-common.css trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/actions/xml/AddGadgetAction.java trunk/src/main/java/cc/kune/core/client/actions/xml/NewGadgetAction.java trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPanel.java trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java trunk/src/main/java/cc/kune/core/client/sitebar/ErrorsDialog.java trunk/src/main/java/cc/kune/core/client/sitebar/search/EntitySearchPanel.java trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java trunk/src/main/java/cc/kune/core/shared/dto/ContainerDTO.java trunk/src/main/java/cc/kune/core/shared/dto/StateContainerDTO.java trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPresenter.java trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java Log: NEW - # 156: Give RTL support (for Arabic and other similar languages) http://kune.ourproject.org/issues/ticket/156 Modified: trunk/src/main/java/cc/kune/client/KuneGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -26,7 +26,6 @@ import cc.kune.chat.client.ChatGinModule; import cc.kune.chat.client.ChatGinjector; import cc.kune.common.client.actions.gwtui.GwtGuiProvider; -import cc.kune.common.client.actions.gxtui.GxtGuiProvider; import cc.kune.common.client.actions.ui.bind.GuiProvider; import cc.kune.common.client.log.EventBusWithLogging; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; @@ -117,7 +116,7 @@ GwtGuiProvider getGwtGuiProvider(); - GxtGuiProvider getGxtGuiProvider(); + // GxtGuiProvider getGxtGuiProvider(); HSpaceParts getHSpaceParts(); Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -191,7 +191,7 @@ @Override public void setIconResource(final ImageResource icon) { iconLabel.setRightIconResource(icon); - iconLabel.addRightIconStyle("k-fl"); + // iconLabel.addRightIconStyle("k-fl"); layout(); } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtBaseMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtBaseMenuItem.java 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtBaseMenuItem.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -24,24 +24,24 @@ public class GwtBaseMenuItem extends MenuItem { - private static Command dummyCommand() { - return new Command() { - @Override - public void execute() { - } - }; - } + private static Command dummyCommand() { + return new Command() { + @Override + public void execute() { + } + }; + } - public GwtBaseMenuItem() { - super("", dummyCommand()); - } + public GwtBaseMenuItem() { + super("", dummyCommand()); + } - public GwtBaseMenuItem(final String text) { - super(text, dummyCommand()); - } + public GwtBaseMenuItem(final String text) { + super(text, dummyCommand()); + } - public GwtBaseMenuItem(final String text, final boolean asHtml) { - super(text, asHtml, dummyCommand()); - } + public GwtBaseMenuItem(final String text, final boolean asHtml) { + super(text, asHtml, dummyCommand()); + } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -61,7 +61,7 @@ final ImageResource rightIcon = ((MenuDescriptor) descriptor).getRightIcon(); if (rightIcon != null) { iconLabel.setRightIconResource(rightIcon); - iconLabel.addRightIconStyle("k-fr"); + // iconLabel.addRightIconStyle("k-fr"); } button.addClickHandler(new ClickHandler() { @Override Modified: trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -82,6 +82,10 @@ eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.info, message, closeable)); } + public static void info(final String title, final String message) { + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.info, title, message)); + } + public static void info(final String title, final String message, final String id, final boolean closeable) { sendEventImpl(title, message, id, closeable, NotifyLevel.info); Modified: trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -132,6 +132,18 @@ return flow.remove(w); } + // @Deprecated + // private void setDirection(final Direction dir) { + // setIconRTL(iconLeft, dir); + // setIconRTL(iconRight, dir); + // label.addStyleName(dir.equals(Direction.LTR) ? "k-fr" : "k-fl"); + // } + // + @Deprecated + private void setIconRTL(final Widget widget, final Direction direction) { + widget.addStyleName(direction.equals(Direction.LTR) ? "k-fl" : "k-fr"); + } + public void setId(final String id) { self.ensureDebugId(id); } @@ -153,6 +165,8 @@ private void setLeftIconResourceImpl(final ImageResource res) { iconLeft.setResource(res); iconLeft.addStyleName("k-iconlabel-left"); + // setting floats again, because with setResource we lost them + setIconRTL(iconLeft, getTextDirection()); iconLeft.setVisible(true); } @@ -176,6 +190,8 @@ public void setRightIconResource(final ImageResource res) { iconRight.setResource(res); iconRight.addStyleName("k-iconlabel-right"); + // setting floats again, because with setResource we lost them + setIconRTL(iconRight, getTextDirection()); iconRight.setVisible(true); } @@ -193,11 +209,13 @@ @Override public void setText(final String text) { - label.setText(text); + // setDirection(Direction.LTR); + label.setText(text, Direction.LTR); } @Override public void setText(final String text, final Direction dir) { + // setDirection(dir); label.setText(text, dir); } 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-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -282,7 +282,7 @@ public void setTitle(final String title) { this.title = title; if (dialog != null) { - dialog.getTitleText().setText(title); + dialog.getTitleText().setText(title, direction); } } Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/TabTitleGenerator.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/TabTitleGenerator.java 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/TabTitleGenerator.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -4,6 +4,7 @@ import cc.kune.common.client.ui.IconLabel; import cc.kune.common.client.utils.TextUtils; +import com.google.gwt.i18n.client.HasDirection.Direction; import com.google.gwt.resources.client.ImageResource; public class TabTitleGenerator { @@ -23,8 +24,9 @@ return tabTitle; } - public static void setText(final IconLabel tabTitle, final String title, final int maxLength) { - tabTitle.setText(format(title, maxLength)); + public static void setText(final IconLabel tabTitle, final String title, final int maxLength, + final Direction direction) { + tabTitle.setText(format(title, maxLength), direction); setTooltip(title, maxLength, tabTitle); } Added: trunk/src/main/java/cc/kune/common/public/kune-common-rtl.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/kune-common-rtl.css (rev 0) +++ trunk/src/main/java/cc/kune/common/public/kune-common-rtl.css 2011-11-12 15:47:35 UTC (rev 1604) @@ -0,0 +1,33 @@ +/* Here the styles of cc.kune.commom (reused by other projects like gadgets and so on) */ +.k-iconlabel-text { + float: left; +} + +.k-iconlabel-left { + float: right; +} + +.k-iconlabel-right { + float: right; +} + +.gwt-MenuBar .gwt-MenuItem { + float: right; +} + +.k-menuimtem-title { + float: right; +} + +.k-tool-panel { + text-align: rigth; +} + +.entityTools { + text-align: right; +} + +.docHeader { + text-align: right; + padding-right: 10px; +} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/common/public/kune-common.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-11-12 15:47:35 UTC (rev 1604) @@ -473,9 +473,18 @@ vertical-align: top; padding-left: 3px; padding-right: 3px; - /* float: left; */ + float: right; } +.k-iconlabel-left { + float: left; +} + +.k-iconlabel-right { + float: left; + /* margin-left: 5px; */ +} + .k-menuimtem-title { color: white; font-size: 15px; @@ -489,14 +498,7 @@ margin-top: 4px; } -.k-iconlabel-left { - float: left; -} -.k-iconlabel-right { /* float: left; */ /* margin-left: 5px; */ - -} - .gwt-MenuBar-vertical .subMenuIcon-selected { background: none repeat scroll 0 0 #808080; } Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -20,7 +20,6 @@ package cc.kune.core.client; import cc.kune.common.client.ExtendedGinModule; -import cc.kune.common.client.actions.gwtui.GwtGuiProvider; import cc.kune.common.client.actions.gxtui.GxtGuiProvider; import cc.kune.common.client.actions.ui.bind.DefaultGuiProvider; import cc.kune.common.client.actions.ui.bind.GuiProvider; @@ -195,7 +194,7 @@ // UI bind(GuiProvider.class).to(DefaultGuiProvider.class).in(Singleton.class); s(GxtGuiProvider.class); - s(GwtGuiProvider.class); + // s(GwtGuiProvider.class); bind(MaskWidgetView.class).to(MaskWidget.class).in(Singleton.class); Modified: trunk/src/main/java/cc/kune/core/client/actions/xml/AddGadgetAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/actions/xml/AddGadgetAction.java 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/core/client/actions/xml/AddGadgetAction.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -21,11 +21,14 @@ import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.actions.RolAction; +import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.shared.dto.AccessRolDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Provider; @@ -33,12 +36,15 @@ private final Provider<ContentServiceAsync> contentService; private final String gadgetName; + private final I18nTranslationService i18n; private final Session session; public AddGadgetAction(final Provider<ContentServiceAsync> contentService, final Session session, - final AccessRolDTO rol, final boolean authNeeded, final String gadgetName, final String iconUrl) { + final I18nTranslationService i18n, final AccessRolDTO rol, final boolean authNeeded, + final String gadgetName, final String iconUrl) { super(rol, authNeeded); this.contentService = contentService; + this.i18n = i18n; this.gadgetName = gadgetName; this.session = session; putValue(Action.SMALL_ICON, iconUrl); @@ -50,6 +56,8 @@ gadgetName, new AsyncCallbackSimple<Void>() { @Override public void onSuccess(final Void result) { + NotifyUser.info(i18n.t("'[%s]' created succesfully", gadgetName), + i18n.t(CoreMessages.GADGETS_EXPERIMENTAL)); } }); } Modified: trunk/src/main/java/cc/kune/core/client/actions/xml/NewGadgetAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/actions/xml/NewGadgetAction.java 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/core/client/actions/xml/NewGadgetAction.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -23,6 +23,7 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.actions.RolAction; +import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.state.Session; @@ -70,7 +71,8 @@ gadgetName, typeId, i18n.t(title), i18n.t(body), new AsyncCallbackSimple<StateContentDTO>() { @Override public void onSuccess(final StateContentDTO result) { - NotifyUser.info(i18n.t("[%s] created succesfully", title)); + NotifyUser.info(i18n.t("'[%s]' created succesfully", title), + i18n.t(CoreMessages.GADGETS_EXPERIMENTAL)); stateManager.setRetrievedStateAndGo(result); contentViewer.blinkTitle(); } 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-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -171,7 +171,7 @@ if (origTypeId.equals(destTypeId)) { // We are adding a gadget in a doc (nor creating a gadget in a // container) - action = new AddGadgetAction(contentService, session, + action = new AddGadgetAction(contentService, session, i18n, descrip.getRol().getRolRequired(), descrip.getRol().isAuthNeed(), extension.getExtName(), extension.getIconUrl()); } else { Modified: trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPanel.java 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPanel.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -39,148 +39,154 @@ @Deprecated public abstract class FoldableContentPanel extends AbstractContentPanel implements AbstractContentView { - private static final String DEF_CONTENT_MARGINS_STYLE = "kune-Margin-7-trbl"; - private final I18nTranslationService i18n; - private final IconLabel messageLabel; - private final FlowPanel messagePanel; + private static final String DEF_CONTENT_MARGINS_STYLE = "kune-Margin-7-trbl"; + private final I18nTranslationService i18n; + private final IconLabel messageLabel; + private final FlowPanel messagePanel; - public FoldableContentPanel(final GSpaceArmor ws, final I18nTranslationService i18n, final CoreResources res, - final WaveClientManager waveClientManager) { - super(ws); - this.i18n = i18n; - messageLabel = new IconLabel(""); - messageLabel.setLeftIconResource(res.info()); - messageLabel.addStyleName("k-preview-msg-lab"); - messagePanel = new FlowPanel(); - messagePanel.add(messageLabel); - messagePanel.addStyleName("k-preview-msg"); - messagePanel.addStyleName("kune-Margin-7-b"); - } + public FoldableContentPanel(final GSpaceArmor ws, final I18nTranslationService i18n, + final CoreResources res, final WaveClientManager waveClientManager) { + super(ws); + this.i18n = i18n; + messageLabel = new IconLabel(""); + messageLabel.setLeftIconResource(res.info()); + messageLabel.addStyleName("k-preview-msg-lab"); + messagePanel = new FlowPanel(); + messagePanel.add(messageLabel); + messagePanel.addStyleName("k-preview-msg"); + messagePanel.addStyleName("kune-Margin-7-b"); + } - private VerticalPanel createMessageVp(final boolean showMsg) { - final VerticalPanel vp = new VerticalPanel(); - if (showMsg) { - setDefPreviewMsg(); - vp.add(messagePanel); - } - return vp; + private VerticalPanel createMessageVp(final boolean showMsg) { + final VerticalPanel vp = new VerticalPanel(); + if (showMsg) { + setDefPreviewMsg(); + vp.add(messagePanel); } + return vp; + } - @Override - public void setContent(final String content, final boolean showPreviewMsg) { - final VerticalPanel vp = createMessageVp(showPreviewMsg); - final HTML html = new HTML(content); - vp.add(html); - setWidgetAsContent(vp, true); - } + @Override + public void setContent(final String content, final boolean showPreviewMsg) { + final VerticalPanel vp = createMessageVp(showPreviewMsg); + final HTML html = new HTML(content); + vp.add(html); + setWidgetAsContent(vp, true); + } - private void setContent(final Widget widget) { - setWidget(widget); - attach(); - } + private void setContent(final Widget widget) { + setWidget(widget); + attach(); + } - private void setDefPreviewMsg() { - messageLabel.setText(i18n.t("This is only a preview, download it to get the complete file")); - } + private void setDefPreviewMsg() { + messageLabel.setText(i18n.t("This is only a preview, download it to get the complete file"), + i18n.getDirection()); + } - private void setDefStyle(final Widget widget) { - widget.setStyleName("kune-Content-Main"); - widget.addStyleName(DEF_CONTENT_MARGINS_STYLE); - } + private void setDefStyle(final Widget widget) { + widget.setStyleName("kune-Content-Main"); + widget.addStyleName(DEF_CONTENT_MARGINS_STYLE); + } - @Override - public void setEditableWaveContent(final WaveRef waveRef, final boolean isNewWave) { // NOPMD by vjrj on 27/04/11 8:40 - // FIXME - } + @Override + public void setEditableWaveContent(final WaveRef waveRef, final boolean isNewWave) { // NOPMD + // by + // vjrj + // on + // 27/04/11 + // 8:40 + // FIXME + } - // public void setWave(final String waveId, final Listener0 onLoaded) { - // final WaveWidget waveWidget = new - // WaveWidget("http://wave.google.com/a/wavesandbox.com/"); - // waveWidget.setUIConfig("white", "black", "arial, sans", "10pt"); - // waveWidget.setHeight("100%"); - // waveWidget.addWaveLoadHandler(new WaveLoadHandler() { - // public void onWaveLoad(final WaveLoadEvent event) { - // Log.info("Wave '" + event.getWaveId() + "' loaded!"); - // onLoaded.onEvent(); - // } - // }); - // waveWidget.loadWave(waveId); - // setWidgetAsContent(waveWidget, false); - // waveWidget.setToolbarVisible(true); - // waveWidget.setEditMode(false); - // } + // public void setWave(final String waveId, final Listener0 onLoaded) { + // final WaveWidget waveWidget = new + // WaveWidget("http://wave.google.com/a/wavesandbox.com/"); + // waveWidget.setUIConfig("white", "black", "arial, sans", "10pt"); + // waveWidget.setHeight("100%"); + // waveWidget.addWaveLoadHandler(new WaveLoadHandler() { + // public void onWaveLoad(final WaveLoadEvent event) { + // Log.info("Wave '" + event.getWaveId() + "' loaded!"); + // onLoaded.onEvent(); + // } + // }); + // waveWidget.loadWave(waveId); + // setWidgetAsContent(waveWidget, false); + // waveWidget.setToolbarVisible(true); + // waveWidget.setEditMode(false); + // } - @Override - public void setInfo(final String info) { - setLabel(info); - } + @Override + public void setInfo(final String info) { + setLabel(info); + } - @Override - public void setInfoMessage(final String text) { - final VerticalPanel vp = createMessageVp(true); - messageLabel.setText(text); - setWidgetAsContent(vp, true); - } + @Override + public void setInfoMessage(final String text) { + final VerticalPanel vp = createMessageVp(true); + messageLabel.setText(text, i18n.getDirection()); + setWidgetAsContent(vp, true); + } - public void setLabel(final String text) { - final Label label = new Label(text); - setDefStyle(label); - setWidget(label); - } + public void setLabel(final String text) { + final Label label = new Label(text); + setDefStyle(label); + setWidget(label); + } - @Override - public void setNoPreview() { - final VerticalPanel vp = createMessageVp(true); - setNoPreviewLabelMsg(); - setWidgetAsContent(vp, true); - } + @Override + public void setNoPreview() { + final VerticalPanel vp = createMessageVp(true); + setNoPreviewLabelMsg(); + setWidgetAsContent(vp, true); + } - private void setNoPreviewLabelMsg() { - messageLabel.setText(i18n.t("Preview not available")); - } + private void setNoPreviewLabelMsg() { + messageLabel.setText(i18n.t("Preview not available"), i18n.getDirection()); + } - @Override - public void setRawContent(final String content) { - final HTML html = new HTML(content); - setDefStyle(html); - setContent(html); - } + @Override + public void setRawContent(final String content) { + final HTML html = new HTML(content); + setDefStyle(html); + setContent(html); + } - @Override - public void setWidgetAsContent(final Widget widget, final boolean setDefMargins) { - if (setDefMargins) { - widget.addStyleName(DEF_CONTENT_MARGINS_STYLE); - } - setContent(widget); + @Override + public void setWidgetAsContent(final Widget widget, final boolean setDefMargins) { + if (setDefMargins) { + widget.addStyleName(DEF_CONTENT_MARGINS_STYLE); } + setContent(widget); + } - @Override - public void showImage(final String imageUrl, final String imageResizedUrl, final boolean showPreviewMsg) { - final VerticalPanel vp = createMessageVp(showPreviewMsg); - final Image imgOrig = new Image(imageUrl); - final Image imgResized = new Image(imageResizedUrl); - imgOrig.setTitle(i18n.t("Click to zoom out")); - imgResized.setTitle(i18n.t("Click to zoom in")); - setDefStyle(imgOrig); - setDefStyle(imgResized); - imgOrig.addStyleName("kune-pointer"); - imgResized.addStyleName("kune-pointer"); - imgResized.addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - imgResized.removeFromParent(); - vp.add(imgOrig); - } - }); - imgOrig.addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - imgOrig.removeFromParent(); - vp.add(imgResized); - } - }); + @Override + public void showImage(final String imageUrl, final String imageResizedUrl, final boolean showPreviewMsg) { + final VerticalPanel vp = createMessageVp(showPreviewMsg); + final Image imgOrig = new Image(imageUrl); + final Image imgResized = new Image(imageResizedUrl); + imgOrig.setTitle(i18n.t("Click to zoom out")); + imgResized.setTitle(i18n.t("Click to zoom in")); + setDefStyle(imgOrig); + setDefStyle(imgResized); + imgOrig.addStyleName("kune-pointer"); + imgResized.addStyleName("kune-pointer"); + imgResized.addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + imgResized.removeFromParent(); + vp.add(imgOrig); + } + }); + imgOrig.addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + imgOrig.removeFromParent(); vp.add(imgResized); - setWidgetAsContent(vp, true); - Image.prefetch(imageUrl); - } + } + }); + vp.add(imgResized); + setWidgetAsContent(vp, true); + Image.prefetch(imageUrl); + } } Added: trunk/src/main/java/cc/kune/core/client/i18n/I18nStyles.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nStyles.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nStyles.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -0,0 +1,46 @@ +package cc.kune.core.client.i18n; + +import com.google.gwt.dom.client.Document; +import com.google.gwt.dom.client.HeadElement; +import com.google.gwt.dom.client.LinkElement; + +/** + * + * Some code from the StyleSheetLoader.java GWT's showcase + * + */ +public class I18nStyles { + + /** + * Convenience method for getting the document's head element. + * + * + * @return the document's head element + */ + private static native HeadElement getHeadElement() + /*-{ + return $doc.getElementsByTagName("head")[0]; + }-*/; + + /** + * Load a style sheet onto the page. + * + * @param href + * the url of the style sheet + */ + private static void loadStyleSheet(final String href) { + final LinkElement linkElem = Document.get().createLinkElement(); + linkElem.setRel("stylesheet"); + linkElem.setType("text/css"); + linkElem.setHref(href); + getHeadElement().appendChild(linkElem); + } + + public static void setRTL(final boolean isRTL) { + if (isRTL) { + loadStyleSheet("ws/kune-common-rtl.css"); + loadStyleSheet("ws/ws-rtl.css"); + } + } + +} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -105,6 +105,7 @@ isCurrentLangRTL = currentLang.getDirection().equals(RTL); eventBus.fireEvent(new I18nReadyEvent()); } + I18nStyles.setRTL(isCurrentLangRTL); } }); session.onUserSignIn(true, new UserSignInHandler() { Modified: trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -27,6 +27,7 @@ public final static String ENT_LOGO_SELECTOR_PERSON_TITLE = "Avatar"; public final static String FIELD_MUST_BE_BETWEEN_3_AND_15 = "The name must be between 3 and 15 lowercase Western characters and/or numbers"; public final static String FIELD_MUST_BE_BETWEEN_3_AND_15_NO_CHARS = "The name must be between 3 and 15 lowercase characters."; + public final static String GADGETS_EXPERIMENTAL = "Nowadays the gadgets (maps, polls, etc) are experimental. In some browsers you might experience problems with certain gadgets"; public final static String GROUP_OPTIONS_DIALOG_TITLE = "Group options"; public final static String GROUPNAME_RESTRICTED = "This group name can not be used. Please try with a different name"; public final static String INCORRECT_NICKNAME_EMAIL_OR_PASSWORD = "The username/password is incorrect"; Modified: trunk/src/main/java/cc/kune/core/client/sitebar/ErrorsDialog.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/ErrorsDialog.java 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/core/client/sitebar/ErrorsDialog.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -57,7 +57,7 @@ dialog = new BasicTopDialog.Builder(ERROR_LOGGER_ID, true, true, i18n.getDirection()).title( i18n.t("Errors info")).autoscroll(true).firstButtonTitle(i18n.t("Ok")).firstButtonId( ERROR_LOGGER_BUTTON_ID).tabIndexStart(1).width("400px").height("400px").build(); - dialog.getTitleText().setText(i18n.t("Info about errors")); + dialog.getTitleText().setText(i18n.t("Info about errors"), i18n.getDirection()); final InlineLabel subTitle = new InlineLabel( i18n.t("Please copy/paste this info to report problems")); dialog.getInnerPanel().add(subTitle); @@ -76,7 +76,7 @@ final NotifyLevel level = event.getLevel(); final IconLabel iconMessage = new IconLabel(); iconMessage.setLeftIconResource(UserMessageImagesUtil.getIcon(level)); - iconMessage.setText(event.getMessage()); + iconMessage.setText(event.getMessage(), i18n.getDirection()); iconMessage.setWordWrap(true); panel.insert(iconMessage, 0); } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/EntitySearchPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/EntitySearchPanel.java 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/EntitySearchPanel.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -71,7 +71,7 @@ private void create() { dialog.getTitleText().setText( i18n.t(searchOnlyUsers ? "Type the name of the user and select him/her:" - : "Type the name of the user or group and select it:")); + : "Type the name of the user or group and select it:"), i18n.getDirection()); final MultivalueSuggestBox multivalueSBox = SearchBoxFactory.create(i18n, searchOnlyUsers, callback); suggestBox = multivalueSBox.getSuggestBox(); searchTextBox = suggestBox.getTextBox(); Added: trunk/src/main/java/cc/kune/core/public/ws-rtl.css =================================================================== Modified: trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -26,24 +26,25 @@ import cc.kune.domain.I18nTranslation; import com.google.inject.Inject; +import com.google.inject.Provider; import com.google.inject.Singleton; @Singleton public class I18nTranslationServiceDefault extends I18nTranslationService { private final I18nTranslationManager translationManager; - private final UserSessionManager userSessionManager; + private final Provider<UserSessionManager> userSessionManager; @Inject public I18nTranslationServiceDefault(final I18nTranslationManager translationManager, - final UserSessionManager userSessionManager) { + final Provider<UserSessionManager> userSessionManager) { this.translationManager = translationManager; this.userSessionManager = userSessionManager; } @Override public boolean isRTL() { - return userSessionManager.isUserLoggedIn() ? userSessionManager.getUser().getLanguage().getDirection().equals( + return userSessionManager.get().isUserLoggedIn() ? userSessionManager.get().getUser().getLanguage().getDirection().equals( RTL) : false; } @@ -77,8 +78,8 @@ @Override public String tWithNT(final String text, final String noteForTranslators) { String language; - if (userSessionManager.isUserLoggedIn()) { - language = userSessionManager.getUser().getLanguage().getCode(); + if (userSessionManager.get().isUserLoggedIn()) { + language = userSessionManager.get().getUser().getLanguage().getCode(); } else { language = I18nTranslation.DEFAULT_LANG; } Modified: trunk/src/main/java/cc/kune/core/shared/dto/ContainerDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/ContainerDTO.java 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/core/shared/dto/ContainerDTO.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -26,80 +26,84 @@ import com.google.gwt.user.client.rpc.IsSerializable; public class ContainerDTO implements IsSerializable { - private Long id; - private String name; - private String typeId; - private StateToken stateToken; - private Long parentFolderId; - private ContainerSimpleDTO[] absolutePath; - private List<ContainerSimpleDTO> childs; - private List<ContentSimpleDTO> contents; + private ContainerSimpleDTO[] absolutePath; + private List<ContainerSimpleDTO> childs; + private List<ContentSimpleDTO> contents; + private Long id; + private String name; + private Long parentFolderId; + private StateToken stateToken; + private String typeId; - public ContainerDTO() { - } + public ContainerDTO() { + } - public ContainerSimpleDTO[] getAbsolutePath() { - return absolutePath; - } + public ContainerSimpleDTO[] getAbsolutePath() { + return absolutePath; + } - public List<ContainerSimpleDTO> getChilds() { - return childs; - } + public List<ContainerSimpleDTO> getChilds() { + return childs; + } - public List<ContentSimpleDTO> getContents() { - return contents; - } + public List<ContentSimpleDTO> getContents() { + return contents; + } - public Long getId() { - return id; - } + public Long getId() { + return id; + } - public String getName() { - return name; - } + public String getName() { + return name; + } - public Long getParentFolderId() { - return parentFolderId; - } + public Long getParentFolderId() { + return parentFolderId; + } - public StateToken getStateToken() { - return stateToken; - } + public StateToken getStateToken() { + return stateToken; + } - public String getTypeId() { - return typeId; - } + public String getTypeId() { + return typeId; + } - public void setAbsolutePath(final ContainerSimpleDTO[] absolutePath) { - this.absolutePath = absolutePath; - } + public boolean isRoot() { + return parentFolderId == null; + } - public void setChilds(final List<ContainerSimpleDTO> childs) { - this.childs = childs; - } + public void setAbsolutePath(final ContainerSimpleDTO[] absolutePath) { + this.absolutePath = absolutePath; + } - public void setContents(final List<ContentSimpleDTO> contents) { - this.contents = contents; - } + public void setChilds(final List<ContainerSimpleDTO> childs) { + this.childs = childs; + } - public void setId(final Long id) { - this.id = id; - } + public void setContents(final List<ContentSimpleDTO> contents) { + this.contents = contents; + } - public void setName(final String name) { - this.name = name; - } + public void setId(final Long id) { + this.id = id; + } - public void setParentFolderId(final Long parentFolderId) { - this.parentFolderId = parentFolderId; - } + public void setName(final String name) { + this.name = name; + } - public void setStateToken(final StateToken stateToken) { - this.stateToken = stateToken; - } + public void setParentFolderId(final Long parentFolderId) { + this.parentFolderId = parentFolderId; + } - public void setTypeId(final String typeId) { - this.typeId = typeId; - } + public void setStateToken(final StateToken stateToken) { + this.stateToken = stateToken; + } + public void setTypeId(final String typeId) { + this.typeId = typeId; + } + } Modified: trunk/src/main/java/cc/kune/core/shared/dto/StateContainerDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/StateContainerDTO.java 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/core/shared/dto/StateContainerDTO.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -26,100 +26,101 @@ public class StateContainerDTO extends StateAbstractDTO implements IsSerializable, HasContent { - private AccessListsDTO accessLists; - private ContainerDTO container; - private AccessRights containerRights; - private I18nLanguageDTO language; - private LicenseDTO license; - private ContainerDTO rootContainer; - private TagCloudResult tagCloudResult; - private String toolName; - private String typeId; + private AccessListsDTO accessLists; + private ContainerDTO container; + private AccessRights containerRights; + private I18nLanguageDTO language; + private LicenseDTO license; + private ContainerDTO rootContainer; + private TagCloudResult tagCloudResult; + private String toolName; + private String typeId; - public StateContainerDTO() { - } + public StateContainerDTO() { + } - public AccessListsDTO getAccessLists() { - return accessLists; - } + public AccessListsDTO getAccessLists() { + return accessLists; + } - public ContainerDTO getContainer() { - return container; - } + @Override + public ContainerDTO getContainer() { + return container; + } - public AccessRights getContainerRights() { - return containerRights; - } + public AccessRights getContainerRights() { + return containerRights; + } - public I18nLanguageDTO getLanguage() { - return language; - } + public I18nLanguageDTO getLanguage() { + return language; + } - public LicenseDTO getLicense() { - return license; - } + public LicenseDTO getLicense() { + return license; + } - public ContainerDTO getRootContainer() { - return rootContainer; - } + public ContainerDTO getRootContainer() { + return rootContainer; + } - public TagCloudResult getTagCloudResult() { - return tagCloudResult; - } + public TagCloudResult getTagCloudResult() { + return tagCloudResult; + } - public String getToolName() { - return toolName; - } + public String getToolName() { + return toolName; + } - @Override - public String getTypeId() { - return typeId; - } + @Override + public String getTypeId() { + return typeId; + } - public boolean isType(final String type) { - return getTypeId().equals(type); - } + public boolean isType(final String type) { + return getTypeId().equals(type); + } - public void setAccessLists(final AccessListsDTO accessLists) { - this.accessLists = accessLists; - } + public void setAccessLists(final AccessListsDTO accessLists) { + this.accessLists = accessLists; + } - public void setContainer(final ContainerDTO container) { - this.container = container; - } + public void setContainer(final ContainerDTO container) { + this.container = container; + } - public void setContainerRights(final AccessRights containerRights) { - this.containerRights = containerRights; - } + public void setContainerRights(final AccessRights containerRights) { + this.containerRights = containerRights; + } - public void setLanguage(final I18nLanguageDTO language) { - this.language = language; - } + public void setLanguage(final I18nLanguageDTO language) { + this.language = language; + } - public void setLicense(final LicenseDTO license) { - this.license = license; - } + public void setLicense(final LicenseDTO license) { + this.license = license; + } - public void setRootContainer(final ContainerDTO rootContainer) { - this.rootContainer = rootContainer; - } + public void setRootContainer(final ContainerDTO rootContainer) { + this.rootContainer = rootContainer; + } - public void setTagCloudResult(final TagCloudResult tagCloudResult) { - this.tagCloudResult = tagCloudResult; - } + public void setTagCloudResult(final TagCloudResult tagCloudResult) { + this.tagCloudResult = tagCloudResult; + } - public void setToolName(final String toolName) { - this.toolName = toolName; - } + public void setToolName(final String toolName) { + this.toolName = toolName; + } - @Override - public void setTypeId(final String typeId) { - this.typeId = typeId; - } + @Override + public void setTypeId(final String typeId) { + this.typeId = typeId; + } - @Override - public String toString() { - return "StateDTO[" + getStateToken() + "/" + getTypeId() + "]"; - } + @Override + public String toString() { + return "StateDTO[" + getStateToken() + "/" + getTypeId() + "]"; + } } Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml 2011-11-12 15:47:35 UTC (rev 1604) @@ -93,6 +93,7 @@ </g:south> </g:DockLayoutPanel> </g:center> +  <g:west size="200.0"> <g:DockLayoutPanel unit="PX" styleName="{res.style.entityTools}" ui:field="splitEast"> Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -100,7 +100,8 @@ uploader.setLabelText(i18n.t("Select an image from your computer as the logo for this group. " + "For best results use a [%d]x[%d] pixel image. Bigger images will be automatically resized.", FileConstants.LOGO_DEF_HEIGHT, FileConstants.LOGO_DEF_HEIGHT)); - TabTitleGenerator.setText(tabTitle, CoreMessages.ENT_LOGO_SELECTOR_NORMAL_TITLE, MAX_TABTITLE_LENGTH); + TabTitleGenerator.setText(tabTitle, CoreMessages.ENT_LOGO_SELECTOR_NORMAL_TITLE, + MAX_TABTITLE_LENGTH, i18n.getDirection()); } @Override @@ -108,7 +109,8 @@ uploader.setLabelText(i18n.t("Select an image from your computer as your avatar. " + "For best results use a [%d]x[%d] pixel image. Bigger images will be automatically resized.", FileConstants.LOGO_DEF_HEIGHT, FileConstants.LOGO_DEF_HEIGHT)); - TabTitleGenerator.setText(tabTitle, CoreMessages.ENT_LOGO_SELECTOR_PERSON_TITLE, MAX_TABTITLE_LENGTH); + TabTitleGenerator.setText(tabTitle, CoreMessages.ENT_LOGO_SELECTOR_PERSON_TITLE, + MAX_TABTITLE_LENGTH, i18n.getDirection()); } @Override 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-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -57,12 +57,14 @@ private final String chooseImage; private final Button clearBtn; private final String hasBackLabel; + private final I18nTranslationService i18n; private final String noHasBacklabel; private final IconLabel tabTitle; private final EntityUploaderForm uploader; public EntityOptStylePanel(final I18nTranslationService i18n, final CoreResources res, final GSpaceThemeSelectorPanel styleSelector) { + this.i18n = i18n; tabTitle = TabTitleGenerator.generate(res.themeChoose(), i18n.t("Style"), MAX_TABTITLE_LENGTH); // super.setHeight(String.valueOf(EntityOptionsView.HEIGHT) + "px"); super.setWidth(String.valueOf(EntityOptionsView.WIDTH_WOUT_MARGIN) + "px"); @@ -171,7 +173,7 @@ private void setBackImageVisibleImpl(final boolean visible) { backImage.setVisible(visible); clearBtn.setVisible(visible); - backgroundLabel.setText(visible ? hasBackLabel : noHasBacklabel); + backgroundLabel.setText(visible ? hasBackLabel : noHasBacklabel, i18n.getDirection()); uploader.getBtn().setText(visible ? changeImage : chooseImage); } Modified: trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -23,12 +23,14 @@ import cc.kune.gspace.client.tool.selector.ToolSelectorItemPanel; import cc.kune.gspace.client.tool.selector.ToolSelectorItemPresenter; +import com.google.gwt.i18n.client.HasDirection.Direction; + public abstract class AbstractClientTool { public AbstractClientTool(final String shortName, final String longName, final String tooltip, - final ToolSelector toolSelector) { + final ToolSelector toolSelector, final Direction direction) { final ToolSelectorItemPresenter presenter = new ToolSelectorItemPresenter(shortName, longName, - tooltip, toolSelector); + tooltip, toolSelector, direction); final ToolSelectorItemPanel panel = new ToolSelectorItemPanel(); presenter.init(panel); } Modified: trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -38,7 +38,7 @@ public FoldableAbstractClientTool(final String shortName, final String longName, final String tooltip, final ToolSelector toolSelector, final ContentCapabilitiesRegistry contentCapabilitiesRegistry, final I18nTranslationService i18n, final NavResources navResources) { - super(shortName, longName, tooltip, toolSelector); + super(shortName, longName, tooltip, toolSelector, i18n.getDirection()); this.contentCapabilitiesRegistry = contentCapabilitiesRegistry; this.i18n = i18n; this.navResources = navResources; 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-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -33,7 +33,7 @@ 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; +import com.google.gwt.user.client.ui.HasDirectionalText; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.InlineLabel; import com.google.gwt.user.client.ui.Widget; @@ -84,7 +84,7 @@ } @Override - public HasText getLabel() { + public HasDirectionalText getLabel() { return label; } Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPresenter.java 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPresenter.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -24,8 +24,9 @@ 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.i18n.client.HasDirection.Direction; import com.google.gwt.user.client.History; -import com.google.gwt.user.client.ui.HasText; +import com.google.gwt.user.client.ui.HasDirectionalText; import com.google.gwt.user.client.ui.IsWidget; public class ToolSelectorItemPresenter implements ToolSelectorItem { @@ -33,7 +34,7 @@ HasClickHandlers getFocus(); - HasText getLabel(); + HasDirectionalText getLabel(); void setSelected(boolean selected); @@ -42,6 +43,7 @@ void setVisible(boolean visible); } + private final Direction direction; private final String longName; private final String shortName; private StateToken token; @@ -50,11 +52,12 @@ private ToolSelectorItemView view; public ToolSelectorItemPresenter(final String shortName, final String longName, final String tooltip, - final ToolSelector toolSelector) { + final ToolSelector toolSelector, final Direction direction) { this.shortName = shortName; this.longName = longName; this.tooltip = tooltip; this.toolSelector = toolSelector; + this.direction = direction; } @Override @@ -76,7 +79,7 @@ History.newItem(token.toString()); } }); - view.getLabel().setText(longName); + view.getLabel().setText(longName, direction); view.setTooltip(tooltip); } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java 2011-11-12 02:58:35 UTC (rev 1603) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java 2011-11-12 15:47:35 UTC (rev 1604) @@ -109,7 +109,8 @@ @Override public void setContainer(final StateContainerDTO state) { - contentTitle.setTitle(state.getTitle(), state.getTypeId(), state.getContainerRights().isEditable() + final String title = state.getContainer().isRoot() ? i18n.t(state.getTitle()) : state.getTitle(); + contentTitle.setTitle(title, state.getTypeId(), state.getContainerRights().isEditable() && capabilitiesRegistry.isRenamable(state.getTypeId())); Window.setTitle(state.getGroup().getLongName() + ": " + state.getTitle()); }

1 0

12 Nov '11

Author: vjrj_ Date: 2011-11-12 03:58:35 +0100 (Sat, 12 Nov 2011) New Revision: 1603 Added: trunk/src/main/java/cc/kune/core/client/i18n/I18nUrlUtils.java trunk/src/test/java/cc/kune/core/client/i18n/I18nUrlUtilsTest.java Modified: trunk/TODO trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java trunk/src/main/java/cc/kune/common/client/SampleEntryPoint.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSimpleGuiItem.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractComposedGuiItem.java trunk/src/main/java/cc/kune/common/client/actions/ui/ActionFlowPanel.java trunk/src/main/java/cc/kune/common/client/actions/ui/ActionSimplePanel.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/common/client/ui/IconLabel.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicTopDialog.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/PromptTopDialog.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialog.java trunk/src/main/java/cc/kune/common/client/utils/Url.java trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarImpl.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.java trunk/src/main/java/cc/kune/core/client/sitebar/ErrorsDialog.java trunk/src/main/java/cc/kune/core/client/sitebar/search/EntitySearchPanel.java trunk/src/main/java/cc/kune/core/client/sitebar/search/SearchBoxFactory.java trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPanel.java trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java trunk/src/main/java/cc/kune/core/server/manager/impl/I18nTranslationManagerDefault.java trunk/src/main/java/cc/kune/core/shared/dto/I18nLanguageDTO.java trunk/src/main/java/cc/kune/core/shared/i18n/I18nTranslationService.java trunk/src/main/java/cc/kune/domain/I18nLanguage.java trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.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/resources/gSpaceArmor.css trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmorTheme.css trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java trunk/src/main/webapp/ws.html Log: NEW - # 144: Resolve some i18n typos (sizes, no translated, etc) http://kune.ourproject.org/issues/ticket/144 NEW - # 156: Give RTL support (for Arabic and other similar languages) http://kune.ourproject.org/issues/ticket/156 Modified: trunk/TODO =================================================================== --- trunk/TODO 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/TODO 2011-11-12 02:58:35 UTC (rev 1603) @@ -12,6 +12,20 @@ nick == assigned to * SHORT-TERM (URGENT) +** i18n usecase +| logged | locale in URL | i18n supported | useDB | +| false | false | false | true | +| false | false | true | false | +| false | true | false | true | +| false | true | true | false | +| true | false | false | true | +| true | false | true | false | +| true | true (same) | true | false | +| true | true (same) | false | true | +| true | true(*) (diff) | false | true | +| true | true(*) (diff) | true | false | +meta? + ** TODO multi uploader http://code.google.com/p/gwt-plupload/ http://www.plupload.com/example_all_runtimes.php Modified: trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -65,7 +65,8 @@ @Override public void actionPerformed(final ActionEvent event) { - final Builder builder = new PromptTopDialog.Builder(ID, "Name of the new chatroom?", false, true); + final Builder builder = new PromptTopDialog.Builder(ID, i18n.t("Name of the new chatroom?"), + false, true, i18n.getDirection()); builder.width("200px").height("50px").firstButtonTitle(i18n.t("Create")).sndButtonTitle( i18n.t("Cancel")).firstButtonId(CREATE_ID).sndButtonId(CANCEL_ID); builder.regex(TextUtils.UNIX_NAME).regexText( Modified: trunk/src/main/java/cc/kune/common/client/SampleEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/SampleEntryPoint.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/common/client/SampleEntryPoint.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -50,114 +50,116 @@ import com.google.gwt.user.client.ui.VerticalPanel; public class SampleEntryPoint implements EntryPoint { - public interface ISampleView { - void addAll(GuiActionDescCollection actions); + public interface ISampleView { + void addAll(GuiActionDescCollection actions); + } + + public class TestAction extends AbstractExtendedAction { + public TestAction(final String text) { + super(text); } - public class TestAction extends AbstractExtendedAction { - public TestAction(final String text) { - super(text); - } - - public TestAction(final String text, final String tooltip, final String icon) { - super(text, tooltip, icon); - } - - @Override - public void actionPerformed(final ActionEvent event) { - final String message = "Testing: " + super.getValue(Action.NAME); - // Log.info(message); - userMsg.show(message); - } + public TestAction(final String text, final String tooltip, final String icon) { + super(text, tooltip, icon); } - SimpleUserMessage userMsg = new SimpleUserMessage(); @Override - public void onModuleLoad() { + public void actionPerformed(final ActionEvent event) { + final String message = "Testing: " + super.getValue(Action.NAME); + // Log.info(message); + userMsg.show(message); + } + } + SimpleUserMessage userMsg = new SimpleUserMessage(); - final SampleGinjector ginjector = GWT.create(SampleGinjector.class); - ginjector.getGxtGuiProvider(); - ginjector.getGuiProvider(); - final GlobalShortcutRegister shortcutRegister = ginjector.getGlobalShortcutRegister(); + @Override + public void onModuleLoad() { - final GuiActionDescCollection actions = new GuiActionDescCollection(); + final SampleGinjector ginjector = GWT.create(SampleGinjector.class); + ginjector.getGxtGuiProvider(); + ginjector.getGuiProvider(); + final GlobalShortcutRegister shortcutRegister = ginjector.getGlobalShortcutRegister(); - final TestAction action = new TestAction("Action 1", "Some tooltip", "oc-testico"); - final TestAction action2 = new TestAction("Action 2"); + final GuiActionDescCollection actions = new GuiActionDescCollection(); - final KeyStroke shortcut = Shortcut.getShortcut(false, true, false, false, Character.valueOf('C')); - shortcutRegister.put(shortcut, action); + final TestAction action = new TestAction("Action 1", "Some tooltip", "oc-testico"); + final TestAction action2 = new TestAction("Action 2"); - final ButtonDescriptor simpleBtn = new ButtonDescriptor(action); - // Same action but different text - simpleBtn.putValue(Action.NAME, "Action 1 diff name"); + final KeyStroke shortcut = Shortcut.getShortcut(false, true, false, false, Character.valueOf('C')); + shortcutRegister.put(shortcut, action); - final PushButtonDescriptor pushBtn = new PushButtonDescriptor(action2); - pushBtn.setPushed(true); - pushBtn.putValue(Action.NAME, "Push btn"); + final ButtonDescriptor simpleBtn = new ButtonDescriptor(action); + // Same action but different text + simpleBtn.putValue(Action.NAME, "Action 1 diff name"); - final ToolbarDescriptor toolbar = new ToolbarDescriptor(); + final PushButtonDescriptor pushBtn = new PushButtonDescriptor(action2); + pushBtn.setPushed(true); + pushBtn.putValue(Action.NAME, "Push btn"); - final ToolbarSeparatorDescriptor tsepFill = new ToolbarSeparatorDescriptor(Type.fill, toolbar); - final ToolbarSeparatorDescriptor toolbarSpace = new ToolbarSeparatorDescriptor(Type.spacer, toolbar); + final ToolbarDescriptor toolbar = new ToolbarDescriptor(); - simpleBtn.setParent(toolbar); - pushBtn.setParent(toolbar); + final ToolbarSeparatorDescriptor tsepFill = new ToolbarSeparatorDescriptor(Type.fill, toolbar); + final ToolbarSeparatorDescriptor toolbarSpace = new ToolbarSeparatorDescriptor(Type.spacer, toolbar); - final MenuDescriptor menu = new MenuDescriptor(action); - menu.putValue(Action.NAME, "Menu"); + simpleBtn.setParent(toolbar); + pushBtn.setParent(toolbar); - final MenuDescriptor menu2 = new MenuDescriptor(action); - menu2.putValue(Action.NAME, "Menu2"); + final MenuDescriptor menu = new MenuDescriptor(action); + menu.putValue(Action.NAME, "Menu"); - menu.setParent(toolbar); - final SubMenuDescriptor submenu = new SubMenuDescriptor("Some Submenu", "tip", "oc-testico"); - submenu.setParent(menu); - final MenuSeparatorDescriptor menuSep = new MenuSeparatorDescriptor(menu); + final MenuDescriptor menu2 = new MenuDescriptor(action); + menu2.putValue(Action.NAME, "Menu2"); - final TestAction action3 = new TestAction("Action 3", "Some tooltip", "oc-testico"); - final TestAction action4 = new TestAction("Action 4"); + menu.setParent(toolbar); + final SubMenuDescriptor submenu = new SubMenuDescriptor("Some Submenu", "tip", "oc-testico"); + submenu.setParent(menu); + final MenuSeparatorDescriptor menuSep = new MenuSeparatorDescriptor(menu); - final MenuItemDescriptor menuItem = new MenuItemDescriptor(menu, action3); - final MenuItemDescriptor menuItem2 = new MenuItemDescriptor(menu, action4); - final MenuItemDescriptor menuItem3 = new MenuItemDescriptor(submenu, action); - final MenuItemDescriptor menuItem4 = new MenuItemDescriptor(submenu, action); - final IconLabelDescriptor iconLabelDescr = new IconLabelDescriptor(action); - final IconLabelDescriptor iconLabelNoAct = new IconLabelDescriptor(action4); - final MenuItemDescriptor menuItem5 = new MenuItemDescriptor(menu2, action); + final TestAction action3 = new TestAction("Action 3", "Some tooltip", "oc-testico"); + final TestAction action4 = new TestAction("Action 4"); - action.setShortcut(shortcut); + final MenuItemDescriptor menuItem = new MenuItemDescriptor(menu, action3); + final MenuItemDescriptor menuItem2 = new MenuItemDescriptor(menu, action4); + final MenuItemDescriptor menuItem3 = new MenuItemDescriptor(submenu, action); + final MenuItemDescriptor menuItem4 = new MenuItemDescriptor(submenu, action); + final IconLabelDescriptor iconLabelDescr = new IconLabelDescriptor(action); + final IconLabelDescriptor iconLabelNoAct = new IconLabelDescriptor(action4); + final MenuItemDescriptor menuItem5 = new MenuItemDescriptor(menu2, action); - actions.add(toolbar, simpleBtn, tsepFill, pushBtn, toolbarSpace, menu, tsepFill, menuItem, menuItem2, menuSep, - menuItem2, menuItem, iconLabelDescr, submenu, menuItem3, menuItem4, menu2, iconLabelNoAct, menuItem5); + action.setShortcut(shortcut); - final ActionFlowPanel view = new ActionFlowPanel(ginjector.getGuiProvider()); - view.addAll(actions); + actions.add(toolbar, simpleBtn, tsepFill, pushBtn, toolbarSpace, menu, tsepFill, menuItem, + menuItem2, menuSep, menuItem2, menuItem, iconLabelDescr, submenu, menuItem3, menuItem4, menu2, + iconLabelNoAct, menuItem5); - final IconLabel simpleIconLabel = new IconLabel("IconLabel (no action)"); - simpleIconLabel.setRightIcon("oc-testico"); - simpleIconLabel.setTitle("tooltip"); + final ActionFlowPanel view = new ActionFlowPanel(ginjector.getGuiProvider(), null); + view.addAll(actions); - final VerticalPanel panel = new VerticalPanel(); - panel.setWidth("100%"); - panel.add(view); - panel.add(simpleIconLabel); + final IconLabel simpleIconLabel = new IconLabel("IconLabel (no action)"); + simpleIconLabel.setRightIcon("oc-testico"); + simpleIconLabel.setTitle("tooltip"); - final BasicThumb thumb = new BasicThumb("http://www.truth-out.org/sites/all/themes/truth/images/logo.gif", 60, - "fooo", 5, false, new ClickHandler() { + final VerticalPanel panel = new VerticalPanel(); + panel.setWidth("100%"); + panel.add(view); + panel.add(simpleIconLabel); - @Override - public void onClick(final ClickEvent event) { - userMsg.show("Testing"); - } - }); - thumb.setTooltip("kkkkkkK"); - thumb.setOnOverLabel(true); - final LayoutContainer layout = new LayoutContainer(); - // final QuickTip quickTip = new QuickTip(layout); - // quickTip.setInterceptTitles(true); - layout.add(thumb); - RootPanel.get().add(layout); - RootPanel.get().add(view); - } + final BasicThumb thumb = new BasicThumb( + "http://www.truth-out.org/sites/all/themes/truth/images/logo.gif", 60, "fooo", 5, false, + new ClickHandler() { + + @Override + public void onClick(final ClickEvent event) { + userMsg.show("Testing"); + } + }); + thumb.setTooltip("kkkkkkK"); + thumb.setOnOverLabel(true); + final LayoutContainer layout = new LayoutContainer(); + // final QuickTip quickTip = new QuickTip(layout); + // quickTip.setInterceptTitles(true); + layout.add(thumb); + RootPanel.get().add(layout); + RootPanel.get().add(view); + } } 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-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -151,7 +151,7 @@ @Override public void setText(final String text) { - iconLabel.setText(text); + iconLabel.setText(text, descriptor.getDirection()); layout(); } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -216,10 +216,11 @@ if (text != null) { final KeyStroke key = (KeyStroke) descriptor.getValue(Action.ACCELERATOR_KEY); if (key == null) { - iconLabel.setText(text); + iconLabel.setText(text, descriptor.getDirection()); } else { - iconLabel.setLabelText(text + createShortCut(key, "oc-mshortcut-hidden") - + createShortCut(key, "oc-mshortcut")); + iconLabel.setText( + text + createShortCut(key, "oc-mshortcut-hidden") + createShortCut(key, "oc-mshortcut"), + descriptor.getDirection()); } } layout(); Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -93,7 +93,7 @@ @Override public void setText(final String text) { - iconLabel.setText(text); + iconLabel.setText(text, descriptor.getDirection()); } @Override Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -132,7 +132,7 @@ @Override public void setText(final String text) { if (notStandAlone) { - iconLabel.setText(text); + iconLabel.setText(text, descriptor.getDirection()); layout(); } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSimpleGuiItem.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSimpleGuiItem.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSimpleGuiItem.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -22,34 +22,35 @@ import cc.kune.common.client.actions.ui.AbstractComposedGuiItem; import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.bind.GuiProvider; +import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.user.client.ui.HorizontalPanel; public class GwtSimpleGuiItem extends AbstractComposedGuiItem { - private final HorizontalPanel bar; + private final HorizontalPanel bar; - public GwtSimpleGuiItem(final GuiProvider provider) { - super(provider); - bar = new HorizontalPanel(); - initWidget(bar); - } + public GwtSimpleGuiItem(final GuiProvider provider, final I18nTranslationService i18n) { + super(provider, i18n); + bar = new HorizontalPanel(); + initWidget(bar); + } - @Override - protected void addWidget(final AbstractGuiItem item) { - bar.add(item); - } + @Override + protected void addWidget(final AbstractGuiItem item) { + bar.add(item); + } - @Override - public void clear() { - super.clear(); - bar.clear(); - } + @Override + public void clear() { + super.clear(); + bar.clear(); + } - @Override - protected void insertWidget(final AbstractGuiItem item, final int position) { - final int count = bar.getWidgetCount(); - bar.insert(item, count < position ? count : position); - } + @Override + protected void insertWidget(final AbstractGuiItem item, final int position) { + final int count = bar.getWidgetCount(); + bar.insert(item, count < position ? count : position); + } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -79,7 +79,7 @@ @Override public void setText(final String text) { - iconLabel.setText(text); + iconLabel.setText(text, descriptor.getDirection()); layout(); } 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-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractComposedGuiItem.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -28,16 +28,19 @@ 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.core.shared.i18n.I18nTranslationService; import com.google.gwt.user.client.ui.Composite; public abstract class AbstractComposedGuiItem extends Composite implements IsActionExtensible { private final GuiProvider bindings; private GuiActionDescCollection guiItems; + private final I18nTranslationService i18n; - public AbstractComposedGuiItem(final GuiProvider bindings) { + public AbstractComposedGuiItem(final GuiProvider bindings, final I18nTranslationService i18n) { super(); this.bindings = bindings; + this.i18n = i18n; } public void add(final GuiActionDescCollection descriptors) { @@ -80,6 +83,8 @@ if (binding == null) { throw new UIException("Unknown binding for: " + descrip); } else { + // We set at that moment if the widget should be RTL or not + descrip.setRTL(i18n.isRTL()); final AbstractGuiItem item = binding.create(descrip); if (binding.shouldBeAdded()) { // TODO Change this ^ to shouldBeAttached Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/ActionFlowPanel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/ActionFlowPanel.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/ActionFlowPanel.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -20,35 +20,36 @@ package cc.kune.common.client.actions.ui; import cc.kune.common.client.actions.ui.bind.GuiProvider; +import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.user.client.ui.FlowPanel; import com.google.inject.Inject; public class ActionFlowPanel extends AbstractComposedGuiItem implements ActionExtensibleView { - private final FlowPanel bar; + private final FlowPanel bar; - @Inject - public ActionFlowPanel(final GuiProvider guiProvider) { - super(guiProvider); - bar = new FlowPanel(); - initWidget(bar); - } + @Inject + public ActionFlowPanel(final GuiProvider guiProvider, final I18nTranslationService i18n) { + super(guiProvider, i18n); + bar = new FlowPanel(); + initWidget(bar); + } - @Override - protected void addWidget(final AbstractGuiItem item) { - bar.add(item); - } + @Override + protected void addWidget(final AbstractGuiItem item) { + bar.add(item); + } - @Override - public void clear() { - super.clear(); - bar.clear(); - } + @Override + public void clear() { + super.clear(); + bar.clear(); + } - @Override - protected void insertWidget(final AbstractGuiItem item, final int position) { - final int count = bar.getWidgetCount(); - bar.insert(item, count < position ? count : position); - } + @Override + protected void insertWidget(final AbstractGuiItem item, final int position) { + final int count = bar.getWidgetCount(); + bar.insert(item, count < position ? count : position); + } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/ActionSimplePanel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/ActionSimplePanel.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/ActionSimplePanel.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -20,35 +20,36 @@ package cc.kune.common.client.actions.ui; import cc.kune.common.client.actions.ui.bind.GuiProvider; +import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.inject.Inject; public class ActionSimplePanel extends AbstractComposedGuiItem implements ActionExtensibleView { - private final HorizontalPanel bar; + private final HorizontalPanel bar; - @Inject - public ActionSimplePanel(final GuiProvider guiProvider) { - super(guiProvider); - bar = new HorizontalPanel(); - initWidget(bar); - } + @Inject + public ActionSimplePanel(final GuiProvider guiProvider, final I18nTranslationService i18n) { + super(guiProvider, i18n); + bar = new HorizontalPanel(); + initWidget(bar); + } - @Override - protected void addWidget(final AbstractGuiItem item) { - bar.add(item); - } + @Override + protected void addWidget(final AbstractGuiItem item) { + bar.add(item); + } - @Override - public void clear() { - super.clear(); - bar.clear(); - } + @Override + public void clear() { + super.clear(); + bar.clear(); + } - @Override - protected void insertWidget(final AbstractGuiItem item, final int position) { - final int count = bar.getWidgetCount(); - bar.insert(item, count < position ? count : position); - } + @Override + protected void insertWidget(final AbstractGuiItem item, final int position) { + final int count = bar.getWidgetCount(); + bar.insert(item, count < position ? count : position); + } } 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-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -29,6 +29,8 @@ import cc.kune.common.client.actions.KeyStroke; import cc.kune.core.client.dnd.DropTarget; +import com.google.gwt.i18n.client.HasDirection.Direction; + /** * The Class AbstractUIActionDescriptor. */ @@ -42,6 +44,9 @@ /** The item DOM id. */ private String id; + /** If is a Rigth-to-Left widget (for languages like Arabic) */ + private boolean isRTL = false; + /** The item location. */ private String location; @@ -82,6 +87,11 @@ } @Override + public Direction getDirection() { + return isRTL ? Direction.RTL : Direction.LTR; + } + + @Override public String getId() { return id; } @@ -149,6 +159,11 @@ } @Override + public boolean isRTL() { + return isRTL; + } + + @Override public boolean isVisible() { return (Boolean) getValue(VISIBLE); } @@ -225,6 +240,11 @@ } @Override + public void setRTL(final boolean isRTL) { + this.isRTL = isRTL; + } + + @Override public void setStyles(final String styles) { putValue(Action.STYLES, styles); } 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-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -25,6 +25,8 @@ import cc.kune.common.client.actions.PropertyChangeListener; import cc.kune.core.client.dnd.DropTarget; +import com.google.gwt.i18n.client.HasDirection.Direction; + public interface GuiActionDescrip { public static final String DROP_TARGET = "dropTarget"; @@ -51,6 +53,8 @@ AbstractAction getAction(); + Direction getDirection(); + String getId(); Object[] getKeys(); @@ -75,6 +79,8 @@ boolean isEnabled(); + boolean isRTL(); + boolean isVisible(); boolean mustBeAdded(); @@ -105,6 +111,8 @@ void setPosition(final int position); + void setRTL(final boolean isRTL); + void setStyles(final String styles); void setTarget(final Object object); Modified: trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -136,10 +136,6 @@ self.ensureDebugId(id); } - public void setLabelText(final String text) { - label.setText(text); - } - public void setLeftIcon(final String imgCss) { commonStyle(iconLeft, imgCss); iconLeft.addStyleName("k-iconlabel-left"); Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicTopDialog.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicTopDialog.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicTopDialog.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -29,6 +29,7 @@ import com.google.gwt.event.logical.shared.ResizeEvent; import com.google.gwt.event.logical.shared.ResizeHandler; import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.i18n.client.HasDirection.Direction; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.UIObject; @@ -40,6 +41,7 @@ private boolean autoscroll = false; private boolean closeBtn = true; private final String dialogId; + private final Direction direction; private String firstButtonId; private String firstButtonTitle; private String height; @@ -51,11 +53,13 @@ private String title; private String width; - public Builder(final String dialogId, final boolean autohide, final boolean modal) { + public Builder(final String dialogId, final boolean autohide, final boolean modal, + final Direction direction) { // Required params this.autohide = autohide; this.modal = modal; this.dialogId = dialogId; + this.direction = direction; } public Builder autoscroll(final boolean autoscroll) { @@ -139,7 +143,7 @@ popup = new PopupTopPanel(builder.autohide, builder.modal); popup.add(this); popup.ensureDebugId(builder.dialogId); - super.getTitleText().setText(builder.title); + super.getTitleText().setText(builder.title, builder.direction); if (TextUtils.notEmpty(builder.icon)) { super.setTitleIcon(builder.icon); } @@ -150,7 +154,7 @@ super.setSecondBtnText(builder.sndButtonTitle); super.setSecondBtnId(builder.sndButtonId); super.setSecondBtnTabIndex(builder.tabIndexStart + 1); - super.getTitleText().setText(builder.title); + super.getTitleText().setText(builder.title, builder.direction); setWidthImpl(builder.width); setHeightImpl(builder.height); recalculateSize(); Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/PromptTopDialog.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/PromptTopDialog.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/PromptTopDialog.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -20,6 +20,7 @@ package cc.kune.common.client.ui.dialogs; import com.extjs.gxt.ui.client.widget.form.TextField; +import com.google.gwt.i18n.client.HasDirection.Direction; public class PromptTopDialog extends BasicTopDialog { @@ -36,8 +37,8 @@ private int width = 0; public Builder(final String dialogId, final String promptText, final boolean autohide, - final boolean modal) { - super(dialogId, autohide, modal); + final boolean modal, final Direction direction) { + super(dialogId, autohide, modal, direction); super.title(promptText); } 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-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -36,6 +36,7 @@ import com.google.gwt.event.logical.shared.HasCloseHandlers; import com.google.gwt.event.logical.shared.SelectionEvent; import com.google.gwt.event.logical.shared.SelectionHandler; +import com.google.gwt.i18n.client.HasDirection.Direction; import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; @@ -50,6 +51,7 @@ private final boolean autohide; private BasicTopDialog dialog; private final String dialogId; + private final Direction direction; private final String errorLabelId; private final String firstBtnId; private final String firstBtnTitle; @@ -69,7 +71,7 @@ public AbstractTabbedDialogPanel(final String dialogId, final String title, final boolean modal, final boolean autoHide, final NotifyLevelImages images, final String errorLabelId, final String firstBtnTitle, final String firstBtnId, final String sndBtnTitle, - final String sndBtnId, final ProvidersCollection provCollection) { + final String sndBtnId, final ProvidersCollection provCollection, final Direction direction) { this.dialogId = dialogId; this.title = title; this.modal = modal; @@ -81,22 +83,24 @@ this.sndBtnId = sndBtnId; this.provCollection = provCollection; this.autohide = autoHide; + this.direction = direction; } 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 ProvidersCollection provCollection) { + final ProvidersCollection provCollection, final Direction direction) { this(dialogId, title, NO_SIZE, NO_SIZE, modal, false, images, errorLabelId, firstBtnTitle, - firstBtnId, sndBtnTitle, sndBtnId, provCollection); + firstBtnId, sndBtnTitle, sndBtnId, provCollection, direction); } public AbstractTabbedDialogPanel(final String dialogId, final String title, final int width, final int height, final boolean modal, final boolean autoHide, final NotifyLevelImages images, final String errorLabelId, final String firstBtnTitle, final String firstBtnId, - final String sndBtnTitle, final String sndBtnId, final ProvidersCollection provCollection) { + final String sndBtnTitle, final String sndBtnId, final ProvidersCollection provCollection, + final Direction direction) { this(dialogId, title, modal, autoHide, images, errorLabelId, firstBtnTitle, firstBtnId, sndBtnTitle, - sndBtnId, provCollection); + sndBtnId, provCollection, direction); this.width = width; this.height = height; } @@ -104,9 +108,9 @@ 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, final ProvidersCollection provCollection) { + final String sndBtnId, final ProvidersCollection provCollection, final Direction direction) { this(dialogId, title, width, height, modal, false, images, errorLabelId, firstBtnTitle, firstBtnId, - sndBtnTitle, sndBtnId, provCollection); + sndBtnTitle, sndBtnId, provCollection, direction); } @Override @@ -129,9 +133,9 @@ } private void createDialog() { - final Builder builder = new BasicTopDialog.Builder(dialogId, autohide, modal).autoscroll(true).icon( - iconCls).firstButtonId(firstBtnId).firstButtonTitle(firstBtnTitle).sndButtonId(dialogId).sndButtonTitle( - sndBtnTitle).sndButtonId(sndBtnId).title(title); + final Builder builder = new BasicTopDialog.Builder(dialogId, autohide, modal, direction).autoscroll( + true).icon(iconCls).firstButtonId(firstBtnId).firstButtonTitle(firstBtnTitle).sndButtonId( + dialogId).sndButtonTitle(sndBtnTitle).sndButtonId(sndBtnId).title(title); if (width != NO_SIZE) { builder.width(String.valueOf(width + 20) + "px"); } Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialog.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialog.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialog.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -62,8 +62,8 @@ this.maskWidget = maskWidget; this.listener = listener; this.i18n = i18n; - final Builder dialogBuilder = new BasicTopDialog.Builder(dialogId, false, modal).width(width).height( - height).firstButtonId(cancelId).sndButtonId(finishId).title(header); + final Builder dialogBuilder = new BasicTopDialog.Builder(dialogId, false, modal, i18n.getDirection()).width( + width).height(height).firstButtonId(cancelId).sndButtonId(finishId).title(header); dialog = dialogBuilder.build(); dialog.setFirstBtnText(i18n.tWithNT("Cancel", "used in button")); dialog.getFirstBtn().addClickHandler(new ClickHandler() { Modified: trunk/src/main/java/cc/kune/common/client/utils/Url.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/utils/Url.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/common/client/utils/Url.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -20,44 +20,44 @@ package cc.kune.common.client.utils; import java.util.ArrayList; -import java.util.List; public class Url { - private final String base; - private final List<UrlParam> params; + private final String base; + private final ArrayList<UrlParam> params; - public Url(final String base) { - this.base = base; - params = new ArrayList<UrlParam>(); - } + public Url(final String base) { + this.base = base; + params = new ArrayList<UrlParam>(); + } - public Url(final String base, final UrlParam... iniParams) { - this(base); - for (UrlParam param : iniParams) { - addImpl(param); - } + public Url(final String base, final UrlParam... iniParams) { + this(base); + for (final UrlParam param : iniParams) { + addImpl(param); } + } - public void add(final UrlParam param) { - addImpl(param); - } + public void add(final UrlParam param) { + addImpl(param); + } - @Override - public String toString() { - String paramPart = ""; - boolean first = true; - for (UrlParam param : params) { - if (first) { - paramPart = "?" + param; - first = false; - } else { - paramPart += "&" + param; - } - } - return base + paramPart; + private void addImpl(final UrlParam param) { + params.add(param); + } + + @Override + public String toString() { + String paramPart = ""; + boolean first = true; + for (final UrlParam param : params) { + if (first) { + paramPart = "?" + param; + first = false; + } else { + paramPart += "&" + param; + } } + return base + paramPart; + } - private void addImpl(final UrlParam param) { - params.add(param); - } } Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -49,8 +49,8 @@ final String firstButtonId, final String cancelButtonTitle, final String cancelButtonId, final NotifyLevelImages images, final String errorLabelId, final int tabIndexStart) { - final Builder builder = new BasicTopDialog.Builder(dialogId, autohide, modal).autoscroll(autoscroll).title( - title); + final Builder builder = new BasicTopDialog.Builder(dialogId, autohide, modal, i18n.getDirection()).autoscroll( + autoscroll).title(title); builder.icon(icon); builder.firstButtonTitle(firstButtonTitle).firstButtonId(firstButtonId); builder.sndButtonTitle(cancelButtonTitle).sndButtonId(cancelButtonId); Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -92,12 +92,13 @@ session.setUserHash(userHash); session.setCurrentUserInfo(userInfoDTO); final I18nLanguageDTO language = userInfoDTO.getLanguage(); - i18n.changeCurrentLanguage(language.getCode()); session.setCurrentLanguage(language); - if (gotoHomePage) { - stateManager.gotoStateToken(new StateToken(userInfoDTO.getHomePage()).clearDocument()); - } else { - stateManager.redirectOrRestorePreviousToken(); + if (!i18n.changeToLanguageIfNecessary(language.getCode())) { + if (gotoHomePage) { + stateManager.gotoStateToken(new StateToken(userInfoDTO.getHomePage()).clearDocument()); + } else { + stateManager.redirectOrRestorePreviousToken(); + } } } Modified: trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarImpl.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarImpl.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -21,6 +21,7 @@ import cc.kune.common.client.actions.ui.ActionFlowPanel; import cc.kune.common.client.actions.ui.bind.GuiProvider; +import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget; @@ -28,25 +29,26 @@ public class ActionContentToolbarImpl extends ActionFlowPanel implements ActionContentToolbar { - private final ForIsWidget wsToolbar; + private final ForIsWidget wsToolbar; - @Inject - public ActionContentToolbarImpl(final GuiProvider guiProvider, final GSpaceArmor wsArmor) { - super(guiProvider); - this.wsToolbar = wsArmor.getDocSubheader(); - } + @Inject + public ActionContentToolbarImpl(final GuiProvider guiProvider, final GSpaceArmor wsArmor, + final I18nTranslationService i18n) { + super(guiProvider, i18n); + this.wsToolbar = wsArmor.getDocSubheader(); + } - @Override - public void attach() { - if (!this.isAttached()) { - wsToolbar.add(this); - } + @Override + public void attach() { + if (!this.isAttached()) { + wsToolbar.add(this); } + } - @Override - public void detach() { - if (this.isAttached()) { - this.removeFromParent(); - } + @Override + public void detach() { + if (this.isAttached()) { + this.removeFromParent(); } + } } Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -82,8 +82,8 @@ public NewGroupPanel(final I18nTranslationService i18n, final NotifyLevelImages img, final MaskWidgetView mask, final GroupFieldFactory groupFieldFactory) { this.groupFieldFactory = groupFieldFactory; - final Builder builder = new BasicTopDialog.Builder(NEWGROUP_WIZARD, false, true).autoscroll(true).title( - i18n.t("Register a new group")); + final Builder builder = new BasicTopDialog.Builder(NEWGROUP_WIZARD, false, true, i18n.getDirection()).autoscroll( + true).title(i18n.t("Register a new group")); builder.icon("k-newgroup-icon"); builder.firstButtonTitle(i18n.t("Register")).firstButtonId(REGISTER_BUTTON); builder.sndButtonTitle(i18n.t("Cancel")).sndButtonId(CANCEL_BUTTON); Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -24,6 +24,11 @@ public class I18nTranslationServiceMocked extends I18nTranslationService { @Override + public boolean isRTL() { + return false; + } + + @Override public String tWithNT(final String text, final String noteForTranslators) { final String encodeText = TextUtils.escapeHtmlLight(text); final String translation = encodeText; Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -52,6 +52,7 @@ private String currentLanguageCode; private final Set<Pair<String, String>> earlyTexts; private final I18nServiceAsync i18nService; + private boolean isCurrentLangRTL = false; private boolean isLangInProperties; private final KuneConstants kuneConstants; private HashMap<String, String> lexicon; @@ -70,19 +71,11 @@ Log.info("Workspace starting with language: " + currentLocale.getLocaleName() + ", isRTL: " + LocaleInfo.getCurrentLocale().isRTL() + ", translated langs: " + Arrays.toString(LocaleInfo.getAvailableLocaleNames())); + isLangInProperties = isInConstantProperties(currentLocale.getLocaleName()); earlyTexts = new HashSet<Pair<String, String>>(); i18nService.getInitialLanguage(locale, new AsyncCallback<I18nLanguageDTO>() { - private boolean isInConstantProperties(final I18nLanguageDTO currentLang) { - for (final String lang : LocaleInfo.getAvailableLocaleNames()) { - if (lang.equals(currentLang.getCode())) { - return true; - } - } - return false; - } - @Override public void onFailure(final Throwable caught) { Log.error("Workspace adaptation to your language failed: " + caught.getMessage()); @@ -93,20 +86,25 @@ currentLang = result; currentLanguageCode = currentLang.getCode(); session.setCurrentLanguage(currentLang); - isLangInProperties = isInConstantProperties(currentLang); + isLangInProperties = isInConstantProperties(currentLang.getCode()); i18nService.getLexicon(currentLang.getCode(), new AsyncCallback<HashMap<String, String>>() { @Override public void onFailure(final Throwable caught) { - Log.error("Workspace adaptation to your language failed: " + caught.getMessage()); + Log.error("Workspace adaptation to server proposed language failed: " + caught.getMessage()); } @Override public void onSuccess(final HashMap<String, String> result) { lexicon = result; session.setCurrentLanguage(currentLang); - Log.info("Workspace adaptation to language: " + currentLang.getEnglishName() + ", isRTL: " - + currentLang.getDirection()); - eventBus.fireEvent(new I18nReadyEvent()); + Log.info("Workspace adaptation to server proposed language: " + currentLang.getEnglishName() + + ", isRTL: " + currentLang.getDirection() + " use properties: " + + shouldIuseProperties()); + + if (!changeToLanguageIfNecessary(getCurrentGWTlanguage(), currentLang.getCode())) { + isCurrentLangRTL = currentLang.getDirection().equals(RTL); + eventBus.fireEvent(new I18nReadyEvent()); + } } }); session.onUserSignIn(true, new UserSignInHandler() { @@ -126,19 +124,22 @@ } }); } - }); } - public void changeCurrentLanguage(final String newLanguage) { - if (!newLanguage.equals(this.currentLanguageCode)) { - setCurrentLanguage(newLanguage); - changeLocale(newLanguage); - } - } + /** + * https://developer.mozilla.org/en/DOM/window.location + * + * "If you need to change pathname but keep the hash as is, use the replace() method instead, which should work consistently across browsers." + * + * @param newUrl + */ + private native void changeHref(String newUrl) /*-{ + // $wnd.location.href = newUrl; + $wnd.location.replace(newUrl); + }-*/; /** - * * See in: * http://groups.google.com/group/Google-Web-Toolkit/browse_thread/thread * /5e4e25050d3be984/7035ec39354d06aa?lnk=gst&q=get+locale&rnum=23 @@ -146,35 +147,39 @@ * JSNI method to change the locale of the application - it effectively parses * the existing URL and creates a new one for the chosen locale. * - * It additionally launches any JavaScript debugger that might be attached to - * the system (Windows only). To disable this functionality just remove the - * "debugger" line. - * * @param newLocale * String value of the new locale to go to. */ - private native void changeLocale(String newLocale) - // FIXME: this now does not works correctly with hosted mode (and also give - // some "Opss" in server side) - /*-{ - // Uncomment the "debugger;" line to see how to set debug statements in JSNI code - // When in web mode, if your browser has a JavaScript debugger attached, it will - // launch at this point in the code (when the user changes locale through the menu system). - // debugger; + private void changeLanguageInUrl(final String newLocale) { + final String hash = WindowUtils.getLocation().getHash(); + final String query = WindowUtils.getLocation().getQueryString(); + final String newUrl = I18nUrlUtils.changeLang(query + (TextUtils.notEmpty(hash) ? hash : ""), + newLocale); + Log.info("Locale current query: " + query); + Log.info("Locale current hash: " + hash); + Log.info("Locale new Url: " + newUrl); + changeHref("http://" + WindowUtils.getLocation().getHost() + newUrl); + } - // Get the current location - var currLocation = $wnd.location.toString(); - // Get rid of any GWT History tokens that might be present - var noHistoryCurrLocArray = currLocation.split("#"); - var noHistoryCurrLoc = noHistoryCurrLocArray[0]; - var currHistory = noHistoryCurrLocArray[1]; - // Get rid of any locale string - var locArray = noHistoryCurrLoc.split("?"); - // 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 - }-*/; + public boolean changeToLanguageIfNecessary(final String wantedLang) { + return changeToLanguageIfNecessary(currentLang.getCode(), wantedLang); + } + /** + * + * @param wantedLanguage + * to check and to change to + * @return true if we should reload the client with the new language + */ + public boolean changeToLanguageIfNecessary(final String currentLang, final String wantedLang) { + if (!currentLang.equals(wantedLang) && isInConstantProperties(wantedLang)) { + setCurrentLanguage(wantedLang); + changeLanguageInUrl(wantedLang); + return true; + } + return false; + } + public String formatDateWithLocale(final Date date) { return formatDateWithLocale(date, false); } @@ -199,6 +204,12 @@ return dateFormated; } + private String getCurrentGWTlanguage() { + String gwtLang = LocaleInfo.getCurrentLocale().getLocaleName(); + gwtLang = gwtLang.equals("default") ? "en" : gwtLang; + return gwtLang; + } + public String getCurrentLanguage() { return currentLanguageCode; } @@ -242,6 +253,22 @@ return decodeHtml(translation); } + private boolean isInConstantProperties(final String currentLang) { + for (final String lang : LocaleInfo.getAvailableLocaleNames()) { + if (lang.equals(currentLang)) { + Log.info("Workspace adaptation to language: " + currentLang + " is in properties"); + return true; + } + } + Log.info("Workspace adaptation to language: " + currentLang + " is not in properties"); + return false; + } + + @Override + public boolean isRTL() { + return isCurrentLangRTL; + } + private void save(final String text, final String noteForTranslators) { i18nService.getTranslation(session.getUserHash(), currentLanguageCode, text, noteForTranslators, new AsyncCallback<String>() { @@ -268,6 +295,10 @@ lexicon.put(text, translation); } + private boolean shouldIuseProperties() { + return isLangInProperties; + } + /** * In production, this method uses a hashmap. In development, if the text is * not in the hashmap, it makes a server petition (that stores the text @@ -286,7 +317,7 @@ } final String encodeText = TextUtils.escapeHtmlLight(text); - if (isLangInProperties) { + if (shouldIuseProperties()) { // The db translations now are in properties files (more stable) try { return kuneConstants.getString(I18nUtils.convertMethodName(text + " " + noteForTranslators)); Added: trunk/src/main/java/cc/kune/core/client/i18n/I18nUrlUtils.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nUrlUtils.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUrlUtils.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -0,0 +1,36 @@ +package cc.kune.core.client.i18n; + +import cc.kune.common.client.utils.TextUtils; +import cc.kune.common.client.utils.Url; +import cc.kune.common.client.utils.UrlParam; + +public class I18nUrlUtils { + + private static void addLangParam(final String lang, final Url changedUrl) { + changedUrl.add(new UrlParam("locale", lang)); + } + + public static String changeLang(final String url, final String lang) { + final String[] hashSplitted = url.split("#"); + final String hash = hashSplitted.length > 1 ? hashSplitted[1] : ""; + String query = hashSplitted.length >= 1 ? hashSplitted[0] : (url.equals("#") ? "" : url); + query = query.startsWith("?") ? query.substring(1) : query; + final String[] params = query.split("&"); + final Url changedUrl = new Url(""); + if (!query.contains("locale")) { + addLangParam(lang, changedUrl); + } + for (final String param : params) { + if (TextUtils.notEmpty(param)) { + final String[] pair = param.split("="); + if (pair[0].equals("locale")) { + addLangParam(lang, changedUrl); + } else { + changedUrl.add(new UrlParam(pair[0], pair[1])); + } + } + } + return changedUrl.toString() + (url.contains("#") ? "#" + hash : ""); + } + +} Modified: trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -44,8 +44,8 @@ @Inject public UserConfirmPanel(final I18nTranslationService i18n) { - dialog = new BasicTopDialog.Builder(DIALOG_ID, false, true).autoscroll(false).firstButtonId(OK_ID).sndButtonId( - CANCEL_ID).tabIndexStart(1).build(); + dialog = new BasicTopDialog.Builder(DIALOG_ID, false, true, i18n.getDirection()).autoscroll(false).firstButtonId( + OK_ID).sndButtonId(CANCEL_ID).tabIndexStart(1).build(); askLabel = new HTML(); askLabel.addStyleName("k-userconfirm-label"); dialog.getInnerPanel().add(askLabel); Modified: trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -47,7 +47,7 @@ @Inject public AboutKuneDialog(final I18nTranslationService i18n) { - dialog = new BasicTopDialog.Builder(ABOUT_KUNE_ID, true, true).title( + dialog = new BasicTopDialog.Builder(ABOUT_KUNE_ID, true, true, i18n.getDirection()).title( i18n.tWithNT("About Kune", "title of dialog")).autoscroll(false).firstButtonTitle(i18n.t("Ok")).firstButtonId( ABOUT_KUNE_BTN_ID).tabIndexStart(1).height("300px").width("410px").build(); dialog.getInnerPanel().add(BINDER.createAndBindUi(this)); Modified: trunk/src/main/java/cc/kune/core/client/sitebar/ErrorsDialog.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/ErrorsDialog.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/core/client/sitebar/ErrorsDialog.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -54,9 +54,9 @@ @Inject public ErrorsDialog(final I18nTranslationService i18n, final EventBus eventBus) { - dialog = new BasicTopDialog.Builder(ERROR_LOGGER_ID, true, true).title(i18n.t("Errors info")).autoscroll( - true).firstButtonTitle(i18n.t("Ok")).firstButtonId(ERROR_LOGGER_BUTTON_ID).tabIndexStart(1).width( - "400px").height("400px").build(); + dialog = new BasicTopDialog.Builder(ERROR_LOGGER_ID, true, true, i18n.getDirection()).title( + i18n.t("Errors info")).autoscroll(true).firstButtonTitle(i18n.t("Ok")).firstButtonId( + ERROR_LOGGER_BUTTON_ID).tabIndexStart(1).width("400px").height("400px").build(); dialog.getTitleText().setText(i18n.t("Info about errors")); final InlineLabel subTitle = new InlineLabel( i18n.t("Please copy/paste this info to report problems")); Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/EntitySearchPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/EntitySearchPanel.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/EntitySearchPanel.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -52,8 +52,8 @@ public EntitySearchPanel(final CoreResources img, final I18nUITranslationService i18n) { this.i18n = i18n; - dialog = new BasicTopDialog.Builder(DIALOG_ID, false, true).autoscroll(false).firstButtonId(OK_ID).tabIndexStart( - 1).build(); + dialog = new BasicTopDialog.Builder(DIALOG_ID, false, true, i18n.getDirection()).autoscroll(false).firstButtonId( + OK_ID).tabIndexStart(1).build(); dialog.setFirstBtnText(i18n.t("Close")); dialog.setSecondBtnVisible(false); dialog.getFirstBtn().addClickHandler(new ClickHandler() { Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/SearchBoxFactory.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/SearchBoxFactory.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SearchBoxFactory.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -4,6 +4,7 @@ import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.shared.SearcherConstants; +import com.google.gwt.i18n.client.HasDirection.Direction; import com.google.gwt.user.client.ui.SuggestBox; import com.google.gwt.user.client.ui.SuggestOracle.Suggestion; @@ -43,6 +44,7 @@ suggestBox, searchOnlyUsers ? i18n.t("Type something to search for users in [%s]", siteCommonName) : i18n.t( "Type something to search for users and groups in [%s]", siteCommonName)); + suggestBox.getTextBox().setDirection(i18n.isRTL() ? Direction.RTL : Direction.LTR); return multivalueSBox; } Modified: trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -115,7 +115,7 @@ this.avatarDecoratorProv = avatarDecorator; this.dragController = dragController; widget = uiBinder.createAndBindUi(this); - actions = new ActionSimplePanel(guiProvider); + actions = new ActionSimplePanel(guiProvider, i18n); notDrop.register(firstCategoryFlow); notDrop.register(sndCategoryFlow); notDrop.register(trdCategoryFlow); Modified: trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -55,7 +55,7 @@ i18n.t("Users pending to be accepted in this group by the administrators")); sndDeckLabel.setText(i18n.t("This is an orphaned project, if you are interested in contributing please request to join")); firstDeckLabel.setText(i18n.t("The members of this group are not public")); - bottomActionsToolbar = new ActionFlowPanel(guiProvider); + bottomActionsToolbar = new ActionFlowPanel(guiProvider, i18n); bottomPanel.add(bottomActionsToolbar); bottomActionsToolbar.setStyleName("k-sn-bottomPanel-actions"); armor.getEntityToolsNorth().add(widget); Modified: trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -62,7 +62,7 @@ setTooltip(trdCategoryLabel, "NOT USED"); super.setTrdCategoryVisible(false, false); sndDeckLabel.setText("NOT USED"); - bottomActionsToolbar = new ActionFlowPanel(guiProvider); + bottomActionsToolbar = new ActionFlowPanel(guiProvider, i18n); bottomPanel.add(bottomActionsToolbar); bottomActionsToolbar.setStyleName("k-sn-bottomPanel-actions"); armor.getEntityToolsNorth().add(widget); Modified: trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPanel.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPanel.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -29,6 +29,7 @@ import cc.kune.core.shared.FileConstants; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import com.google.gwt.user.client.ui.AbstractImagePrototype; @@ -53,7 +54,7 @@ @Inject public EntityHeaderPanel(final Provider<FileDownloadUtils> downloadProvider, final CoreResources images, final GuiProvider bindings, final GSpaceArmor armor, - final EntityTextLogo entityTextLogo) { + final EntityTextLogo entityTextLogo, final I18nTranslationService i18n) { this.entityTextLogo = entityTextLogo; mainPanel = new HorizontalPanel(); mainPanel.setWidth("100%"); @@ -63,7 +64,7 @@ vpanel.setWidth("100%"); vpanel.setHorizontalAlignment(HorizontalPanel.ALIGN_RIGHT); mainPanel.add(entityTextLogo); - toolbar = new ActionFlowPanel(bindings); + toolbar = new ActionFlowPanel(bindings, i18n); vpanel.add(toolbar); mainPanel.add(vpanel); armor.getEntityHeader().add(mainPanel); Modified: trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -20,29 +20,34 @@ package cc.kune.core.server.i18n; import cc.kune.common.client.utils.TextUtils; -import cc.kune.core.server.UserSession; +import cc.kune.core.server.UserSessionManager; import cc.kune.core.server.manager.I18nTranslationManager; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.I18nTranslation; import com.google.inject.Inject; -import com.google.inject.Provider; import com.google.inject.Singleton; @Singleton public class I18nTranslationServiceDefault extends I18nTranslationService { private final I18nTranslationManager translationManager; + private final UserSessionManager userSessionManager; - // private final Provider<UserSession> userSessionProvider; - @Inject public I18nTranslationServiceDefault(final I18nTranslationManager translationManager, - final Provider<UserSession> userSessionProvider) { + final UserSessionManager userSessionManager) { this.translationManager = translationManager; - // this.userSessionProvider = userSessionProvider; + this.userSessionManager = userSessionManager; } + @Override + public boolean isRTL() { + return userSessionManager.isUserLoggedIn() ? userSessionManager.getUser().getLanguage().getDirection().equals( + RTL) + : false; + } + /** * If the text is not in the db, it stores the text pending for translation. * @@ -72,13 +77,11 @@ @Override public String tWithNT(final String text, final String noteForTranslators) { String language; - - // final UserSession userSession = userSessionProvider.get(); - // if (userSession.isUserLoggedIn()) { - // language = userSession.getUser().getLanguage().getCode(); - // } else { - language = I18nTranslation.DEFAULT_LANG; - // } + if (userSessionManager.isUserLoggedIn()) { + language = userSessionManager.getUser().getLanguage().getCode(); + } else { + language = I18nTranslation.DEFAULT_LANG; + } final String encodeText = TextUtils.escapeHtmlLight(text); String translation = translationManager.getTranslation(language, text, noteForTranslators); if (translation == UNTRANSLATED_VALUE) { Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/I18nTranslationManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/impl/I18nTranslationManagerDefault.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/I18nTranslationManagerDefault.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -175,7 +175,8 @@ final String escapedTranslation = TextUtils.escapeHtmlLight(translation); trans.setText(escapedTranslation); persist(trans); - langCache.clear(); + // reset cache for this lang + langCache.remove(lang); return escapedTranslation; } else { throw new DefaultException("Trying to translate a unknown item"); Modified: trunk/src/main/java/cc/kune/core/shared/dto/I18nLanguageDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/I18nLanguageDTO.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/core/shared/dto/I18nLanguageDTO.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -23,68 +23,68 @@ public class I18nLanguageDTO implements IsSerializable { - private String code; - private String englishName; - private String nativeName; - private String direction; - private String pluralization; - private String dateFormat; - private String dateFormatShort; + private String code; + private String dateFormat; + private String dateFormatShort; + private String direction; + private String englishName; + private String nativeName; + private String pluralization; - public String getCode() { - return code; - } + public String getCode() { + return code; + } - public String getDateFormat() { - return dateFormat; - } + public String getDateFormat() { + return dateFormat; + } - public String getDateFormatShort() { - return dateFormatShort; - } + public String getDateFormatShort() { + return dateFormatShort; + } - public String getDirection() { - return direction; - } + public String getDirection() { + return direction; + } - public String getEnglishName() { - return englishName; - } + public String getEnglishName() { + return englishName; + } - public String getNativeName() { - return nativeName; - } + public String getNativeName() { + return nativeName; + } - public String getPluralization() { - return pluralization; - } + public String getPluralization() { + return pluralization; + } - public void setCode(final String code) { - this.code = code; - } + public void setCode(final String code) { + this.code = code; + } - public void setDateFormat(String dateFormat) { - this.dateFormat = dateFormat; - } + public void setDateFormat(final String dateFormat) { + this.dateFormat = dateFormat; + } - public void setDateFormatShort(String dateFormatShort) { - this.dateFormatShort = dateFormatShort; - } + public void setDateFormatShort(final String dateFormatShort) { + this.dateFormatShort = dateFormatShort; + } - public void setDirection(final String direction) { - this.direction = direction; - } + public void setDirection(final String direction) { + this.direction = direction; + } - public void setEnglishName(final String englishName) { - this.englishName = englishName; - } + public void setEnglishName(final String englishName) { + this.englishName = englishName; + } - public void setNativeName(final String nativeName) { - this.nativeName = nativeName; - } + public void setNativeName(final String nativeName) { + this.nativeName = nativeName; + } - public void setPluralization(final String pluralization) { - this.pluralization = pluralization; - } + public void setPluralization(final String pluralization) { + this.pluralization = pluralization; + } } Modified: trunk/src/main/java/cc/kune/core/shared/i18n/I18nTranslationService.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/i18n/I18nTranslationService.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/core/shared/i18n/I18nTranslationService.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -21,8 +21,12 @@ import cc.kune.common.client.utils.Pair; +import com.google.gwt.i18n.client.HasDirection.Direction; + public abstract class I18nTranslationService { + protected static final String RTL = "rtl"; + // Also in I18nTranslation protected static final String UNTRANSLATED_VALUE = null; @@ -32,6 +36,12 @@ return text; } + public Direction getDirection() { + return isRTL() ? Direction.RTL : Direction.LTR; + } + + public abstract boolean isRTL(); + /** * Use [%d] to reference the Integer parameters * Modified: trunk/src/main/java/cc/kune/domain/I18nLanguage.java =================================================================== --- trunk/src/main/java/cc/kune/domain/I18nLanguage.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/domain/I18nLanguage.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -45,255 +45,256 @@ @Table(name = "globalize_languages") public class I18nLanguage implements HasId { - @Field(index = Index.TOKENIZED, store = Store.NO) - @Column(name = "code", unique = true) - private String code; + @Field(index = Index.TOKENIZED, store = Store.NO) + @Column(name = "code", unique = true) + private String code; - @Column(name = "date_format") - private String dateFormat; + @Column(name = "date_format") + private String dateFormat; - @Column(name = "date_format_short") - private String dateFormatShort; + @Column(name = "date_format_short") + private String dateFormatShort; - @Column(name = "direction") - private String direction; + @Column(name = "direction") + private String direction; - @Field(index = Index.TOKENIZED, store = Store.NO) - @Column(name = "english_name") - private String englishName; + @Field(index = Index.TOKENIZED, store = Store.NO) + @Column(name = "english_name") + private String englishName; - @Column(name = "english_name_locale") - private String englishNameLocale; + @Column(name = "english_name_locale") + private String englishNameLocale; - @Column(name = "english_name_modifier") - private String englishNameModifier; + @Column(name = "english_name_modifier") + private String englishNameModifier; - @Id - // Is not GeneratedValue - @DocumentId - @Column(name = "id", unique = true, nullable = false) - private Long id; + @Id + // Is not GeneratedValue + @DocumentId + @Column(name = "id", unique = true, nullable = false) + private Long id; - @Column(name = "iso_639_1", length = 2) - private String iso6391; + @Column(name = "iso_639_1", length = 2) + private String iso6391; - @Column(name = "iso_639_2", length = 3, unique = true) - private String iso6392; + @Column(name = "iso_639_2", length = 3, unique = true) + private String iso6392; - @Column(name = "iso_639_3", length = 3, unique = true) - private String iso6393; + @Column(name = "iso_639_3", length = 3, unique = true) + private String iso6393; - @Column(name = "macro_language") - private Boolean macroLanguage; + @Column(name = "macro_language") + private Boolean macroLanguage; - @Field(index = Index.TOKENIZED, store = Store.NO) - @Column(name = "native_name") - private String nativeName; + @Field(index = Index.TOKENIZED, store = Store.NO) + @Column(name = "native_name") + private String nativeName; - @Column(name = "native_name_locale") - private String nativeNameLocale; + @Column(name = "native_name_locale") + private String nativeNameLocale; - @Column(name = "native_name_modifier") - private String nativeNameModifier; + @Column(name = "native_name_modifier") + private String nativeNameModifier; - @Pattern(regex = "^[c=\\d?:%!<>&|() ]+$") - @Column(name = "pluralization") - @Length(max = 200) - private String pluralization; + @Pattern(regex = "^[c=\\d?:%!<>&|() ]+$") + @Column(name = "pluralization") + @Length(max = 200) + private String pluralization; - @Column(name = "rfc_3066", unique = true) - private String rfc3066; + @Column(name = "rfc_3066", unique = true) + private String rfc3066; - @Column(name = "scope", length = 1) - private String scope; + @Column(name = "scope", length = 1) + private String scope; - public I18nLanguage() { - this(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null); - } + public I18nLanguage() { + this(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, + null); + } - // Only for tests - public I18nLanguage(final Long id, final String englishName, final String nativeName, final String code) { - this.id = id; - this.englishName = englishName; - this.nativeName = nativeName; - this.code = code; - } + // Only for tests + public I18nLanguage(final Long id, final String englishName, final String nativeName, final String code) { + this.id = id; + this.englishName = englishName; + this.nativeName = nativeName; + this.code = code; + } - // code is iso6391 || iso6392 || rfc3306 (see DatabaseInicializer) - public I18nLanguage(final Long id, final String code, final String direction, final String englishName, - final String englishNameLocale, final String englishNameModifier, final String iso6391, - final String iso6392, final String iso6393, final Boolean macroLanguage, final String nativeName, - final String nativeNameLocale, final String nativeNameModifier, final String pluralization, - final String rfc3066, final String scope, final String dateFormat) { - this.id = id; - this.iso6391 = iso6391; - this.iso6392 = iso6392; - this.iso6393 = iso6393; - this.rfc3066 = rfc3066; - this.englishName = englishName; - this.englishNameLocale = englishNameLocale; - this.englishNameModifier = englishNameModifier; - this.nativeName = nativeName; - this.nativeNameLocale = nativeNameLocale; - this.nativeNameModifier = nativeNameModifier; - this.macroLanguage = macroLanguage; - this.direction = direction; - this.pluralization = pluralization; - this.scope = scope; - this.code = code; - this.dateFormat = dateFormat; - } + // code is iso6391 || iso6392 || rfc3306 (see DatabaseInicializer) + public I18nLanguage(final Long id, final String code, final String direction, + final String englishName, final String englishNameLocale, final String englishNameModifier, + final String iso6391, final String iso6392, final String iso6393, final Boolean macroLanguage, + final String nativeName, final String nativeNameLocale, final String nativeNameModifier, + final String pluralization, final String rfc3066, final String scope, final String dateFormat) { + this.id = id; + this.iso6391 = iso6391; + this.iso6392 = iso6392; + this.iso6393 = iso6393; + this.rfc3066 = rfc3066; + this.englishName = englishName; + this.englishNameLocale = englishNameLocale; + this.englishNameModifier = englishNameModifier; + this.nativeName = nativeName; + this.nativeNameLocale = nativeNameLocale; + this.nativeNameModifier = nativeNameModifier; + this.macroLanguage = macroLanguage; + this.direction = direction; + this.pluralization = pluralization; + this.scope = scope; + this.code = code; + this.dateFormat = dateFormat; + } - public String getCode() { - return code; - } + public String getCode() { + return code; + } - public String getDateFormat() { - return dateFormat; - } + public String getDateFormat() { + return dateFormat; + } - public String getDateFormatShort() { - return dateFormatShort; - } + public String getDateFormatShort() { + return dateFormatShort; + } - public String getDirection() { - return this.direction; - } + public String getDirection() { + return this.direction; + } - public String getEnglishName() { - return this.englishName; - } + public String getEnglishName() { + return this.englishName; + } - public String getEnglishNameLocale() { - return this.englishNameLocale; - } + public String getEnglishNameLocale() { + return this.englishNameLocale; + } - public String getEnglishNameModifier() { - return this.englishNameModifier; - } + public String getEnglishNameModifier() { + return this.englishNameModifier; + } - @Override - public Long getId() { - return this.id; - } + @Override + public Long getId() { + return this.id; + } - public String getIso6391() { - return this.iso6391; - } + public String getIso6391() { + return this.iso6391; + } - public String getIso6392() { - return this.iso6392; - } + public String getIso6392() { + return this.iso6392; + } - public String getIso6393() { - return this.iso6393; - } + public String getIso6393() { + return this.iso6393; + } - public Boolean getMacroLanguage() { - return this.macroLanguage; - } + public Boolean getMacroLanguage() { + return this.macroLanguage; + } - public String getNativeName() { - return this.nativeName; - } + public String getNativeName() { + return this.nativeName; + } - public String getNativeNameLocale() { - return this.nativeNameLocale; - } + public String getNativeNameLocale() { + return this.nativeNameLocale; + } - public String getNativeNameModifier() { - return this.nativeNameModifier; - } + public String getNativeNameModifier() { + return this.nativeNameModifier; + } - public String getPluralization() { - return this.pluralization; - } + public String getPluralization() { + return this.pluralization; + } - public String getRfc3066() { - return this.rfc3066; - } + public String getRfc3066() { + return this.rfc3066; + } - public String getScope() { - return this.scope; - } + public String getScope() { + return this.scope; + } - @Column(unique = true) - public void setCode(final String code) { - this.code = code; - } + @Column(unique = true) + public void setCode(final String code) { + this.code = code; + } - public void setDateFormat(final String dateFormat) { - this.dateFormat = dateFormat; - } + public void setDateFormat(final String dateFormat) { + this.dateFormat = dateFormat; + } - public void setDateFormatShort(final String dateFormatShort) { - this.dateFormatShort = dateFormatShort; - } + public void setDateFormatShort(final String dateFormatShort) { + this.dateFormatShort = dateFormatShort; + } - public void setDirection(final String direction) { - this.direction = direction; - } + public void setDirection(final String direction) { + this.direction = direction; + } - public void setEnglishName(final String englishName) { - this.englishName = englishName; - } + public void setEnglishName(final String englishName) { + this.englishName = englishName; + } - public void setEnglishNameLocale(final String englishNameLocale) { - this.englishNameLocale = englishNameLocale; - } + public void setEnglishNameLocale(final String englishNameLocale) { + this.englishNameLocale = englishNameLocale; + } - public void setEnglishNameModifier(final String englishNameModifier) { - this.englishNameModifier = englishNameModifier; - } + public void setEnglishNameModifier(final String englishNameModifier) { + this.englishNameModifier = englishNameModifier; + } - @Override - public void setId(final Long id) { - this.id = id; - } + @Override + public void setId(final Long id) { + this.id = id; + } - public void setIso6391(final String iso6391) { - this.iso6391 = iso6391; - } + public void setIso6391(final String iso6391) { + this.iso6391 = iso6391; + } - public void setIso6392(final String iso6392) { - this.iso6392 = iso6392; - } + public void setIso6392(final String iso6392) { + this.iso6392 = iso6392; + } - public void setIso6393(final String iso6393) { - this.iso6393 = iso6393; - } + public void setIso6393(final String iso6393) { + this.iso6393 = iso6393; + } - public void setMacroLanguage(final Boolean macroLanguage) { - this.macroLanguage = macroLanguage; - } + public void setMacroLanguage(final Boolean macroLanguage) { + this.macroLanguage = macroLanguage; + } - public void setNativeName(final String nativeName) { - this.nativeName = nativeName; - } + public void setNativeName(final String nativeName) { + this.nativeName = nativeName; + } - public void setNativeNameLocale(final String nativeNameLocale) { - this.nativeNameLocale = nativeNameLocale; - } + public void setNativeNameLocale(final String nativeNameLocale) { + this.nativeNameLocale = nativeNameLocale; + } - public void setNativeNameModifier(final String nativeNameModifier) { - this.nativeNameModifier = nativeNameModifier; - } + public void setNativeNameModifier(final String nativeNameModifier) { + this.nativeNameModifier = nativeNameModifier; + } - public void setPluralization(final String pluralization) { - this.pluralization = pluralization; - } + public void setPluralization(final String pluralization) { + this.pluralization = pluralization; + } - public void setRfc3066(final String rfc3066) { - this.rfc3066 = rfc3066; - } + public void setRfc3066(final String rfc3066) { + this.rfc3066 = rfc3066; + } - public void setScope(final String scope) { - this.scope = scope; - } + public void setScope(final String scope) { + this.scope = scope; + } - @Override - public String toString() { - return "I18nLanguage[" + englishName + "]"; - } + @Override + public String toString() { + return "I18nLanguage[" + englishName + "]"; + } } Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -263,13 +263,12 @@ @Override public void setBackImage(final String url) { final String bodyProp = "#FFFFFF url('" + url + "') fixed top left"; - // final String bodyProp = "#FFFFFF url('" + url + - // "') fixed no-repeat top left"; DOM.setStyleAttribute(groupSpaceWrapper.getElement(), CSS.A.BACKGROUND, bodyProp); } @Override public void setContentVisible(final boolean visible) { + // FIXME: remove this? // NotifyUser.info("Visible: " + visible); // docContainer.getElement().getStyle().setOpacity(visible ? 1d : .0d); // docFooter.getElement().getStyle().setOpacity(visible ? 1d : .0d); Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -29,7 +29,7 @@ final I18nToTranslateGridPanel toTranslateGrid, final I18nTranslatedGridPanel translatedGrid, final I18nTranslateRecomendPanel transRecommend, final CoreResources res) { super(TRANSLATOR_PANEL_ID, "", false, false, images, TRANSLATOR_ERROR_ID, i18n.t("Close"), null, - null, null, transGroup); + null, null, transGroup, i18n.getDirection()); setIcon(res.language()); this.lanSelectorPanel = lanSelectorPanel; this.toTranslateGrid = toTranslateGrid; Modified: trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -39,7 +39,7 @@ public GroupOptionsPanel(final EntityHeader entityHeader, final I18nTranslationService i18n, final NotifyLevelImages images, final GroupOptionsCollection entityOptionsGroup) { super(GROUP_OP_PANEL_ID, "", false, false, images, GROUP_OPTIONS_ERROR_ID, i18n.t("Close"), null, - null, null, entityOptionsGroup); + null, null, entityOptionsGroup, i18n.getDirection()); this.entityHeader = entityHeader; super.setIconCls("k-options-icon"); super.setTitle(i18n.t(CoreMessages.GROUP_OPTIONS_DIALOG_TITLE)); Modified: trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -37,7 +37,7 @@ public UserOptionsPanel(final EntityHeader entityHeader, final I18nTranslationService i18n, final NotifyLevelImages images, final UserOptionsCollection userOptionsGroup) { super(USER_OP_PANEL_ID, "", false, images, USER_OPTIONS_ERROR_ID, i18n.t("Close"), null, null, null, - userOptionsGroup); + userOptionsGroup, i18n.getDirection()); super.setIconCls("k-options-icon"); super.setTitle(i18n.t(CoreMessages.USER_OPTIONS_DIALOG_TITLE)); } Modified: trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmor.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmor.css 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmor.css 2011-11-12 02:58:35 UTC (rev 1603) @@ -7,9 +7,6 @@ .mainPanel { border-top: 2px solid white; - /* border-bottom: 7px solid transparent; - border-right: 17px solid transparent; - border-left: 17px solid transparent; */ } .k-spaces { @@ -34,10 +31,6 @@ overflow: hidden; background-color: #fff !important; padding: 0px 5px; - /*kfilter: alpha(opacity = 38) !important; - -moz-opacity: 0.38 !important; - -khtml-opacity: 0.38 !important; - opacity: 0.38 !important; */ } .entityCentralContainer { @@ -55,7 +48,6 @@ -webkit-border-bottom-right-radius: 7px; -moz-border-radius-bottomright: 7px; border-bottom-right-radius: 7px; - /* padding: 7px 10px 0px 17px; */ overflow: hidden; } @@ -165,15 +157,6 @@ border-top-right-radius: 7px; } -/* Fix wave scroll problem -.docEditor div { - overflow-y: visible; -} - -div.docEditor div { - position: static; -} -*/ .docFooter { border-left: 1px solid #959595; border-right: 1px solid #959595; @@ -203,16 +186,14 @@ border-bottom-left-radius: 7px; } -.entityToolsNorth { /* margin: 10px; */ +.entityToolsNorth { } -.entityToolsNorth span { /* font-size: 20px; - font-weight: bold; */ - +.entityToolsNorth span { } -.entityToolsCenter { /* margin: 10px; */ +.entityToolsCenter { overflow: visible !important; padding-top: 10px; clear: both; Modified: trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmorTheme.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmorTheme.css 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmorTheme.css 2011-11-12 02:58:35 UTC (rev 1603) @@ -41,8 +41,7 @@ color: c2; } -.k-sn-3rd-panel { /* background-color: #a05a2c; */ - +.k-sn-3rd-panel { } .entityToolsCenter span { Modified: trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPanel.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPanel.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -22,14 +22,15 @@ import cc.kune.common.client.actions.ui.ActionExtensibleView; import cc.kune.common.client.actions.ui.ActionFlowPanel; import cc.kune.common.client.actions.ui.bind.GuiProvider; +import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; public class GSpaceThemeSelectorPanel extends ActionFlowPanel implements ActionExtensibleView { @Inject - public GSpaceThemeSelectorPanel(final GuiProvider guiProvider) { - super(guiProvider); + public GSpaceThemeSelectorPanel(final GuiProvider guiProvider, final I18nTranslationService i18n) { + super(guiProvider, i18n); } } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -85,7 +85,7 @@ final int rowCount = flex.getRowCount(); final FolderItemWidget itemWidget = new FolderItemWidget((ImageResource) item.getIcon(), item.getText(), item.getStateToken()); - final ActionSimplePanel toolbar = new ActionSimplePanel(guiProvider); + final ActionSimplePanel toolbar = new ActionSimplePanel(guiProvider, i18n); final long modifiedOn = item.getModififiedOn(); if (modifiedOn != FolderViewerView.NO_DATE) { // String dateFormat = session.getCurrentLanguage().getDateFormatShort(); Modified: trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -51,7 +51,8 @@ @Override public void actionPerformed(final ActionEvent event) { - final Builder builder = new PromptTopDialog.Builder(ID, "Name of the new list?", false, true); + final Builder builder = new PromptTopDialog.Builder(ID, i18n.t("Name of the new list?"), false, + true, i18n.getDirection()); builder.width("300px").height("50px").firstButtonTitle(i18n.t("Create")).sndButtonTitle( i18n.t("Cancel")).firstButtonId(CREATE_ID).sndButtonId(CANCEL_ID).width(270); builder.textboxId(TEXTBOX_ID); Modified: trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -57,7 +57,8 @@ @Override public void actionPerformed(final ActionEvent event) { if (session.isLogged()) { - final Builder builder = new PromptTopDialog.Builder(ID, "Title of the new post?", false, true); + final Builder builder = new PromptTopDialog.Builder(ID, i18n.t("Title of the new post?"), false, + true, i18n.getDirection()); builder.width("300px").height("50px").firstButtonTitle(i18n.t("Post")).sndButtonTitle( i18n.t("Cancel")).firstButtonId(CREATE_ID).sndButtonId(CANCEL_ID).width(270); builder.textboxId(TEXTBOX_ID); Modified: trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java =================================================================== --- trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -23,6 +23,7 @@ import cc.kune.common.client.actions.ui.IsActionExtensible; import cc.kune.common.client.actions.ui.bind.GuiProvider; import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import cc.kune.pspace.client.PSpacePresenter.PSpaceView; @@ -66,9 +67,9 @@ @Inject public PSpacePanel(final GuiProvider guiProvider, final CoreResources res, final GSpaceArmor wsArmor, - final PSpaceInDevelopment inDevelopment) { + final PSpaceInDevelopment inDevelopment, final I18nTranslationService i18n) { widget = uiBinder.createAndBindUi(this); - actionPanel = new ActionFlowPanel(guiProvider); + actionPanel = new ActionFlowPanel(guiProvider, i18n); actionPanelContainer.add(actionPanel); final Element layer = mainPanel.getWidgetContainerElement(messagePanel); layer.addClassName("k-publicspace-msg"); Modified: trunk/src/main/webapp/ws.html =================================================================== --- trunk/src/main/webapp/ws.html 2011-11-11 18:50:03 UTC (rev 1602) +++ trunk/src/main/webapp/ws.html 2011-11-12 02:58:35 UTC (rev 1603) @@ -3,7 +3,6 @@ <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8"> <title>Kune</title> -  Added: trunk/src/test/java/cc/kune/core/client/i18n/I18nUrlUtilsTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/client/i18n/I18nUrlUtilsTest.java (rev 0) +++ trunk/src/test/java/cc/kune/core/client/i18n/I18nUrlUtilsTest.java 2011-11-12 02:58:35 UTC (rev 1603) @@ -0,0 +1,38 @@ +package cc.kune.core.client.i18n; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class I18nUrlUtilsTest { + + @Test + public void simpleLangChange() { + assertEquals("?locale=eu", I18nUrlUtils.changeLang("?locale=es", "eu")); + assertEquals("?locale=eu#", I18nUrlUtils.changeLang("?locale=es#", "eu")); + assertEquals("?locale=eu#hash", I18nUrlUtils.changeLang("?locale=es#hash", "eu")); + assertEquals("?locale=eu&some=value&someother=someothervalue#hash", + I18nUrlUtils.changeLang("?locale=es&some=value&someother=someothervalue#hash", "eu")); + assertEquals("?locale=eu&some=value&someother=someothervalue#", + I18nUrlUtils.changeLang("?locale=es&some=value&someother=someothervalue#", "eu")); + assertEquals("?locale=eu&log_level=INFO&gwt.codesvr=127.0.0.1:9997#inbox", + I18nUrlUtils.changeLang("?locale=pt-BR&log_level=INFO&gwt.codesvr=127.0.0.1:9997#inbox", "eu")); + assertEquals("?locale=eu&log_level=INFO&gwt.codesvr=127.0.0.1:9997#admin", + I18nUrlUtils.changeLang("?locale=es&log_level=INFO&gwt.codesvr=127.0.0.1:9997#admin", "eu")); + assertEquals("?locale=eu", I18nUrlUtils.changeLang("", "eu")); + assertEquals("?locale=eu#", I18nUrlUtils.changeLang("#", "eu")); + assertEquals("?locale=eu#hash", I18nUrlUtils.changeLang("#hash", "eu")); + assertEquals("?locale=eu&some=value&someother=someothervalue#hash", + I18nUrlUtils.changeLang("?some=value&someother=someothervalue#hash", "eu")); + assertEquals("?locale=eu&some=value&someother=someothervalue#", + I18nUrlUtils.changeLang("?some=value&someother=someothervalue#", "eu")); + assertEquals("?locale=eu&log_level=INFO&gwt.codesvr=127.0.0.1:9997#inbox", + I18nUrlUtils.changeLang("?locale=pt-BR&log_level=INFO&gwt.codesvr=127.0.0.1:9997#inbox", "eu")); + assertEquals("?locale=eu&log_level=INFO&gwt.codesvr=127.0.0.1:9997#admin", + I18nUrlUtils.changeLang("?log_level=INFO&gwt.codesvr=127.0.0.1:9997#admin", "eu")); + assertEquals("?locale=es&log_level=INFO&gwt.codesvr=127.0.0.1:9997#signin(admin)", + I18nUrlUtils.changeLang("?locale=ar&log_level=INFO&gwt.codesvr=127.0.0.1:9997" + + "#signin(admin)", "es")); + } + +}

1 0

11 Nov '11

Author: vjrj_ Date: 2011-11-11 19:50:03 +0100 (Fri, 11 Nov 2011) New Revision: 1602 Added: trunk/src/main/java/cc/kune/common/client/utils/MetaUtils.java trunk/src/main/java/cc/kune/core/client/sn/SimpleContactManager.java trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsBuddieCondition.java trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsNotBuddieCondition.java trunk/src/test/java/cc/kune/selenium/SeleniumConf.java trunk/src/test/java/cc/kune/selenium/SeleniumConstants.java Removed: trunk/src/main/java/cc/kune/chat/client/actions/conditions/IsBuddieCondition.java trunk/src/main/java/cc/kune/chat/client/actions/conditions/IsNotBuddieCondition.java trunk/src/test/java/cc/kune/selenium/tools/SeleniumConstants.java Modified: trunk/CREDITS trunk/INSTALL trunk/TODO trunk/src/main/java/cc/kune/chat/client/ChatClient.java trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java trunk/src/main/java/cc/kune/chat/client/ChatParts.java trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToBuddyHeaderButton.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNAdminsMenuItemsRegistry.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNCollabsMenuItemsRegistry.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNMenuItemsRegistry.java trunk/src/main/java/cc/kune/core/server/manager/impl/I18nTranslationManagerDefault.java trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java trunk/src/main/resources/kune.properties trunk/src/test/java/cc/kune/selenium/KuneSeleniumDefaults.java trunk/src/test/java/cc/kune/selenium/SeleniumModule.java trunk/src/test/java/cc/kune/selenium/chat/ChatPageObject.java trunk/src/test/java/cc/kune/selenium/general/EntityHeaderPageObject.java trunk/src/test/java/cc/kune/selenium/login/AbstractLoginObject.java trunk/src/test/java/cc/kune/selenium/login/LoginPageObject.java trunk/src/test/java/cc/kune/selenium/login/RegisterPageObject.java trunk/src/test/java/cc/kune/selenium/login/RegisterSeleniumTests.java trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java trunk/src/test/java/cc/kune/selenium/spaces/SpacesPageObject.java trunk/src/test/java/cc/kune/selenium/spaces/UserSpacePageObject.java Log: NEW - # 144: Resolve some i18n typos (sizes, no translated, etc) http://kune.ourproject.org/issues/ticket/144 CLOSED - # 89: Include a way to invite/add someone to a group (again) http://kune.ourproject.org/issues/ticket/89 Some dependencies removed. More work in tests... Modified: trunk/CREDITS =================================================================== --- trunk/CREDITS 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/CREDITS 2011-11-11 18:50:03 UTC (rev 1602) @@ -24,5 +24,6 @@ * Daniel Jiménez for the initial help and coordination * Johnattan Rupire, William Austen Bradbury and Rana Hassan for their web contributions and translations +* Bastien Guerry for his French translation * and <URL:http://ourproject.org> and again <URL:http://xsto.info> and <URL:http://iepala.es> for sharing with us their resources Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/INSTALL 2011-11-11 18:50:03 UTC (rev 1602) @@ -271,6 +271,13 @@ After the section 'Run the server for the first time' you'll be able to use the password of the admin user of the kune instalation (specified in kune.properties), or other admin new users you want to register using kune and configure in the authorizedUsernames attribute. +=== Configure your DNS for your XMPP service correctly === + +You have to configure your DNS domain adding SRV records for your XMPP services. This permit that your XMPP server comunicates with other similar servers correctly. You should follow: +http://jabberd.org/1.4/doc/adminguide#dnssrv +and: +http://www.google.com/support/a/bin/answer.py?answer=34143 + ==Appendix B: Apache configuration sample== Enable this modules: Modified: trunk/TODO =================================================================== --- trunk/TODO 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/TODO 2011-11-11 18:50:03 UTC (rev 1602) @@ -13,7 +13,6 @@ * SHORT-TERM (URGENT) ** TODO multi uploader -*** Some links http://code.google.com/p/gwt-plupload/ http://www.plupload.com/example_all_runtimes.php http://gxt-multiupload-demo.appspot.com/ @@ -369,6 +368,19 @@ To determine how much memory you can spare for Java, try this: stop your Java process; run free -m; subtract the 'used' value from the "-/+ cache" row from the total memory allocated to your server and then subtract another 'just in case' margin of about 10% of your total server memory. The number you come up with is a rough indicator of the largest -Xmx setting you can use on your server. * MID-TERM +** Try to reuse welcome message to anonymous users in GWave: +Welcome to Google Wave + +You are looking at a wave that someone thought you'd be interested in. Google Wave helps you communicate and work together with richly formatted text, photos, videos and more. It lets you all stay on the same page. +Quick tips + + Move to the next unread blip. Try spacebar. + Edit any blip in the wave.Try ctrl-e. + Reply to any blip. Try shift-enter or double click text. + Reply to any blip. Hover over the bottom of a blip and click the blue bar. + Add someone else to this wave, using an email address or their Wave address. + +Sign in to Google Wave ** Study mozilla web apps: https://apps.mozillalabs.com/ ** Menubar submenus problem Modified: trunk/src/main/java/cc/kune/chat/client/ChatClient.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClient.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/main/java/cc/kune/chat/client/ChatClient.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -19,22 +19,18 @@ */ package cc.kune.chat.client; +import cc.kune.core.client.sn.SimpleContactManager; + import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; import com.calclab.emite.xep.muc.client.Room; -public interface ChatClient { +public interface ChatClient extends SimpleContactManager { public static final String CHAT_CLIENT_ICON_ID = "k-chat-icon-id"; - void addNewBuddy(String shortName); - - void chat(String shortName); - void chat(XmppURI jid); void doLogin(); - boolean isBuddy(String shortName); - boolean isBuddy(XmppURI jid); boolean isLoggedIn(); Modified: trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -25,6 +25,7 @@ import cc.kune.common.client.ExtendedGinModule; import cc.kune.core.client.avatar.MediumAvatarDecorator; import cc.kune.core.client.avatar.SmallAvatarDecorator; +import cc.kune.core.client.sn.SimpleContactManager; public class ChatGinModule extends ExtendedGinModule { /* @@ -38,6 +39,7 @@ bind(SmallAvatarDecorator.class).to(SmallAvatarDecoratorImpl.class); bind(MediumAvatarDecorator.class).to(MediumAvatarDecoratorImpl.class); s(ChatClient.class, ChatClientDefault.class); + s(SimpleContactManager.class, ChatClient.class); s(ChatOptions.class); s(ChatSitebarActions.class); s(AddAsBuddieHeaderButton.class); Modified: trunk/src/main/java/cc/kune/chat/client/ChatParts.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatParts.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/main/java/cc/kune/chat/client/ChatParts.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -28,8 +28,6 @@ import cc.kune.chat.client.actions.StartChatWithMemberAction; import cc.kune.chat.client.actions.StartChatWithThisBuddyAction; import cc.kune.chat.client.actions.StartChatWithThisPersonAction; -import cc.kune.chat.client.actions.conditions.IsBuddieCondition; -import cc.kune.chat.client.actions.conditions.IsNotBuddieCondition; import cc.kune.chat.shared.ChatConstants; import cc.kune.common.client.actions.AbstractAction; import cc.kune.common.client.actions.PropertyChangeEvent; @@ -38,10 +36,12 @@ import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.init.AppStartEvent.AppStartHandler; import cc.kune.core.client.sn.GroupSNPresenter; +import cc.kune.core.client.sn.actions.conditions.IsBuddieCondition; import cc.kune.core.client.sn.actions.conditions.IsCurrentStateAGroupCondition; import cc.kune.core.client.sn.actions.conditions.IsCurrentStateAdministrableCondition; import cc.kune.core.client.sn.actions.conditions.IsCurrentStateEditableCondition; import cc.kune.core.client.sn.actions.conditions.IsLoggedCondition; +import cc.kune.core.client.sn.actions.conditions.IsNotBuddieCondition; import cc.kune.core.client.sn.actions.conditions.IsNotMeCondition; import cc.kune.core.client.sn.actions.conditions.IsPersonCondition; import cc.kune.core.client.sn.actions.registry.GroupSNAdminsMenuItemsRegistry; Deleted: trunk/src/main/java/cc/kune/chat/client/actions/conditions/IsBuddieCondition.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/conditions/IsBuddieCondition.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/main/java/cc/kune/chat/client/actions/conditions/IsBuddieCondition.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -1,72 +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.chat.client.actions.conditions; - -import cc.kune.chat.client.ChatClient; -import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; -import cc.kune.common.client.actions.ui.descrip.GuiAddCondition; -import cc.kune.common.client.errors.UIException; -import cc.kune.core.client.state.Session; -import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.dto.UserSimpleDTO; - -import com.google.inject.Inject; -import com.google.inject.Singleton; - -@Singleton -public class IsBuddieCondition implements GuiAddCondition { - - private final ChatClient chatClient; - private final Session session; - - @Inject - public IsBuddieCondition(final Session session, final ChatClient chatClient) { - this.chatClient = chatClient; - this.session = session; - } - - private boolean isBuddie(final String targetName) { - return chatClient.isBuddy(targetName); - } - - private boolean isThisGroupInRoster(final GuiActionDescrip descr) { - final String targetName = ((GroupDTO) descr.getTarget()).getShortName(); - return isBuddie(targetName); - } - - private boolean isThisPersonInRoster(final GuiActionDescrip descr) { - final String targetName = ((UserSimpleDTO) descr.getTarget()).getShortName(); - return isBuddie(targetName); - } - - @Override - public boolean mustBeAdded(final GuiActionDescrip descr) { - if (session.isNotLogged()) { - return false; - } - if (descr.getTarget() instanceof UserSimpleDTO) { - return isThisPersonInRoster(descr); - } else if (descr.getTarget() instanceof GroupDTO) { - return isThisGroupInRoster(descr); - } else { - throw new UIException("Unsupported target"); - } - } -} Deleted: trunk/src/main/java/cc/kune/chat/client/actions/conditions/IsNotBuddieCondition.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/conditions/IsNotBuddieCondition.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/main/java/cc/kune/chat/client/actions/conditions/IsNotBuddieCondition.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -1,42 +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.chat.client.actions.conditions; - -import cc.kune.chat.client.ChatClient; -import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; -import cc.kune.core.client.state.Session; - -import com.google.inject.Inject; -import com.google.inject.Singleton; - -@Singleton -public class IsNotBuddieCondition extends IsBuddieCondition { - - @Inject - public IsNotBuddieCondition(final Session session, final ChatClient chatClient) { - super(session, chatClient); - } - - @Override - public boolean mustBeAdded(final GuiActionDescrip descr) { - return !super.mustBeAdded(descr); - } - -} Added: trunk/src/main/java/cc/kune/common/client/utils/MetaUtils.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/utils/MetaUtils.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/utils/MetaUtils.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -0,0 +1,31 @@ +package cc.kune.common.client.utils; + +import com.google.gwt.dom.client.Document; +import com.google.gwt.dom.client.Element; +import com.google.gwt.dom.client.MetaElement; +import com.google.gwt.dom.client.NodeList; + +public class MetaUtils { + + /** + * Get the value of meta information writen in the html page. The meta + * information is a html tag with name of meta usually placed inside the the + * head section with two attributes: id and content. For example: + * + * <code><meta name="name" value="userName" /></code> + * + * @param id + * the 'id' value of the desired meta tag + * @return the value of the attribute 'content' or null if not found + */ + public static String get(final String name) { + final NodeList<Element> tags = Document.get().getElementsByTagName("meta"); + for (int i = 0; i < tags.getLength(); i++) { + final MetaElement metaTag = ((MetaElement) tags.getItem(i)); + if (metaTag.getName().equals(name)) { + return metaTag.getContent(); + } + } + return null; + } +} Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -28,6 +28,7 @@ import cc.kune.common.client.log.Log; import cc.kune.common.client.utils.Location; +import cc.kune.common.client.utils.MetaUtils; import cc.kune.common.client.utils.Pair; import cc.kune.common.client.utils.TextUtils; import cc.kune.common.client.utils.WindowUtils; @@ -38,7 +39,6 @@ import cc.kune.core.shared.dto.I18nLanguageDTO; 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; @@ -52,6 +52,7 @@ private String currentLanguageCode; private final Set<Pair<String, String>> earlyTexts; private final I18nServiceAsync i18nService; + private boolean isLangInProperties; private final KuneConstants kuneConstants; private HashMap<String, String> lexicon; private final Session session; @@ -69,10 +70,19 @@ Log.info("Workspace starting with language: " + currentLocale.getLocaleName() + ", isRTL: " + LocaleInfo.getCurrentLocale().isRTL() + ", translated langs: " + Arrays.toString(LocaleInfo.getAvailableLocaleNames())); - earlyTexts = new HashSet<Pair<String, String>>(); i18nService.getInitialLanguage(locale, new AsyncCallback<I18nLanguageDTO>() { + + private boolean isInConstantProperties(final I18nLanguageDTO currentLang) { + for (final String lang : LocaleInfo.getAvailableLocaleNames()) { + if (lang.equals(currentLang.getCode())) { + return true; + } + } + return false; + } + @Override public void onFailure(final Throwable caught) { Log.error("Workspace adaptation to your language failed: " + caught.getMessage()); @@ -83,6 +93,7 @@ currentLang = result; currentLanguageCode = currentLang.getCode(); session.setCurrentLanguage(currentLang); + isLangInProperties = isInConstantProperties(currentLang); i18nService.getLexicon(currentLang.getCode(), new AsyncCallback<HashMap<String, String>>() { @Override public void onFailure(final Throwable caught) { @@ -93,7 +104,8 @@ public void onSuccess(final HashMap<String, String> result) { lexicon = result; session.setCurrentLanguage(currentLang); - Log.info("Workspace adaptation to language: " + currentLang.getEnglishName()); + Log.info("Workspace adaptation to language: " + currentLang.getEnglishName() + ", isRTL: " + + currentLang.getDirection()); eventBus.fireEvent(new I18nReadyEvent()); } }); @@ -114,6 +126,7 @@ } }); } + }); } @@ -141,6 +154,8 @@ * String value of the new locale to go to. */ private native void changeLocale(String newLocale) + // FIXME: this now does not works correctly with hosted mode (and also give + // some "Opss" in server side) /*-{ // Uncomment the "debugger;" line to see how to set debug statements in JSNI code // When in web mode, if your browser has a JavaScript debugger attached, it will @@ -194,13 +209,39 @@ public String getSiteCommonName() { if (siteCommonName == null) { - // FIXME: remove this dependency with PageAssist (emite) - final String meta = PageAssist.getMeta("kune.default.site.commonname"); + final String meta = MetaUtils.get("kune.default.site.commonname"); siteCommonName = (meta == null ? t("this site") : t(meta)); } return siteCommonName; } + private String getTransFromBD(final String text, final String noteForTranslators, + final String encodeText) { + if (lexicon == null) { + Log.warn("i18n not initialized: " + text); + earlyTexts.add(Pair.create(text, noteForTranslators)); + Log.warn("i18n pending translations: " + earlyTexts.size()); + return text; + } + String translation = lexicon.get(encodeText); + if (lexicon.containsKey(encodeText)) { + if (translation == UNTRANSLATED_VALUE) { + // Not translated but in db, return text + translation = encodeText; + } + } else { + // Not translated and not in db, make a petition for translation + if (session.isLogged()) { + save(text, noteForTranslators); + lexicon.put(encodeText, UNTRANSLATED_VALUE); + } else { + earlyTexts.add(Pair.create(text, noteForTranslators)); + } + translation = encodeText; + } + return decodeHtml(translation); + } + private void save(final String text, final String noteForTranslators) { i18nService.getTranslation(session.getUserHash(), currentLanguageCode, text, noteForTranslators, new AsyncCallback<String>() { @@ -244,32 +285,17 @@ return text; } final String encodeText = TextUtils.escapeHtmlLight(text); - try { - return kuneConstants.getString(I18nUtils.convertMethodName(text + " " + noteForTranslators)); - } catch (final MissingResourceException e) { - if (lexicon == null) { - Log.warn("i18n not initialized: " + text); - earlyTexts.add(Pair.create(text, noteForTranslators)); - Log.warn("i18n pending translations: " + earlyTexts.size()); - return text; + + if (isLangInProperties) { + // The db translations now are in properties files (more stable) + try { + return kuneConstants.getString(I18nUtils.convertMethodName(text + " " + noteForTranslators)); + } catch (final MissingResourceException e) { + // Ok this concrete translation is not jet available, we use DB + return getTransFromBD(text, noteForTranslators, encodeText); } - String translation = lexicon.get(encodeText); - if (lexicon.containsKey(encodeText)) { - if (translation == UNTRANSLATED_VALUE) { - // Not translated but in db, return text - translation = encodeText; - } - } else { - // Not translated and not in db, make a petition for translation - if (session.isLogged()) { - save(text, noteForTranslators); - lexicon.put(encodeText, UNTRANSLATED_VALUE); - } else { - earlyTexts.add(Pair.create(text, noteForTranslators)); - } - translation = encodeText; - } - return decodeHtml(translation); + } else { + return getTransFromBD(text, noteForTranslators, encodeText); } } } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -123,7 +123,7 @@ @ProxyEvent public void onAppStart(final AppStartEvent event) { - OPTIONS_MENU.putValue(Action.NAME, i18n.t("Options")); + OPTIONS_MENU.putValue(Action.NAME, i18n.t("More")); OPTIONS_MENU.putValue(Action.SMALL_ICON, res.arrowdownsitebar()); OPTIONS_MENU.setStyles("k-no-backimage, k-btn-sitebar"); OPTIONS_MENU.putValue(AbstractGxtMenuGui.MENU_POSITION, AbstractGxtMenuGui.MenuPosition.bl); Added: trunk/src/main/java/cc/kune/core/client/sn/SimpleContactManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/SimpleContactManager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/SimpleContactManager.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -0,0 +1,30 @@ +/* + * + * 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.sn; + +public interface SimpleContactManager { + + void addNewBuddy(String shortName); + + void chat(String shortName); + + boolean isBuddy(String shortName); + +} Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -19,7 +19,6 @@ */ package cc.kune.core.client.sn.actions; -import cc.kune.chat.client.ChatClient; import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; @@ -28,6 +27,7 @@ import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.sitebar.search.EntitySearchPanel; import cc.kune.core.client.sitebar.search.OnEntitySelectedInSearch; +import cc.kune.core.client.sn.SimpleContactManager; import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; @@ -38,7 +38,7 @@ @Inject public AddNewBuddiesAction(final I18nTranslationService i18n, final CoreResources res, - final AddBuddieSearchPanel searchPanel, final ChatClient chatClient) { + final AddBuddieSearchPanel searchPanel, final SimpleContactManager contactsManager) { this.searchPanel = searchPanel; putValue(Action.NAME, i18n.t("Add a new buddy")); putValue(Action.SMALL_ICON, res.addGreen()); @@ -54,7 +54,7 @@ @Override public void onSuccess() { - chatClient.addNewBuddy(shortName); + contactsManager.addNewBuddy(shortName); NotifyUser.info("Added as buddy in your contacts. If your buddie adds you also, it will be visible in your network"); } }); Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToBuddyHeaderButton.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToBuddyHeaderButton.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToBuddyHeaderButton.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -19,11 +19,11 @@ */ package cc.kune.core.client.sn.actions; -import cc.kune.chat.client.ChatClient; import cc.kune.common.client.actions.AbstractAction; import cc.kune.common.client.actions.PropertyChangeEvent; import cc.kune.common.client.actions.PropertyChangeListener; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; +import cc.kune.core.client.sn.SimpleContactManager; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateChangedEvent; import cc.kune.core.client.state.StateChangedEvent.StateChangedHandler; @@ -38,7 +38,8 @@ @Inject public WriteToBuddyHeaderButton(final WriteToAction writeToAction, final EntityHeader entityHeader, - final StateManager stateManager, final Session session, final ChatClient chatEngine) { + final StateManager stateManager, final Session session, + final SimpleContactManager simpleContactManager) { final ButtonDescriptor button = new ButtonDescriptor(writeToAction); // button.setVisible(false); button.withText("Write to your buddy"); @@ -60,7 +61,7 @@ final GroupDTO group = state.getGroup(); final String groupName = group.getShortName(); final boolean imLogged = session.isLogged(); - final boolean isBuddie = chatEngine.isBuddy(groupName); + final boolean isBuddie = simpleContactManager.isBuddy(groupName); if (imLogged && group.isPersonal() && isBuddie && !session.getCurrentUser().getShortName().equals(groupName)) { button.setTarget(group); Copied: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsBuddieCondition.java (from rev 1597, trunk/src/main/java/cc/kune/chat/client/actions/conditions/IsBuddieCondition.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsBuddieCondition.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsBuddieCondition.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -0,0 +1,72 @@ +/* + * + * 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.sn.actions.conditions; + +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiAddCondition; +import cc.kune.common.client.errors.UIException; +import cc.kune.core.client.sn.SimpleContactManager; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.UserSimpleDTO; + +import com.google.inject.Inject; +import com.google.inject.Singleton; + +@Singleton +public class IsBuddieCondition implements GuiAddCondition { + + private final Session session; + private final SimpleContactManager simpleContactManager; + + @Inject + public IsBuddieCondition(final Session session, final SimpleContactManager simpleContactManager) { + this.simpleContactManager = simpleContactManager; + this.session = session; + } + + private boolean isBuddie(final String targetName) { + return simpleContactManager.isBuddy(targetName); + } + + private boolean isThisGroupInRoster(final GuiActionDescrip descr) { + final String targetName = ((GroupDTO) descr.getTarget()).getShortName(); + return isBuddie(targetName); + } + + private boolean isThisPersonInRoster(final GuiActionDescrip descr) { + final String targetName = ((UserSimpleDTO) descr.getTarget()).getShortName(); + return isBuddie(targetName); + } + + @Override + public boolean mustBeAdded(final GuiActionDescrip descr) { + if (session.isNotLogged()) { + return false; + } + if (descr.getTarget() instanceof UserSimpleDTO) { + return isThisPersonInRoster(descr); + } else if (descr.getTarget() instanceof GroupDTO) { + return isThisGroupInRoster(descr); + } else { + throw new UIException("Unsupported target"); + } + } +} Copied: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsNotBuddieCondition.java (from rev 1597, trunk/src/main/java/cc/kune/chat/client/actions/conditions/IsNotBuddieCondition.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsNotBuddieCondition.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsNotBuddieCondition.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -0,0 +1,42 @@ +/* + * + * 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.sn.actions.conditions; + +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.core.client.sn.SimpleContactManager; +import cc.kune.core.client.state.Session; + +import com.google.inject.Inject; +import com.google.inject.Singleton; + +@Singleton +public class IsNotBuddieCondition extends IsBuddieCondition { + + @Inject + public IsNotBuddieCondition(final Session session, final SimpleContactManager contactManager) { + super(session, contactManager); + } + + @Override + public boolean mustBeAdded(final GuiActionDescrip descr) { + return !super.mustBeAdded(descr); + } + +} Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNAdminsMenuItemsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNAdminsMenuItemsRegistry.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNAdminsMenuItemsRegistry.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -19,7 +19,6 @@ */ package cc.kune.core.client.sn.actions.registry; -import cc.kune.chat.client.actions.conditions.IsBuddieCondition; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.core.client.sn.actions.AcceptJoinGroupAction; import cc.kune.core.client.sn.actions.ChangeToAdminAction; @@ -30,6 +29,7 @@ import cc.kune.core.client.sn.actions.GotoYourHomePageAction; import cc.kune.core.client.sn.actions.RemoveMemberAction; import cc.kune.core.client.sn.actions.WriteToAction; +import cc.kune.core.client.sn.actions.conditions.IsBuddieCondition; import cc.kune.core.client.sn.actions.conditions.IsCurrentStateAdministrableCondition; import cc.kune.core.client.sn.actions.conditions.IsGroupCondition; import cc.kune.core.client.sn.actions.conditions.IsLoggedCondition; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNCollabsMenuItemsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNCollabsMenuItemsRegistry.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNCollabsMenuItemsRegistry.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -19,7 +19,6 @@ */ package cc.kune.core.client.sn.actions.registry; -import cc.kune.chat.client.actions.conditions.IsBuddieCondition; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.core.client.sn.actions.AcceptJoinGroupAction; import cc.kune.core.client.sn.actions.ChangeToAdminAction; @@ -30,6 +29,7 @@ import cc.kune.core.client.sn.actions.GotoYourHomePageAction; import cc.kune.core.client.sn.actions.RemoveMemberAction; import cc.kune.core.client.sn.actions.WriteToAction; +import cc.kune.core.client.sn.actions.conditions.IsBuddieCondition; import cc.kune.core.client.sn.actions.conditions.IsCurrentStateAdministrableCondition; import cc.kune.core.client.sn.actions.conditions.IsGroupCondition; import cc.kune.core.client.sn.actions.conditions.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-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -50,6 +50,7 @@ @SuppressWarnings("serial") public class UserSNConfActions extends AbstractSNActionsRegistry { + public static final String ADD_BUDDIE_BTN = "user-sn-add-buddie-btn"; public static final MenuDescriptor OPTIONS_MENU = new MenuDescriptor(); public static final SubMenuDescriptor VISIBILITY_SUBMENU = new SubMenuDescriptor(); @@ -76,7 +77,7 @@ final ButtonDescriptor addBuddieBtn = new ButtonDescriptor(addNewBuddiesAction); - addImpl(addBuddieBtn.withStyles("k-no-backimage")); + addImpl(addBuddieBtn.withStyles("k-no-backimage").withId(ADD_BUDDIE_BTN)); stateManager.onStateChanged(true, new StateChangedHandler() { @Override Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNMenuItemsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNMenuItemsRegistry.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNMenuItemsRegistry.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -19,7 +19,6 @@ */ package cc.kune.core.client.sn.actions.registry; -import cc.kune.chat.client.actions.conditions.IsBuddieCondition; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.core.client.sn.actions.AcceptJoinGroupAction; import cc.kune.core.client.sn.actions.ChangeToAdminAction; @@ -32,6 +31,7 @@ import cc.kune.core.client.sn.actions.UnJoinFromThisGroupAction; import cc.kune.core.client.sn.actions.WriteToAction; import cc.kune.core.client.sn.actions.conditions.ImPartOfGroupCondition; +import cc.kune.core.client.sn.actions.conditions.IsBuddieCondition; import cc.kune.core.client.sn.actions.conditions.IsCurrentStateAdministrableCondition; import cc.kune.core.client.sn.actions.conditions.IsGroupCondition; import cc.kune.core.client.sn.actions.conditions.IsLoggedCondition; Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/I18nTranslationManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/impl/I18nTranslationManagerDefault.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/I18nTranslationManagerDefault.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -167,7 +167,6 @@ @Override public String setTranslation(final Long id, final String translation) throws DefaultException { - final I18nTranslation trans = super.find(id); if (trans != null) { // Don't permit to translate the def language Modified: trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -240,7 +240,9 @@ } catch (final ToolNotFoundException e) { throw new ContentNotFoundException(); } catch (final NoDefaultContentException e) { - return mapper.map(stateService.createNoHome(user, token.getGroup()), StateNoContentDTO.class); + return mapper.map( + stateService.createNoHome(user, token.hasNothing() ? user.getShortName() : token.getGroup()), + StateNoContentDTO.class); } } Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/main/resources/kune.properties 2011-11-11 18:50:03 UTC (rev 1602) @@ -50,7 +50,7 @@ # Translation # Currently, we only manage the translations of the proper kune sofware from our demo, so in other kune sites we disable the translator -kune.ui-translator.enabled = false +kune.ui-translator.enabled = true ### Other params Modified: trunk/src/test/java/cc/kune/selenium/KuneSeleniumDefaults.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/KuneSeleniumDefaults.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/test/java/cc/kune/selenium/KuneSeleniumDefaults.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -24,6 +24,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.openqa.selenium.Alert; import org.openqa.selenium.By; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebDriver; @@ -48,7 +49,6 @@ import cc.kune.selenium.spaces.HomeSpacePageObject; import cc.kune.selenium.spaces.SpacesPageObject; import cc.kune.selenium.spaces.UserSpacePageObject; -import cc.kune.selenium.tools.SeleniumConstants; import com.google.inject.Guice; import com.google.inject.Injector; @@ -58,8 +58,8 @@ public static final Injector INJECTOR = Guice.createInjector(new SeleniumModule()); private static final Log LOG = LogFactory.getLog(KuneSeleniumDefaults.class); - public static boolean mustCloseFinally = true; - private final String baseUrl; + public static boolean mustCloseFinally = false; + private String baseUrl; protected final ChatPageObject chat; protected final EntityHeaderPageObject entityHeader; protected final GroupSpacePageObject groupSpace; @@ -73,10 +73,23 @@ private final WebDriver webdriver; public KuneSeleniumDefaults() { - // baseUrl = "http://kune.beta.iepala.es/?locale=en#"; - // baseUrl = - // "http://127.0.0.1:8888/?locale=es&log_level=INFO&gwt.codesvr=127.0.0.1:9997#"; - baseUrl = "http://beta.eurosur.org/#"; + final String localeParam = "?locale=" + SeleniumConf.LANG; + switch (SeleniumConf.SITE) { + case demo: + baseUrl = "http://kune.beta.iepala.es/" + localeParam + "#"; + break; + case localhost: + baseUrl = "http://127.0.0.1:8888/" + localeParam + "&log_level=INFO&gwt.codesvr=127.0.0.1:9997#"; + break; + case eurosur: + baseUrl = "http://beta.eurosur.org/" + localeParam + "#"; + break; + case kunecc: + baseUrl = "http://kune.cc/" + localeParam + "#"; + break; + default: + break; + } injector = INJECTOR; webdriver = injector.getInstance(WebDriver.class); login = injector.getInstance(LoginPageObject.class); @@ -99,6 +112,12 @@ PageFactory.initElements(locator, groupSpace); } + public void answerOnNextPrompt(final String answer) { + final Alert alert = webdriver.switchTo().alert(); + alert.sendKeys(answer); + alert.accept(); + } + @BeforeMethod public void beforeMethods(final ITestContext context) { } Added: trunk/src/test/java/cc/kune/selenium/SeleniumConf.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/SeleniumConf.java (rev 0) +++ trunk/src/test/java/cc/kune/selenium/SeleniumConf.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -0,0 +1,45 @@ +/* + * + * 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.selenium; + +public final class SeleniumConf { + + public enum Driver { + chrome, firefox + } + + public enum Lang { + en, es + } + + public enum Site { + demo, eurosur, kunecc, localhost + } + + public static final Driver DRIVER = Driver.firefox; + /* Configure this for use other lang, site, or driver */ + public static final Lang LANG = Lang.en; + public static final Site SITE = Site.localhost; + public static final int TIMEOUT = 25; + + SeleniumConf() { + // Final class + } +} Copied: trunk/src/test/java/cc/kune/selenium/SeleniumConstants.java (from rev 1597, trunk/src/test/java/cc/kune/selenium/tools/SeleniumConstants.java) =================================================================== --- trunk/src/test/java/cc/kune/selenium/SeleniumConstants.java (rev 0) +++ trunk/src/test/java/cc/kune/selenium/SeleniumConstants.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -0,0 +1,37 @@ +/* + * + * 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.selenium; + +public final class SeleniumConstants { + + public static final String FIREFOX_PROFILE_NAME = "selenium"; + public static final String GWTDEV = "gwt-debug-"; + + public static final String INPUT = "-input"; + /* Configure this for use other lang, site, or driver */ + public static final String USER_EMAIL = "admin(a)example.org"; + public static final String USER_LONGNAME = "Administrator"; + public static final String USER_PASSWD = "easyeasy"; + public static final String USER_SHORNAME = "admin"; + + SeleniumConstants() { + // Final class + } +} Modified: trunk/src/test/java/cc/kune/selenium/SeleniumModule.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/SeleniumModule.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/test/java/cc/kune/selenium/SeleniumModule.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -39,7 +39,6 @@ import cc.kune.selenium.login.LoginPageObject; import cc.kune.selenium.login.RegisterPageObject; import cc.kune.selenium.spaces.SpacesPageObject; -import cc.kune.selenium.tools.SeleniumConstants; import com.google.inject.Singleton; @@ -47,15 +46,23 @@ @Override protected void configure() { - // final RemoteWebDriver driver = createChromeDriver(); - final WebDriver driver = creatFirefoxDriver(); + WebDriver driver; + switch (SeleniumConf.DRIVER) { + case chrome: + driver = createChromeDriver(); + break; + case firefox: + default: + driver = creatFirefoxDriver(); + break; + } final EventFiringWebDriver wrap = new EventFiringWebDriver(driver); wrap.register(new CustomWebDriverEventListener()); bind(WebDriver.class).toInstance(wrap); bind(ElementLocatorFactory.class).toInstance( - new AjaxElementLocatorFactory(wrap, SeleniumConstants.TIMEOUT)); + new AjaxElementLocatorFactory(wrap, SeleniumConf.TIMEOUT)); // Page Objects here! bind(LoginPageObject.class).in(Singleton.class); @@ -67,10 +74,18 @@ final ResourceBundle english = ResourceBundle.getBundle("TestConstants", Locale.ENGLISH); final ResourceBundle spanish = ResourceBundle.getBundle("TestConstants", new Locale("es")); Locale.setDefault(Locale.ENGLISH); - bind(ResourceBundle.class).toInstance(spanish); + switch (SeleniumConf.LANG) { + case es: + bind(ResourceBundle.class).toInstance(spanish); + break; + case en: + default: + bind(ResourceBundle.class).toInstance(english); + break; + } + } - @SuppressWarnings("unused") private RemoteWebDriver createChromeDriver() { // http://code.google.com/p/selenium/wiki/ChromeDriver System.setProperty("webdriver.chrome.driver", "/usr/bin/chromedriver"); Modified: trunk/src/test/java/cc/kune/selenium/chat/ChatPageObject.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/chat/ChatPageObject.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/test/java/cc/kune/selenium/chat/ChatPageObject.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -25,7 +25,7 @@ import cc.kune.chat.client.ChatClient; import cc.kune.selenium.PageObject; -import cc.kune.selenium.tools.SeleniumConstants; +import cc.kune.selenium.SeleniumConstants; import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; import com.calclab.hablar.core.client.Idify; Modified: trunk/src/test/java/cc/kune/selenium/general/EntityHeaderPageObject.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/general/EntityHeaderPageObject.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/test/java/cc/kune/selenium/general/EntityHeaderPageObject.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -24,7 +24,7 @@ import cc.kune.core.client.ws.entheader.EntityTextLogo; import cc.kune.selenium.PageObject; -import cc.kune.selenium.tools.SeleniumConstants; +import cc.kune.selenium.SeleniumConstants; public class EntityHeaderPageObject extends PageObject { Modified: trunk/src/test/java/cc/kune/selenium/login/AbstractLoginObject.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/login/AbstractLoginObject.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/test/java/cc/kune/selenium/login/AbstractLoginObject.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -7,7 +7,7 @@ import cc.kune.core.client.sitebar.SitebarSignInLink; import cc.kune.core.client.sitebar.SitebarSignOutLink; import cc.kune.selenium.PageObject; -import cc.kune.selenium.tools.SeleniumConstants; +import cc.kune.selenium.SeleniumConstants; public class AbstractLoginObject extends PageObject { @FindBy(id = SeleniumConstants.GWTDEV + SitebarSignInLink.SITE_SIGN_IN) Modified: trunk/src/test/java/cc/kune/selenium/login/LoginPageObject.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/login/LoginPageObject.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/test/java/cc/kune/selenium/login/LoginPageObject.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -26,7 +26,7 @@ import cc.kune.core.client.auth.AnonUsersManager; import cc.kune.core.client.auth.SignInForm; import cc.kune.core.client.auth.SignInPanel; -import cc.kune.selenium.tools.SeleniumConstants; +import cc.kune.selenium.SeleniumConstants; public class LoginPageObject extends AbstractLoginObject { Modified: trunk/src/test/java/cc/kune/selenium/login/RegisterPageObject.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/login/RegisterPageObject.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/test/java/cc/kune/selenium/login/RegisterPageObject.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -26,7 +26,7 @@ import cc.kune.core.client.auth.Register; import cc.kune.core.client.auth.RegisterForm; import cc.kune.core.client.auth.RegisterPanel; -import cc.kune.selenium.tools.SeleniumConstants; +import cc.kune.selenium.SeleniumConstants; public class RegisterPageObject extends AbstractLoginObject { Modified: trunk/src/test/java/cc/kune/selenium/login/RegisterSeleniumTests.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/login/RegisterSeleniumTests.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/test/java/cc/kune/selenium/login/RegisterSeleniumTests.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -24,8 +24,8 @@ import cc.kune.core.client.state.SiteTokens; import cc.kune.selenium.KuneSeleniumTest; +import cc.kune.selenium.SeleniumConstants; import cc.kune.selenium.SeleniumUtils; -import cc.kune.selenium.tools.SeleniumConstants; import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; @@ -47,36 +47,52 @@ login.assertIsConnectedAs(prefix); entityHeader.waitForEntityTitle(longName + prefix); register.getWelcomeMsg().click(); - // home space - showTitleSlide(t("Home space (your welcome page)"), - t("Here you can see a summary of your activity in this site")); - spaces.homeBtn().click(); + + // // home space + // showTitleSlide(t("Home space (your welcome page)"), + // t("Here you can see a summary of your activity in this site")); + // spaces.homeBtn().click(); + // sleep(2000); + // homeSpace.getSndStats().click(); + // sleep(2000); + // homeSpace.getTrdStats().click(); + // sleep(2000); + // + // // user space + // showTitleSlide(t("User space (your Inbox)"), + // t("contents in which you participate")); + // showTooltip(spaces.userBtn()); + // spaces.userBtn().click(); + // showMsg(t("You can see this like an advanced email system...")); + // userSpace.getFirstWave().click(); + // sleep(2000); + // userSpace.getNewWave().click(); + // showMsg(t("where you can compose personal messages...")); + // showMsg(t("but also create contents to publish later")); + // userSpace.rootBlipText().sendKeys(t("Congratulations for your report\n\n")); + // sleep(1000); + // userSpace.getCursive().click(); + // userSpace.rootBlipText().sendKeys( + // t("Hi there, Just to say that I like") + + // t("a lot your last report\n\n")); + // sleep(1000); + // userSpace.getCursive().click(); + // userSpace.rootBlipText().sendKeys(t("Best\n\nJane")); + // sleep(3000); + // userSpace.getRootEdit().click(); + // userSpace.getAddParcipant().click(); + // answerOnNextPrompt("admin"); + // sleep(5000); + + // group space + showTitleSlide(t("Your personal public space"), t("here you can have your blog, etc")); + spaces.groupBtn().click(); + groupSpace.addBuddieBtn().click(); + groupSpace.searchEntitiesTextBox().sendKeys("admin\n"); + groupSpace.searchEntitiesOk().click(); + groupSpace.firstAvatarOfGroup().click(); sleep(2000); - homeSpace.getSndStats().click(); - sleep(2000); - homeSpace.getTrdStats().click(); - sleep(2000); - // user space - showTitleSlide(t("User space (your Inbox)"), t("contents in which you participate")); - showTooltip(spaces.userBtn()); - spaces.userBtn().click(); - showMsg(t("You can see this like an advanced email system...")); - userSpace.getFirstWave().click(); - sleep(2000); - userSpace.getNewWave().click(); - showMsg(t("where you can compose personal messages...")); - showMsg(t("but also create contents to publish later")); - userSpace.rootBlipText().sendKeys(t("Congratulations for your report\n\n")); - sleep(1000); - userSpace.getCursive().click(); - userSpace.rootBlipText().sendKeys( - t("Hi there, Just to say that I like") + t("a lot your last report\n\n")); - sleep(1000); - userSpace.getCursive().click(); - userSpace.rootBlipText().sendKeys(t("Best\n\nJane")); - sleep(3000); - userSpace.getRootEdit().click(); // chat showTitleSlide(t("Chat with your buddies"), t("compatible with gmail and similars"), SiteTokens.WAVEINBOX); Modified: trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -22,10 +22,15 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; +import cc.kune.core.client.sitebar.search.EntitySearchPanel; +import cc.kune.core.client.sn.actions.registry.UserSNConfActions; import cc.kune.selenium.PageObject; +import cc.kune.selenium.SeleniumConstants; public class GroupSpacePageObject extends PageObject { + @FindBy(id = SeleniumConstants.GWTDEV + UserSNConfActions.ADD_BUDDIE_BTN) + private WebElement addBuddieBtn; @FindBy(xpath = "//div[2]/div/div[3]/div/span") private WebElement blogTool; @FindBy(xpath = "//div[2]/div/div[4]/div/span") @@ -38,6 +43,10 @@ private WebElement firstAvatarOfGroup; @FindBy(xpath = "//div[2]/div/div[5]/div/span") private WebElement listTool; + @FindBy(id = SeleniumConstants.GWTDEV + EntitySearchPanel.OK_ID) + private WebElement searchEntitiesOk; + @FindBy(id = SeleniumConstants.GWTDEV + EntitySearchPanel.ENTITY_SEARCH_TEXTBOX) + private WebElement searchEntitiesTextBox; @FindBy(xpath = "//div[3]/div/button") private WebElement socialNetOptions; @FindBy(xpath = "//div[2]/div/div[7]/div/span") @@ -45,39 +54,51 @@ @FindBy(xpath = "//div[2]/div/div[7]/div/span") private WebElement wikiTool; - public WebElement getBlogTool() { + public WebElement addBuddieBtn() { + return addBuddieBtn; + } + + public WebElement blogTool() { return blogTool; } - public WebElement getChatTool() { + public WebElement chatTool() { return chatTool; } - public WebElement getDocTool() { + public WebElement docTool() { return docTool; } - public WebElement getEventTool() { + public WebElement eventTool() { return eventTool; } - public WebElement getFirstAvatarOfGroup() { + public WebElement firstAvatarOfGroup() { return firstAvatarOfGroup; } - public WebElement getListTool() { + public WebElement listTool() { return listTool; } - public WebElement getSocialNetOptions() { + public WebElement searchEntitiesOk() { + return searchEntitiesOk; + } + + public WebElement searchEntitiesTextBox() { + return searchEntitiesTextBox; + } + + public WebElement socialNetOptions() { return socialNetOptions; } - public WebElement getTaskTool() { + public WebElement taskTool() { return taskTool; } - public WebElement getWikiTool() { + public WebElement wikiTool() { return wikiTool; } Modified: trunk/src/test/java/cc/kune/selenium/spaces/SpacesPageObject.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/spaces/SpacesPageObject.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/test/java/cc/kune/selenium/spaces/SpacesPageObject.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -24,7 +24,7 @@ import cc.kune.core.client.sitebar.spaces.SpaceSelectorPresenter.SpaceSelectorView; import cc.kune.selenium.PageObject; -import cc.kune.selenium.tools.SeleniumConstants; +import cc.kune.selenium.SeleniumConstants; public class SpacesPageObject extends PageObject { Modified: trunk/src/test/java/cc/kune/selenium/spaces/UserSpacePageObject.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/spaces/UserSpacePageObject.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/test/java/cc/kune/selenium/spaces/UserSpacePageObject.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -27,6 +27,9 @@ public class UserSpacePageObject extends PageObject { + @FindBy(xpath = "//span[2]/span") + private WebElement addParticipant; + @FindBy(xpath = "//div[2]/div/div[2]/div[3]/div[4]") private WebElement cursive; @@ -54,6 +57,10 @@ public UserSpacePageObject() { } + public WebElement getAddParcipant() { + return addParticipant; + } + public WebElement getCursive() { return cursive; } Deleted: trunk/src/test/java/cc/kune/selenium/tools/SeleniumConstants.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/tools/SeleniumConstants.java 2011-11-11 02:57:03 UTC (rev 1601) +++ trunk/src/test/java/cc/kune/selenium/tools/SeleniumConstants.java 2011-11-11 18:50:03 UTC (rev 1602) @@ -1,35 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.selenium.tools; - -public final class SeleniumConstants { - public static final String FIREFOX_PROFILE_NAME = "selenium"; - public static final String GWTDEV = "gwt-debug-"; - public static final String INPUT = "-input"; - public static final int TIMEOUT = 25; - public static final String USER_EMAIL = "admin(a)example.org"; - public static final String USER_LONGNAME = "Administrator"; - public static final String USER_PASSWD = "easyeasy"; - public static final String USER_SHORNAME = "admin"; - - SeleniumConstants() { - // Final class - } -}

1 0

r1601 - trunk/src/main/webapp/others/js
by Vicente J. Ruiz Jurado 11 Nov '11

11 Nov '11

Author: vjrj_ Date: 2011-11-11 03:57:03 +0100 (Fri, 11 Nov 2011) New Revision: 1601 Modified: trunk/src/main/webapp/others/js/fake-selenium-pointer.js Log: pointer improved Modified: trunk/src/main/webapp/others/js/fake-selenium-pointer.js =================================================================== --- trunk/src/main/webapp/others/js/fake-selenium-pointer.js 2011-11-10 21:26:37 UTC (rev 1600) +++ trunk/src/main/webapp/others/js/fake-selenium-pointer.js 2011-11-11 02:57:03 UTC (rev 1601) @@ -13,7 +13,7 @@ } function kmoveit() { - for (inc = 0; inc <= 1; inc = inc + 0.01) { + for (inc = 0; inc <= 1 && !(k_cur_x == newx && k_cur_y == newy); inc = inc + 0.01) { k_cur_x = Math.round(k_cur_x * (1 - inc) + newx * inc); k_cur_y = Math.round(k_cur_y * (1 - inc) + newy * inc); window.setTimeout('ksetCursorPos(' + k_cur_x + ", " + k_cur_y + ')',

1 0

r1600 - trunk/src/main/webapp/others/js
by Vicente J. Ruiz Jurado 10 Nov '11

10 Nov '11

Author: vjrj_ Date: 2011-11-10 22:26:37 +0100 (Thu, 10 Nov 2011) New Revision: 1600 Modified: trunk/src/main/webapp/others/js/fake-selenium-pointer.js Log: Minor change in selenium tests Modified: trunk/src/main/webapp/others/js/fake-selenium-pointer.js =================================================================== --- trunk/src/main/webapp/others/js/fake-selenium-pointer.js 2011-11-10 21:22:37 UTC (rev 1599) +++ trunk/src/main/webapp/others/js/fake-selenium-pointer.js 2011-11-10 21:26:37 UTC (rev 1600) @@ -27,8 +27,8 @@ } function ksetCursorPos(x, y) { - document.getElementById('kcursor').style.top = x + 'px'; - document.getElementById('kcursor').style.left = y + 'px'; + document.getElementById('kcursor').style.left = x + 'px'; + document.getElementById('kcursor').style.top = y + 'px'; } function khideCursor() {

1 0

r1599 - in trunk/src/main: java/cc/kune/core/client/actions/xml java/cc/kune/gspace/client/viewers webapp webapp/others webapp/others/js
by Vicente J. Ruiz Jurado 10 Nov '11

10 Nov '11

Author: vjrj_ Date: 2011-11-10 22:22:37 +0100 (Thu, 10 Nov 2011) New Revision: 1599 Added: trunk/src/main/webapp/others/js/ trunk/src/main/webapp/others/js/fake-selenium-pointer.js Modified: trunk/src/main/java/cc/kune/core/client/actions/xml/AddGadgetAction.java trunk/src/main/java/cc/kune/core/client/actions/xml/NewGadgetAction.java trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java trunk/src/main/webapp/ws.html Log: Modified: trunk/src/main/java/cc/kune/core/client/actions/xml/AddGadgetAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/actions/xml/AddGadgetAction.java 2011-11-10 01:10:27 UTC (rev 1598) +++ trunk/src/main/java/cc/kune/core/client/actions/xml/AddGadgetAction.java 2011-11-10 21:22:37 UTC (rev 1599) @@ -25,34 +25,22 @@ import cc.kune.core.client.rpcservices.AsyncCallbackSimple; 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.dto.AccessRolDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.viewers.ContentViewerPresenter; import com.google.inject.Provider; public class AddGadgetAction extends RolAction { private final Provider<ContentServiceAsync> contentService; - private final ContentViewerPresenter contentViewer; private final String gadgetName; - private final I18nTranslationService i18n; private final Session session; - private final StateManager stateManager; - public AddGadgetAction(final Provider<ContentServiceAsync> contentService, - final ContentViewerPresenter contentViewerPresenter, final StateManager stateManager, - final Session session, final I18nTranslationService i18n, final AccessRolDTO rol, - final boolean authNeeded, final String gadgetName, final String iconUrl) { + public AddGadgetAction(final Provider<ContentServiceAsync> contentService, final Session session, + final AccessRolDTO rol, final boolean authNeeded, final String gadgetName, final String iconUrl) { super(rol, authNeeded); this.contentService = contentService; - this.contentViewer = contentViewerPresenter; - this.stateManager = stateManager; - this.i18n = i18n; this.gadgetName = gadgetName; this.session = session; - putValue(Action.SMALL_ICON, iconUrl); } @@ -62,9 +50,6 @@ gadgetName, new AsyncCallbackSimple<Void>() { @Override public void onSuccess(final Void result) { - // NotifyUser.info(i18n.t("[%s] created succesfully", title)); - // stateManager.setRetrievedStateAndGo(result); - // contentViewer.blinkTitle(); } }); } Modified: trunk/src/main/java/cc/kune/core/client/actions/xml/NewGadgetAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/actions/xml/NewGadgetAction.java 2011-11-10 01:10:27 UTC (rev 1598) +++ trunk/src/main/java/cc/kune/core/client/actions/xml/NewGadgetAction.java 2011-11-10 21:22:37 UTC (rev 1599) @@ -66,8 +66,8 @@ @Override public void actionPerformed(final ActionEvent event) { - contentService.get().addNewContentWithGadget(session.getUserHash(), session.getCurrentStateToken(), gadgetName, - typeId, i18n.t(title), i18n.t(body), new AsyncCallbackSimple<StateContentDTO>() { + contentService.get().addNewContentWithGadget(session.getUserHash(), session.getCurrentStateToken(), + gadgetName, typeId, i18n.t(title), i18n.t(body), new AsyncCallbackSimple<StateContentDTO>() { @Override public void onSuccess(final StateContentDTO result) { NotifyUser.info(i18n.t("[%s] created succesfully", title)); 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-11-10 01:10:27 UTC (rev 1598) +++ trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java 2011-11-10 21:22:37 UTC (rev 1599) @@ -171,7 +171,7 @@ if (origTypeId.equals(destTypeId)) { // We are adding a gadget in a doc (nor creating a gadget in a // container) - action = new AddGadgetAction(contentService, contentViewer, stateManager, session, i18n, + action = new AddGadgetAction(contentService, session, descrip.getRol().getRolRequired(), descrip.getRol().isAuthNeed(), extension.getExtName(), extension.getIconUrl()); } else { Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java 2011-11-10 01:10:27 UTC (rev 1598) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java 2011-11-10 21:22:37 UTC (rev 1599) @@ -82,6 +82,7 @@ @Override public void clear() { gsArmor.getSubheaderToolbar().clear(); + gsArmor.getDocFooterToolbar().clear(); UiUtils.clear(gsArmor.getDocContainer()); UiUtils.clear(gsArmor.getDocHeader()); } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java 2011-11-10 01:10:27 UTC (rev 1598) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java 2011-11-10 21:22:37 UTC (rev 1599) @@ -132,6 +132,7 @@ public void clear() { onlyViewPanel.setHTML(""); gsArmor.getSubheaderToolbar().clear(); + gsArmor.getDocFooterToolbar().clear(); UiUtils.clear(gsArmor.getDocContainer()); UiUtils.clear(gsArmor.getDocHeader()); waveClear(); Added: trunk/src/main/webapp/others/js/fake-selenium-pointer.js =================================================================== --- trunk/src/main/webapp/others/js/fake-selenium-pointer.js (rev 0) +++ trunk/src/main/webapp/others/js/fake-selenium-pointer.js 2011-11-10 21:22:37 UTC (rev 1599) @@ -0,0 +1,41 @@ +// This is only used for selenium tests (remove in production) +var newx; +var newy; +var k_cur_x; +var k_cur_y; + +function kmove(x, y) { + // We adjust a litte bit to put the pointer close to the ui object but not + // very close + newx = x + 2; + newy = y + 10; + kmoveit(); +} + +function kmoveit() { + for (inc = 0; inc <= 1; inc = inc + 0.01) { + k_cur_x = Math.round(k_cur_x * (1 - inc) + newx * inc); + k_cur_y = Math.round(k_cur_y * (1 - inc) + newy * inc); + window.setTimeout('ksetCursorPos(' + k_cur_x + ", " + k_cur_y + ')', + 2000 * inc); + } +} + +function ksetCursor(x, y) { + k_cur_x = x; + k_cur_y = y; +} + +function ksetCursorPos(x, y) { + document.getElementById('kcursor').style.top = x + 'px'; + document.getElementById('kcursor').style.left = y + 'px'; +} + +function khideCursor() { + document.getElementById('kcursor').style.visibility = 'hidden'; +} + +function kshowCursor() { + document.getElementById('kcursor').style.visibility = 'visible'; +} +ksetCursor(0, 0); \ No newline at end of file Modified: trunk/src/main/webapp/ws.html =================================================================== --- trunk/src/main/webapp/ws.html 2011-11-10 01:10:27 UTC (rev 1598) +++ trunk/src/main/webapp/ws.html 2011-11-10 21:22:37 UTC (rev 1599) @@ -279,85 +279,14 @@ <![endif]--> </head> <body> +  <div id="kcursor" style="visibility: hidden; position: absolute; z-Index: 100001; height: 0; width: 0"> <img src="/others/cursor-orange.png"> </div> - <script type="text/javascript"> -  - function recheck() { - if (newx >= k_cur_x) { - x_inc = 1; - } else { - x_inc = -1; - } - if (newy >= k_cur_y) { - y_inc = 1; - } else { - y_inc = -1; - } - diff_x = newx - k_cur_x * x_inc; - diff_y = newy - k_cur_y * y_inc; - xGreat = diff_x > diff_y; - } - - function kmoveit() { - recheck(); - if (k_cur_x != newx) - if (xGreat) { - k_cur_x = k_cur_x + 3 * x_inc; - } else { - k_cur_x = Math.round(k_cur_y * newx / newy); - } - if (k_cur_y != newy) - if (xGreat) { - k_cur_y = Math.round(k_cur_x * newy / newx); - } else { - k_cur_y = k_cur_y + 3 * y_inc; - } - - ksetCursorPos(k_cur_x, k_cur_y); - - if ((diff_x > 3) || (diff_y > 3)) { - window.setTimeout('kmoveit()', 1); - } - } - - function ksetCursorPos(x, y) { - document.getElementById('kcursor').style.top = k_cur_y + 'px'; - document.getElementById('kcursor').style.left = k_cur_x + 'px'; - } - function ksetCursor(x, y) { - k_cur_x = x; - k_cur_y = y; - ksetCursorPos(x, y); - } - - function khideCursor() { - document.getElementById('kcursor').style.visibility = 'hidden'; - } - - function kshowCursor() { - document.getElementById('kcursor').style.visibility = 'visible'; - } - ksetCursor(0, 0); - //--> - </script>  <div class="banner" id="banner"></div>  @@ -419,7 +348,7 @@ <div id="k-home-summary-right"> <div id="k-home-ini"> Welcome! This site is a Kune node. Kune, which means - "together" in esperanto, it's a network of interconnected + "together" in esperanto, is a network of interconnected sites like this one, where you can <strong>communicate, share, collaborate with others and create your web spaces easily</strong>. <a href="#signin">Join!</a>

1 0

Jump to page: