[kune-commits] r1117 - in trunk: . script src/main/java/org/ourproject/kune/app src/main/java/org/ourproject/kune/app/client src/main/java/org/ourproject/kune/app/public src/main/java/org/ourproject/kune/app/public/css src/main/java/org/ourproject/kune/app/server src/main/java/org/ourproject/kune/gallery/client/cnt src/main/java/org/ourproject/kune/platf/client/actions src/main/java/org/ourproject/kune/platf/client/actions/ui src/main/java/org/ourproject/kune/platf/client/app src/main/java/org/ourproject/ku

Author: vjrj Date: 2009-06-08 04:40:16 +0200 (Mon, 08 Jun 2009) New Revision: 1117 Added: trunk/src/main/java/org/ourproject/kune/app/public/ws.html trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/BasicPopupPanel.java trunk/src/main/webapp/lib/ trunk/src/main/webapp/lib/gwt-log-2.5.3.jar trunk/src/main/webapp/lib/gwt-servlet-1.6.4.jar trunk/src/main/webapp/lib/gwt-servlet.jar trunk/src/main/webapp/lib/gwt-user-1.6.4.jar trunk/var/ trunk/var/tmp/ trunk/var/tmp/kune-target/ trunk/war/ trunk/war/WEB-INF/ trunk/war/WEB-INF/lib/ trunk/war/WEB-INF/lib/gwt-log-2.5.3.jar trunk/war/WEB-INF/lib/gwt-servlet-1.6.4.jar trunk/war/WEB-INF/lib/gwt-servlet.jar trunk/war/WEB-INF/lib/gwt-user-1.6.4.jar trunk/war/WEB-INF/web.xml Removed: trunk/src/main/java/org/ourproject/kune/app/public/Kune.html trunk/src/test/java/org/ourproject/kune/platf/server/content/ContentManagerDefaultTest.java Modified: trunk/ trunk/COPYRIGHT trunk/DEV-GUIDE trunk/TODO trunk/pom.xml trunk/script/css-update.sh trunk/script/deploy_gwt.sh trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java trunk/src/main/java/org/ourproject/kune/app/public/css/all.css trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/KeyStroke.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractButtonGui.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractComplexGuiItem.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractGuiActionDescrip.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractGuiItem.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractMenuGui.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractMenuItemGui.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ComplexToolbar.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/GuiBindingsRegister.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuBinding.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuCheckItemDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuGui.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuRadioItemDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/PushButtonDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/SubMenuGui.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ToolbarSeparatorDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessRightsDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/GlobalShortcutRegister.java trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/Keyboard.java trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/ShortcutDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/ShortcutRegister.java trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractLabel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/BasicThumb.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/DropDownPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconHyperlink.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconLabel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconLabelEditable.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/LabelWrapper.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/AbstractPopupPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/BasicDialogExtended.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/form/AbstractFormPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalettePanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/SimplePalettePanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/RichTextArea.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTELinkPopup.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanelNew.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenterNew.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorViewNew.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImpl.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplIE6.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplMozilla.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOpera.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplSafari.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplStandard.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/AbstractRichTextAreaTest.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/occidental/AbstractInsertCharPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/utils/Url.java trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditor.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFlags.java trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/rate/Star.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInView.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteprogress/SiteProgressPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Toolbar.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddiePanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java trunk/src/main/webapp/WEB-INF/web.xml trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionShortcutTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentCommentServiceTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceAddTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/selenium/KuneSeleniumTestHelper.java trunk/src/test/java/org/ourproject/kune/platf/integration/selenium/SeleniumTestHelper.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java Log: Incomplete - task upgrade to gwt 1.6.4 Property changes on: trunk ___________________________________________________________________ Name: svn:ignore - .pmd www-test screenlog.0 bin client public target Main-compile bin .settings .gwt-cache repository derby.log star-yellow-grey.png run.sh tomcat .classpath gwt-out synccss.sh .externalToolBuilders .project .wtpmodules www testRepository kune-OLD-jcr KuneApp.launch KuneApp NOSERVER.launch old_src org.ourproject.kune.app.Kune org.ourproject.kune.iml org.ourproject.kune.ipr org.ourproject.kune.iws nbproject hibernate.reveng.xml .gwt-tmp target-eclipse .checkstyle + pmd-eclipse.log .pmd www-test screenlog.0 bin client public target Main-compile bin .settings .gwt-cache repository derby.log star-yellow-grey.png run.sh tomcat .classpath gwt-out synccss.sh .externalToolBuilders .project .wtpmodules www testRepository kune-OLD-jcr KuneApp.launch KuneApp NOSERVER.launch old_src org.ourproject.kune.app.Kune org.ourproject.kune.iml org.ourproject.kune.ipr org.ourproject.kune.iws nbproject hibernate.reveng.xml .gwt-tmp target-eclipse .checkstyle Modified: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/COPYRIGHT 2009-06-08 02:40:16 UTC (rev 1117) @@ -56,7 +56,7 @@ some icons -------------------------------------------------------------------------------- -It was downloaded from http://tango-project.org/releases +It was downloaded from http://tango.freedesktop.org/ Copyright: Creative Commons Attribution-ShareAlike 2.5 License Agreement http://creativecommons.org/licenses/by-sa/2.5/ Modified: trunk/DEV-GUIDE =================================================================== --- trunk/DEV-GUIDE 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/DEV-GUIDE 2009-06-08 02:40:16 UTC (rev 1117) @@ -147,6 +147,12 @@ Your mother/father must understand and be capable of use Kune if they are capable of use yahoo/gmail/hotmail email accounts. It he/she are not capable of use Kune, we are not doing well our work, and we must do more usable our UI. +Some relevant links to solve doubts: + +http://library.gnome.org/devel/hig-book/stable/ +http://wiki.openusability.org/guidelines/ +http://developer.apple.com/documentation/UserExperience/Conceptual/AppleHIGu... + ===Designs patterns=== * MVC: We use a lot the [http://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93controller MVC pattern] in our GWT code. See our HelloWorldModule class for a simple sample. We used to auto generate some MVC classes with the script script/generateBasicUIElements.sh: Modified: trunk/TODO =================================================================== --- trunk/TODO 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/TODO 2009-06-08 02:40:16 UTC (rev 1117) @@ -11,6 +11,8 @@ Use org-mode in emacs to easy manage this file * SHORT-TERM (URGENT) +** Use of webdriver instead of plain selenium + http://code.google.com/p/webdriver/ ** New Action class *** Things to support - [X] menu and toolbars separators (space, bar, expand) @@ -29,6 +31,7 @@ - [ ] 2:27 (?) icon ... - [ ] 2:35 "Start a chat with this member"-> chat! and other long items - [ ] 2.41 long submenus... + - [ ] scroll of licenses ** maven-gwt problem (using another plugin from codehaus) mvn com.totsp.gwt:maven-googlewebtoolkit2-plugin:compile and so on. @@ -507,6 +510,21 @@ http://erdgeist.org/arts/software/opentracker/ http://torrentfreak.com/the-pirate-bay-switches-to-opentracker-071208/ * LONG-TERM +** <s> About mailman usability and integration +(sorry some comments in Spanish) +muy poca chicha: +2007: http://mail.python.org/pipermail/mailman-users/2007-February/055752.html +solo un mensaje mmmm sin respuesta: +2009: http://forum.joomla.org/viewtopic.php?f=471&t=400655&start=0 +tampoco me parece muy allá +2008: http://markmail.org/message/l4pwznsl6aflth2s +poca cosa: +2008: http://markmail.org/message/fbp25rl4v2guak7w?q=mailman+%22google+groups%22#q... +http://wiki.list.org/pages/viewpage.action?pageId=4030527 +Más, interesante para nosotros: +http://groups.google.com/group/google-appengine/browse_thread/thread/a3ccf22... +http://uphpu.org/pipermail/uphpu/2007-August/007858.html +Tb es un detalle gracioso que al ir a http://en.wikipedia.org/wiki/Electronic_mailing_list se linkan tanto Mailman como MSN/Yahoo/Google Groups, claro... cualquiera puede ir, ver la más cómoda, y usarla :P ** <s> integrate some blog/wiki converter: http://code.google.com/p/google-blog-converters-appengine/ http://toolserver.org/~merphant/wiki2html/ Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/pom.xml 2009-06-08 02:40:16 UTC (rev 1117) @@ -5,13 +5,15 @@ <groupId>org.ourproject</groupId> <artifactId>kune</artifactId> <packaging>jar</packaging> - <version>0.0.5</version> + <version>0.0.6</version> <description> kune free/open/libre collaboration platform </description> <name>kune</name> <url>http://kune.ourproject.org</url> - + <properties> + <gwtVersion>1.6.4</gwtVersion> + </properties> <dependencies> <!-- guice --> <dependency> @@ -30,23 +32,41 @@ <version>1.0</version> </dependency> - <!-- gwt --> + <!-- G WT deps (from central repo) --> <dependency> <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + <version>${gwtVersion}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> <artifactId>gwt-user</artifactId> - <version>1.5.3</version> + <version>${gwtVersion}</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.google.gwt</groupId> - <artifactId>gwt-incubator</artifactId> - <version>1.5</version> + <artifactId>gwt-dev</artifactId> + <version>${gwtVersion}</version> + <classifier>${platform}-libs</classifier> + <type>zip</type> + <scope>provided</scope> </dependency> <dependency> <groupId>com.google.gwt</groupId> - <artifactId>gwt-servlet</artifactId> - <version>1.5.3</version> + <artifactId>gwt-dev</artifactId> + <version>${gwtVersion}</version> + <classifier>${platform}</classifier> + <scope>provided</scope> </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-incubator</artifactId> + <version>march-02-2009</version> + <scope>provided</scope> + </dependency> + <!-- <dependency> <groupId>com.extjs</groupId> <artifactId>gxt</artifactId> <version>1.0-beta2</version> @@ -92,7 +112,7 @@ <dependency> <groupId>com.calclab</groupId> <artifactId>suco</artifactId> - <version>0.6.0</version> + <version>0.6.1</version> </dependency> <dependency> <groupId>jmagick</groupId> @@ -102,14 +122,14 @@ <dependency> <groupId>org.xwiki.platform</groupId> <artifactId>xwiki-web-gwt-dom</artifactId> - <version>1.9-SNAPSHOT</version> + <version>2.0-SNAPSHOT-mine</version> </dependency> <!-- xmpp --> <dependency> <groupId>com.calclab.emite</groupId> <artifactId>emite</artifactId> - <version>0.4.6.2</version> + <version>0.4.7</version> </dependency> <dependency> <groupId>org.jivesoftware.smack</groupId> @@ -255,6 +275,9 @@ <!-- <artifactId>jetty-maven-plugin</artifactId> <version>7.0.0.pre5</version> + <configuration> + <webAppSourceDirectory>war</webAppSourceDirectory> + </configuration> --> <scope>provided</scope> </dependency> @@ -444,18 +467,22 @@ <plugin> <groupId>com.totsp.gwt</groupId> <artifactId>maven-googlewebtoolkit2-plugin</artifactId> - <version>2.0-beta26</version> + <version>2.0-RC1</version> <configuration> <logLevel>INFO</logLevel> <style>OBF</style> <!-- <style>OBF PRETTY</style> --> - <runTarget> - org.ourproject.kune.app.Kune/Kune.html - </runTarget> + <!-- + <output>${project.build.directory}/gwt/www</output> + --> + <logLevel>INFO</logLevel> + <noServer>true</noServer> + <extraJvmArgs>-Xmx640m</extraJvmArgs> + <gwtVersion>${gwtVersion}</gwtVersion> + <output>war/</output> + <runTarget>ws/Kune.html</runTarget> <compileTargets> - <compileTarget> - org.ourproject.kune.app.Kune - </compileTarget> + <compileTarget>org.ourproject.kune.app.Kune</compileTarget> </compileTargets> <generatorRootClasses> <value>org.ourproject.kune.MyBean</value> @@ -484,7 +511,7 @@ <artifactId>maven-war-plugin</artifactId> <version>2.0</version> <configuration> - <webXml>target/web.xml</webXml> + <webXml>${project.build.directory}/WEB-INF/web.xml</webXml> </configuration> </plugin> <plugin> @@ -653,7 +680,50 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>2.2</version> + <configuration> + <filesets> + <fileset> + <directory>src/main/webapp/gwt/</directory> + <includes> + <include>**/org.ourproject.kune.app.Kune*</include> + <followSymlinks>false</followSymlinks> + </includes> + </fileset> + </filesets> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack</id> + <phase>compile</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <version>${gwtVersion}</version> + <classifier>${platform}-libs</classifier> + <type>zip</type> + <overWrite>false</overWrite> + <outputDirectory>${settings.localRepository}/com/google/gwt/gwt-dev/${gwtVersion}</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> </plugins> + <outputDirectory>${project.build.directory}/WEB-INF/classes</outputDirectory> + <testOutputDirectory>${project.build.directory}/WEB-INF/test-classes</testOutputDirectory> <resources> <resource> <directory>src/main/resources</directory> @@ -673,7 +743,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> - <version>2.2</version> + <version>2.4</version> <configuration> <linkXref>true</linkXref> <sourceEncoding>utf-8</sourceEncoding> @@ -695,7 +765,7 @@ net.sourceforge.cobertura.datafile </name> <value> - ${project.build.directory}/cobertura/cobertura.ser + ${project.reporting.directory}/cobertura/cobertura.ser </value> </property> </systemProperties> @@ -712,4 +782,63 @@ </plugin> </plugins> </reporting> + + <!-- profiles (with activation per platform) --> + <profiles> + <profile> + <id>gwt-dev-windows</id> + <properties> + <platform>windows</platform> + </properties> + <activation> + <activeByDefault>false</activeByDefault> + <os> + <family>windows</family> + </os> + </activation> + <!-- FIXME: put here a similar temp directory to linux/unix systems --> + <build> + <directory>target/</directory> + </build> + <reporting> + <outputDirectory>target/</outputDirectory> + </reporting> + </profile> + <profile> + <id>gwt-dev-mac</id> + <properties> + <platform>mac</platform> + </properties> + <activation> + <activeByDefault>false</activeByDefault> + <os> + <family>mac</family> + </os> + </activation> + <build> + <directory>/var/tmp/kune-target/</directory> + </build> + <reporting> + <outputDirectory>/var/tmp/kune-target/</outputDirectory> + </reporting> + </profile> + <profile> + <id>gwt-dev-linux</id> + <properties> + <platform>linux</platform> + </properties> + <activation> + <activeByDefault>true</activeByDefault> + <os> + <name>linux</name> + </os> + </activation> + <build> + <directory>/var/tmp/kune-target/</directory> + </build> + <reporting> + <outputDirectory>/var/tmp/kune-target/</outputDirectory> + </reporting> + </profile> + </profiles> </project> Modified: trunk/script/css-update.sh =================================================================== --- trunk/script/css-update.sh 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/script/css-update.sh 2009-06-08 02:40:16 UTC (rev 1117) @@ -1,16 +1,10 @@ #!/bin/bash APPPUB=src/main/java/org/ourproject/kune/app/public -WEBAPP=src/main/webapp/gwt/org.ourproject.kune.app.Kune -TARGET=target/kune-0.0.5/org.ourproject.kune.app.Kune +WEBAPP=src/main/webapp/gwt/ws -#$PWD/script/css-compact-and-tidy.sh +$PWD/script/css-compact-and-tidy.sh -rsync -aC $APPPUB/Kune.html $WEBAPP/Kune.html +rsync -aC $APPPUB/ws.html $WEBAPP/ws.html rsync -aC $APPPUB/js/ $WEBAPP/js rsync -aC $APPPUB/css/ $WEBAPP/css rsync -aC $APPPUB/images/ $WEBAPP/images - -rsync -aC $APPPUB/Kune.html $TARGET/Kune.html -rsync -aC $APPPUB/js/ $TARGET/js -rsync -aC $APPPUB/css/ $TARGET/css -rsync -aC $APPPUB/images/ $TARGET/images Modified: trunk/script/deploy_gwt.sh =================================================================== --- trunk/script/deploy_gwt.sh 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/script/deploy_gwt.sh 2009-06-08 02:40:16 UTC (rev 1117) @@ -1,12 +1,12 @@ #!/bin/bash -mkdir -p src/main/webapp/gwt/org.ourproject.kune.app.Kune +mkdir -p src/main/webapp/gwt/ws -find target/kune-0.0.5/org.ourproject.kune.app.Kune/ -name .DS_Store -exec rm {} \; +#find target/kune-0.0.5/org.ourproject.kune.app.Kune/ -name .DS_Store -exec rm {} \; -script/css-compact-and-tidy.sh +#script/css-compact-and-tidy.sh script/css-update.sh -cp target/kune-0.0.5/org.ourproject.kune.app.Kune/js/ext/ext-all-debug.js target/kune-0.0.5/org.ourproject.kune.app.Kune/js/ext/ext-all.js -rsync --delete -C -r -p target/kune-0.0.5/org.ourproject.kune.app.Kune/ src/main/webapp/gwt/org.ourproject.kune.app.Kune/ +#cp target/kune-0.0.5/org.ourproject.kune.app.Kune/js/ext/ext-all-debug.js target/kune-0.0.5/org.ourproject.kune.app.Kune/js/ext/ext-all.js +rsync --delete -C -r -p war/ws/ src/main/webapp/gwt/ws/ Modified: trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml 2009-06-08 02:40:16 UTC (rev 1117) @@ -1,5 +1,5 @@ <!DOCTYPE document SYSTEM "src/main/java/gwt-module.dtd"> -<module> +<module rename-to='ws'> <inherits name='com.google.gwt.i18n.I18N' /> <inherits name='com.google.gwt.user.User' /> Modified: trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -39,9 +39,6 @@ public class KuneEntryPoint implements EntryPoint { - public KuneEntryPoint() { - } - public void onModuleLoad() { Log.setUncaughtExceptionHandler(); Deleted: trunk/src/main/java/org/ourproject/kune/app/public/Kune.html =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/Kune.html 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/app/public/Kune.html 2009-06-08 02:40:16 UTC (rev 1117) @@ -1,148 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html> -<head> - -<meta http-equiv="content-type" content="text/html; charset=UTF-8" /> - -<!--<meta name="gwt:property" content="locale=en">--> - -<!-- -<link rel="stylesheet" type="text/css" href="css/reset.css"> -<link rel="stylesheet" type="text/css" href="css/fonts-min.css"> -<link rel="stylesheet" type="text/css" href="js/ext/resources/css/ext-all.css"/> -<link rel="stylesheet" type="text/css" href="js/ext/resources/css/xtheme-gray.css" /> - -<link rel="stylesheet" type="text/css" href="css/workspace.css"> -<link rel="stylesheet" type="text/css" href="css/chat.css"> -<link rel="stylesheet" type="text/css" href="css/docs.css"> ---> - -<link rel="shortcut icon" href="images/favicon.ico" /> -<title>Kune</title> -<style type="text/css"> -#kuneinitialcurtain { - position: absolute; - left: 0px; - top: 0px; - width: 100%; - height: 100%; - background-color: #FFF; - z-index: 9999; -} - -#kuneprogresspanel { - position: absolute; - top: 2px; - <!-- left: 2px; --> - z-index: 9998; -} - -.kune-Progress { - background: #E5FF80; - border: 1px solid #E5FF80; - white-space: nowrap; - height: 16px; - padding: 0 3px; -} - -#kuneprogresstext { - font-family: arial, helvetica, clean, sans-serif; - font-size-adjust: none; - font-style: normal; - font-variant: normal; - font-weight: normal; - line-height: 1.22; -} - -#kuneloading { - position: absolute; - left: 45%; - top: 40%; - padding: 0px; - z-index: 20001; - height: auto; - border: 1px solid #ccc; -} - -#kuneloading a { - color: #225588; -} - -#kuneloading .kuneloading-indicator { - background: white; - color: #444; - font: bold 13px tahoma, arial, helvetica; - padding: 5px 5px 10px 5px; - margin: 0; - height: auto; -} - -#kuneloading-msg { - font: normal 10px arial, tahoma, sans-serif; -} -</style> -<!--[if lt IE 7.]> -<script defer type="text/javascript" src="js/pngfix.js"></script> -<![endif]--> - -</head> -<body> -<script type="text/javascript" language="javascript" - src="org.ourproject.kune.app.Kune.nocache.js"></script> - -<!-- Ext localization javascript --> -<script type="text/javascript" id="extlocale"></script> -<script type="text/javascript"> - - // decode language passed in url - var locale = window.location.search - ? Ext.urlDecode(window.location.search.substring(1)).locale - : '' - ; - // append locale script to the head - var head = Ext.fly(document.getElementsByTagName('head')[0]); - if(locale) { - Ext.fly('extlocale').set({src:'js/ext/source/locale/ext-lang-' + locale + '.js'}); - } -</script> -<iframe id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe> -<iframe src="" id="__download" style="width: 0; height: 0; border: 0"></iframe> -<div id="kuneinitialcurtain"></div> -<div class="" id="kuneprogresspanel" style=""> -<table cellspacing="0" cellpadding="0" border="0" - style="margin-top: 5px; margin-left: 5px;" - summary="Starting"> - <tbody> - <tr> - <td height="16" align="left" class="kune-Progress" - style="vertical-align: top;"><img - style="height: 16px; width: 16px;" - src="images/spin-kune-thund-green.gif" alt="progress spin" /></td> - <td align="left" class="kune-Progress" style="vertical-align: top;"> - <div id="kuneprogresstext" class="gwt-Label">Loading</div> - </td> - <td height="16" width="100%" align="left" - style="vertical-align: top;" /> - </tr> - </tbody> -</table> -</div> -<div id="kuneloading"> - <div class="kuneloading-indicator"> - <img src="images/kune-anim.gif" width="35" height="35" alt="kune-loading" - style="margin-right:3px;float:left;vertical-align:top;"/>kune         <br/> - <span id="kuneloading-msg">Starting...</span></div> -</div> - -<!--include the Ext CSS, and use the gray theme--> - -<script type="text/javascript">document.getElementById('kuneloading-msg').innerHTML = 'Loading ...';</script> - -<!--include the application JS--> -<script type="text/javascript">document.getElementById('kuneloading-msg').innerHTML = 'Starting...';</script> - -<!--hide loading message--> -<!-- <script type="text/javascript">Ext.get('loading').fadeOut({remove: true, duration:4});</script> --> - -</body> -</html> Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/all.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2009-06-08 02:40:16 UTC (rev 1117) @@ -41,4 +41,4 @@ padding: 1px 0px 1px 1px; text-decoration:none; } -*/.x-tree-node .k-ctn-status-normal a span{}.x-tree-node .k-ctn-status-deleted a span{text-decoration:line-through;color:gray;}.x-tree-node .k-ctn-status-rejected a span{text-decoration:line-through;/* color: #FF6633; */color:#F30;}.x-tree-node .k-ctn-status-editing a span{font-style:italic;color:gray;}.x-tree-node .k-ctn-status-submitted a span{color:green;}.k-info-links{text-decoration:underline;color:gray;cursor:pointer;}.x-tool-kmenu{background-position:0 -75px;}.x-tool-kmenu-over{background-position:-15px -75px;}.k-border-openbox{border-bottom:1px #D0D0D0 solid;border-right:1px #D0D0D0 solid;border-left:1px #D0D0D0 solid;}/* SiteToastMessages */.k-stm-info-icon{background-image:url(img/info.gif)!important;}.k-stm-imp-icon{background-image:url(img/alert.gif)!important;}.k-stm-verimp-icon{background-image:url(img/important.gif)!important;}.k-stm-error-icon{background-image:url(img/error.gif)!important;}.k-error-tb{background:#FFB380 none repeat scroll 0 50%;color:#250;}.k-infod-head{font-size:108%;margin-bottom:10px;}.gwt-DisclosurePanel{}.gwt-DisclosurePanel-open{}.gwt-DisclosurePanel-closed{}.gwt-DisclosurePanel .header,.gwt-DisclosurePanel .header a,.gwt-DisclosurePanel .header td{text-decoration:none;/* Remove underline from header */color:#000;cursor:pointer;cursor:hand;}.gwt-DisclosurePanel .content{border-left:3px solid #e8eef7;padding:4px 0 4px 8px;margin-left:6px;}.k-basic-thumb{background:#FAFAFA none repeat scroll 0 50%;border:1px solid #EBEBEB;padding:3px;margin:3px;}.k-basic-thumb td{padding:2px 3px;border:none;}.k-text-gray{color:gray;}.k-elp-limg{margin-top:4px;margin-left:5px;cursor:pointer;overflow:hidden;}.k-tsp-tag{float:left;padding:3px;cursor:pointer;color:#00F;}.k-tsp-cloud{line-height:1.5em;text-align:center;}.k-link-icon{background-image:url(img/link.gif)!important;}.k-options-icon{background-image:url(img/emblem-system.gif)!important;}.k-copyleft-icon{background-image:url(img/copyleft.png)!important;}.k-picture-icon{background-image:url(img/picture.png)!important;}.k-film-icon{background-image:url(img/film.png)!important;}.k-specialchars-icon{background-image:url(img/specialchars.png)!important;}.k-info-icon{background-image:url(img/info.gif)!important;}.k-newgroup-icon{background-image:url(img/kune-icon16.png)!important;}.k-colors-icon{background-image:url(img/colors.gif)!important;}.x-toolbar-body table{/* width: 100%; */}.k-preview-msg{background:#FCA;}.k-preview-msg-lab{background:#FCA;padding:0 5px;}.k-eil-edit{border:thin solid #000;}/* duplicated in rte.css */.k-rte-comment{border:1px dashed silver;line-height:1.4;padding:1px;background-color:#D7FFD7;}.k-specialchar-grid{border:1px solid #ACA899;}.k-specialchar-grid table{}.k-specialchar-grid div{line-height:22px;}.k-specialchar-grid td{padding:1px;}.k-specialchar-pb{border:1px solid #EBE8D7;cursor:pointer;font-size:108%!important;text-align:center;vertical-align:middle;width:18px;height:18px;}.k-specialchar-pb-up{}.k-specialchar-big{padding:3px;line-height:22px;font-size:153.899994%!important;}.k-specialchar-adv-label{margin-left:-10px;}.k-specialchar-popup,{border:1px px solid silver;z-index:9999!important;background-color:#FFF;}.k-specialchar-pb-down{color:#161616;}.k-specialchar-pb-up-hovering{border:thin solid #ACA899;}.k-specialchar-pb-down-hovering{color:#161616;}.k-preview-panel{border:dashed 1px gray;padding:5px;}.k-rte-changelink{white-space:nowrap;color:navy;cursor:pointer;text-decoration:underline;margin:5px;}.k-rte-changelink-popup{border:1px solid silver;z-index:9999!important;background-color:#ECECEC;}.e-ui-room{height:27px;line-height:22px;}.e-ui-room input{font-size:100%;margin-left:0;margin-top:0;} \ No newline at end of file +*/.x-tree-node .k-ctn-status-normal a span{}.x-tree-node .k-ctn-status-deleted a span{text-decoration:line-through;color:gray;}.x-tree-node .k-ctn-status-rejected a span{text-decoration:line-through;/* color: #FF6633; */color:#F30;}.x-tree-node .k-ctn-status-editing a span{font-style:italic;color:gray;}.x-tree-node .k-ctn-status-submitted a span{color:green;}.k-info-links{text-decoration:underline;color:gray;cursor:pointer;}.x-tool-kmenu{background-position:0 -75px;}.x-tool-kmenu-over{background-position:-15px -75px;}.k-border-openbox{border-bottom:1px #D0D0D0 solid;border-right:1px #D0D0D0 solid;border-left:1px #D0D0D0 solid;}/* SiteToastMessages */.k-stm-info-icon{background-image:url(img/info.gif)!important;}.k-stm-imp-icon{background-image:url(img/alert.gif)!important;}.k-stm-verimp-icon{background-image:url(img/important.gif)!important;}.k-stm-error-icon{background-image:url(img/error.gif)!important;}.k-error-tb{background:#FFB380 none repeat scroll 0 50%;color:#250;}.k-infod-head{font-size:108%;margin-bottom:10px;}.gwt-DisclosurePanel{}.gwt-DisclosurePanel-open{}.gwt-DisclosurePanel-closed{}.gwt-DisclosurePanel .header,.gwt-DisclosurePanel .header a,.gwt-DisclosurePanel .header td{text-decoration:none;/* Remove underline from header */color:#000;cursor:pointer;cursor:hand;}.gwt-DisclosurePanel .content{border-left:3px solid #e8eef7;padding:4px 0 4px 8px;margin-left:6px;}.k-basic-thumb{background:#FAFAFA none repeat scroll 0 50%;border:1px solid #EBEBEB;padding:3px;margin:3px;}.k-basic-thumb td{padding:2px 3px;border:none;}.k-text-gray{color:gray;}.k-elp-limg{margin-top:4px;margin-left:5px;cursor:pointer;overflow:hidden;}.k-tsp-tag{float:left;padding:3px;cursor:pointer;color:#00F;}.k-tsp-cloud{line-height:1.5em;text-align:center;}.k-link-icon{background-image:url(img/link.gif)!important;}.k-options-icon{background-image:url(img/emblem-system.gif)!important;}.k-copyleft-icon{background-image:url(img/copyleft.png)!important;}.k-picture-icon{background-image:url(img/picture.png)!important;}.k-film-icon{background-image:url(img/film.png)!important;}.k-specialchars-icon{background-image:url(img/specialchars.png)!important;}.k-info-icon{background-image:url(img/info.gif)!important;}.k-newgroup-icon{background-image:url(img/kune-icon16.png)!important;}.k-colors-icon{background-image:url(img/colors.gif)!important;}.x-toolbar-body table{/* width: 100%; */}.k-preview-msg{background:#FCA;}.k-preview-msg-lab{background:#FCA;padding:0 5px;}.k-eil-edit{border:thin solid #000;}/* duplicated in rte.css */.k-rte-comment{border:1px dashed silver;line-height:1.4;padding:1px;background-color:#D7FFD7;}.k-specialchar-grid{border:1px solid #ACA899;}.k-specialchar-grid table{}.k-specialchar-grid div{line-height:22px;}.k-specialchar-grid td{padding:1px;}.k-specialchar-pb{border:1px solid #EBE8D7;cursor:pointer;font-size:108%!important;text-align:center;vertical-align:middle;width:18px;height:18px;}.k-specialchar-pb-up{}.k-specialchar-big{padding:3px;line-height:22px;font-size:197%!important;}.k-specialchar-adv-label{margin-left:-10px;}.k-specialchar-popup,{border:1px px solid silver;z-index:9999!important;background-color:#FFF;}.k-specialchar-pb-down{color:#161616;}.k-specialchar-pb-up-hovering{border:thin solid #ACA899;}.k-specialchar-pb-down-hovering{color:#161616;}.k-preview-panel{border:dashed 1px gray;padding:5px;}.k-rte-changelink{white-space:nowrap;color:navy;cursor:pointer;text-decoration:underline;margin:5px;}.k-rte-changelink-popup{border:1px solid silver;z-index:9999!important;background-color:#ECECEC;}.e-ui-room{height:27px;line-height:22px;}.e-ui-room input{font-size:100%;margin-left:0;margin-top:0;}.k-def-popup{z-index:9999!important;background-color:#FFF;border:1px solid gray;} \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2009-06-08 02:40:16 UTC (rev 1117) @@ -920,7 +920,7 @@ .k-specialchar-big { padding: 3px; line-height: 22px; - font-size: 153.9% !important; + font-size: 197% !important; } .k-specialchar-adv-label { Copied: trunk/src/main/java/org/ourproject/kune/app/public/ws.html (from rev 1113, trunk/src/main/java/org/ourproject/kune/app/public/Kune.html) =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/Kune.html 2009-05-24 18:56:49 UTC (rev 1113) +++ trunk/src/main/java/org/ourproject/kune/app/public/ws.html 2009-06-08 02:40:16 UTC (rev 1117) @@ -0,0 +1,148 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> + +<meta http-equiv="content-type" content="text/html; charset=UTF-8" /> + +<!--<meta name="gwt:property" content="locale=en">--> + +<!-- +<link rel="stylesheet" type="text/css" href="css/reset.css"> +<link rel="stylesheet" type="text/css" href="css/fonts-min.css"> +<link rel="stylesheet" type="text/css" href="js/ext/resources/css/ext-all.css"/> +<link rel="stylesheet" type="text/css" href="js/ext/resources/css/xtheme-gray.css" /> + +<link rel="stylesheet" type="text/css" href="css/workspace.css"> +<link rel="stylesheet" type="text/css" href="css/chat.css"> +<link rel="stylesheet" type="text/css" href="css/docs.css"> +--> + +<link rel="shortcut icon" href="images/favicon.ico" /> +<title>Kune</title> +<style type="text/css"> +#kuneinitialcurtain { + position: absolute; + left: 0px; + top: 0px; + width: 100%; + height: 100%; + background-color: #FFF; + z-index: 9999; +} + +#kuneprogresspanel { + position: absolute; + top: 2px; + <!-- left: 2px; --> + z-index: 9998; +} + +.kune-Progress { + background: #E5FF80; + border: 1px solid #E5FF80; + white-space: nowrap; + height: 16px; + padding: 0 3px; +} + +#kuneprogresstext { + font-family: arial, helvetica, clean, sans-serif; + font-size-adjust: none; + font-style: normal; + font-variant: normal; + font-weight: normal; + line-height: 1.22; +} + +#kuneloading { + position: absolute; + left: 45%; + top: 40%; + padding: 0px; + z-index: 20001; + height: auto; + border: 1px solid #ccc; +} + +#kuneloading a { + color: #225588; +} + +#kuneloading .kuneloading-indicator { + background: white; + color: #444; + font: bold 13px tahoma, arial, helvetica; + padding: 5px 5px 10px 5px; + margin: 0; + height: auto; +} + +#kuneloading-msg { + font: normal 10px arial, tahoma, sans-serif; +} +</style> +<!--[if lt IE 7.]> +<script defer type="text/javascript" src="js/pngfix.js"></script> +<![endif]--> + +</head> +<body> +<script type="text/javascript" language="javascript" + src="/ws/ws.nocache.js"></script> + +<!-- Ext localization javascript --> +<script type="text/javascript" id="extlocale"></script> +<script type="text/javascript"> + + // decode language passed in url + var locale = window.location.search + ? Ext.urlDecode(window.location.search.substring(1)).locale + : '' + ; + // append locale script to the head + var head = Ext.fly(document.getElementsByTagName('head')[0]); + if(locale) { + Ext.fly('extlocale').set({src:'js/ext/source/locale/ext-lang-' + locale + '.js'}); + } +</script> +<iframe id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe> +<iframe src="" id="__download" style="width: 0; height: 0; border: 0"></iframe> +<div id="kuneinitialcurtain"></div> +<div class="" id="kuneprogresspanel" style=""> +<table cellspacing="0" cellpadding="0" border="0" + style="margin-top: 5px; margin-left: 5px;" + summary="Starting"> + <tbody> + <tr> + <td height="16" align="left" class="kune-Progress" + style="vertical-align: top;"><img + style="height: 16px; width: 16px;" + src="images/spin-kune-thund-green.gif" alt="progress spin" /></td> + <td align="left" class="kune-Progress" style="vertical-align: top;"> + <div id="kuneprogresstext" class="gwt-Label">Loading</div> + </td> + <td height="16" width="100%" align="left" + style="vertical-align: top;" /> + </tr> + </tbody> +</table> +</div> +<div id="kuneloading"> + <div class="kuneloading-indicator"> + <img src="images/kune-anim.gif" width="35" height="35" alt="kune-loading" + style="margin-right:3px;float:left;vertical-align:top;"/>kune         <br/> + <span id="kuneloading-msg">Starting...</span></div> +</div> + +<!--include the Ext CSS, and use the gray theme--> + +<script type="text/javascript">document.getElementById('kuneloading-msg').innerHTML = 'Loading ...';</script> + +<!--include the application JS--> +<script type="text/javascript">document.getElementById('kuneloading-msg').innerHTML = 'Starting...';</script> + +<!--hide loading message--> +<!-- <script type="text/javascript">Ext.get('loading').fadeOut({remove: true, duration:4});</script> --> + +</body> +</html> Modified: trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -100,7 +100,7 @@ builder.at("^/ws").install(new RedirectFilter("/ws/")); builder.at("^/ws/$").install(new ListenerFilter(KuneApplicationListener.class), - new ForwardFilter("/gwt/org.ourproject.kune.app.Kune/Kune.html")); + new ForwardFilter("/gwt/ws/ws.html")); builder.installGWTServices("^/ws/", SiteService.class, GroupService.class, ContentService.class, UserService.class, SocialNetworkService.class, I18nService.class); @@ -109,7 +109,7 @@ builder.installServlet("^/ws/servlets/", FileUploadManager.class, FileDownloadManager.class, EntityLogoUploadManager.class, EntityLogoDownloadManager.class); - builder.at("^/ws/(.*)$").install(new ForwardFilter("^/ws/(.*)$", "/gwt/org.ourproject.kune.app.Kune/{0}")); + builder.at("^/ws/(.*)$").install(new ForwardFilter("^/ws/(.*)$", "/gwt/ws/{0}")); } private void installGuiceModules(final RackBuilder builder) { Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -27,11 +27,11 @@ import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.DeferredCommand; -import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gwt.user.client.ui.Widget; public class GalleryFolderContentPanel extends FoldableContentPanel implements GalleryFolderContentView { @@ -40,8 +40,8 @@ private final StateManager stateManager; private final Session session; - public GalleryFolderContentPanel(WorkspaceSkeleton ws, I18nTranslationService i18n, StateManager stateManager, - Session session) { + public GalleryFolderContentPanel(final WorkspaceSkeleton ws, final I18nTranslationService i18n, + final StateManager stateManager, final Session session) { super(ws, i18n); this.stateManager = stateManager; this.session = session; @@ -50,9 +50,9 @@ public void addThumb(final StateToken token, final String title, final String imgUrl) { DeferredCommand.addCommand(new Command() { public void execute() { - BasicThumb thumb = new BasicThumb(imgUrl, session.getImgCropsize(), title, TEXT_MAX_LENGHT, true, - new ClickListener() { - public void onClick(Widget sender) { + final BasicThumb thumb = new BasicThumb(imgUrl, session.getImgCropsize(), title, TEXT_MAX_LENGHT, true, + new ClickHandler() { + public void onClick(final ClickEvent event) { stateManager.gotoToken(token); } }); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/KeyStroke.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/KeyStroke.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/KeyStroke.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -42,10 +42,11 @@ import org.ourproject.kune.platf.client.i18n.Resources; import org.ourproject.kune.platf.client.shortcuts.Keyboard; +import com.google.gwt.dom.client.NativeEvent; +import com.google.gwt.event.dom.client.KeyCodes; +import com.google.gwt.event.dom.client.KeyEvent; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Event; -import com.google.gwt.user.client.ui.KeyboardListener; -import com.google.gwt.user.client.ui.KeyboardListenerCollection; /** * This class mirrors KeyEvents, representing both low-level key presses and key @@ -89,6 +90,11 @@ private static final int VK_UNDEFINED = 0; private static final char CHAR_UNDEFINED = '\uffff'; + public static int getKeyboardModifiers(final NativeEvent event) { + return (event.getShiftKey() ? Keyboard.MODIFIER_SHIFT : 0) | (event.getMetaKey() ? Keyboard.MODIFIER_META : 0) + | (event.getCtrlKey() ? Keyboard.MODIFIER_CTRL : 0) | (event.getAltKey() ? Keyboard.MODIFIER_ALT : 0); + } + /** * Returns a keystroke representing a typed character. * @@ -171,14 +177,11 @@ public static KeyStroke getKeyStrokeForEvent(final Event event) { switch (DOM.eventGetType(event)) { case Event.ONKEYDOWN: - return getKeyStroke((char) event.getKeyCode(), VK_UNDEFINED, - KeyboardListenerCollection.getKeyboardModifiers(event), false); + return getKeyStroke((char) event.getKeyCode(), VK_UNDEFINED, getKeyboardModifiers(event), false); case Event.ONKEYPRESS: - return getKeyStroke(CHAR_UNDEFINED, event.getKeyCode(), - KeyboardListenerCollection.getKeyboardModifiers(event), false); + return getKeyStroke(CHAR_UNDEFINED, event.getKeyCode(), getKeyboardModifiers(event), false); case Event.ONKEYUP: - return getKeyStroke(CHAR_UNDEFINED, event.getKeyCode(), - KeyboardListenerCollection.getKeyboardModifiers(event), true); + return getKeyStroke(CHAR_UNDEFINED, event.getKeyCode(), getKeyboardModifiers(event), true); default: return null; } @@ -207,7 +210,7 @@ } stroke = new KeyStroke(keyChar, keyCode, modifiers, release); // Check level 1 cache. - KeyStroke cached = CACHE.get(stroke); + final KeyStroke cached = CACHE.get(stroke); if (cached == null) { CACHE.put(stroke, stroke); } else { @@ -304,7 +307,7 @@ if (!(o instanceof KeyStroke)) { return false; } - KeyStroke s = (KeyStroke) o; + final KeyStroke s = (KeyStroke) o; return this == o || (keyChar == s.keyChar && keyCode == s.keyCode && modifiers == s.modifiers && onKeyRelease == s.onKeyRelease); } @@ -344,31 +347,31 @@ @SuppressWarnings("deprecation") public String getKeyText(final int keyCode) { switch (keyCode) { - case KeyboardListener.KEY_BACKSPACE: + case KeyCodes.KEY_BACKSPACE: return translateKey("Backspace"); - // case KeyboardListener.KEY_DELETE: + // case KeyCodes.KEY_DELETE: // return translateKey("Delete"); - case KeyboardListener.KEY_DOWN: + case KeyCodes.KEY_DOWN: return translateKey("Down"); - case KeyboardListener.KEY_END: + case KeyCodes.KEY_END: return translateKey("End"); - case KeyboardListener.KEY_ENTER: + case KeyCodes.KEY_ENTER: return translateKey("Enter"); - case KeyboardListener.KEY_ESCAPE: + case KeyCodes.KEY_ESCAPE: return translateKey("Escape"); - case KeyboardListener.KEY_HOME: + case KeyCodes.KEY_HOME: return translateKey("Home"); - case KeyboardListener.KEY_LEFT: + case KeyCodes.KEY_LEFT: return translateKey("Left"); - case KeyboardListener.KEY_PAGEDOWN: + case KeyCodes.KEY_PAGEDOWN: return translateKey("Page Down"); - case KeyboardListener.KEY_PAGEUP: + case KeyCodes.KEY_PAGEUP: return translateKey("Page Up"); - case KeyboardListener.KEY_RIGHT: + case KeyCodes.KEY_RIGHT: return translateKey("Right"); - case KeyboardListener.KEY_TAB: + case KeyCodes.KEY_TAB: return translateKey("Tab"); - case KeyboardListener.KEY_UP: + case KeyCodes.KEY_UP: return translateKey("Up"); case Keyboard.KEY_F1: case Keyboard.KEY_F2: @@ -472,16 +475,16 @@ @Override public String toString() { String s = " ("; - if ((modifiers & KeyboardListener.MODIFIER_META) != 0) { + if ((modifiers & Keyboard.MODIFIER_META) != 0) { s += translateKey("Meta") + "+"; } - if ((modifiers & KeyboardListener.MODIFIER_CTRL) != 0) { + if ((modifiers & Keyboard.MODIFIER_CTRL) != 0) { s += translateKey("Ctrl") + "+"; } - if ((modifiers & KeyboardListener.MODIFIER_ALT) != 0) { + if ((modifiers & Keyboard.MODIFIER_ALT) != 0) { s += translateKey("Alt") + "+"; } - if ((modifiers & KeyboardListener.MODIFIER_SHIFT) != 0) { + if ((modifiers & Keyboard.MODIFIER_SHIFT) != 0) { s += translateKey("Shift") + "+"; } if ((modifiers & Event.BUTTON_LEFT) != 0) { @@ -503,7 +506,7 @@ * @return a cached replacement if something goes wrong */ protected Object readResolve() { - KeyStroke s = CACHE.get(this); + final KeyStroke s = CACHE.get(this); if (s != null) { return s; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractButtonGui.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractButtonGui.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractButtonGui.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -12,7 +12,7 @@ public abstract class AbstractButtonGui extends AbstractGuiItem { - private transient final Button button; + private final Button button; public AbstractButtonGui(final ButtonDescriptor buttonDescriptor) { this(buttonDescriptor, false); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractComplexGuiItem.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractComplexGuiItem.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractComplexGuiItem.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -10,11 +10,11 @@ public abstract class AbstractComplexGuiItem extends Composite { - private transient GuiActionCollection guiItems; - private transient InputMap inputMap; + private GuiActionCollection guiItems; + private InputMap inputMap; public void add(final AbstractGuiActionDescrip... descriptors) { - for (AbstractGuiActionDescrip descriptor : descriptors) { + for (final AbstractGuiActionDescrip descriptor : descriptors) { getGuiItems().add(descriptor); } } @@ -23,6 +23,10 @@ getInputMap().put(key, action); } + public void addAll(final GuiActionCollection actions) { + getGuiItems().addAll(actions); + } + public void addAll(final List<AbstractGuiActionDescrip> descriptors) { getGuiItems().addAll(descriptors); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractGuiActionDescrip.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractGuiActionDescrip.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractGuiActionDescrip.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -19,10 +19,10 @@ private GuiVisibleCondition visibleCondition = new GuiVisibleConditionAdapter(); protected AbstractGuiActionDescrip parent; - private transient final Map<String, Object> store; + private final Map<String, Object> store; /** The action. */ - protected transient AbstractAction action; + protected AbstractAction action; /** The position where the item will be inserted. */ private int position; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractGuiItem.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractGuiItem.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractGuiItem.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -10,12 +10,12 @@ public abstract class AbstractGuiItem extends Composite implements View { - protected transient Action action; + protected Action action; /** * Listener the button uses to receive PropertyChangeEvents from its Action. */ - protected transient PropertyChangeListener changeListener; + protected PropertyChangeListener changeListener; public void setAction(final Action newaction) { if (action != null) { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractMenuGui.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractMenuGui.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractMenuGui.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -5,7 +5,7 @@ public abstract class AbstractMenuGui extends AbstractGuiItem { - protected final transient Menu menu; + protected final Menu menu; public AbstractMenuGui() { super(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractMenuItemGui.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractMenuItemGui.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractMenuItemGui.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -18,7 +18,7 @@ public abstract class AbstractMenuItemGui extends AbstractGuiItem { - private transient Item item; + private Item item; public AbstractMenuItemGui(final MenuItemDescriptor descriptor) { super(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ComplexToolbar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ComplexToolbar.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ComplexToolbar.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -6,8 +6,8 @@ public class ComplexToolbar extends AbstractComplexGuiItem { - private final transient SimpleToolbar toolbar; - private final transient GuiBindingsRegister bindings; + private final SimpleToolbar toolbar; + private final GuiBindingsRegister bindings; public ComplexToolbar(final GuiBindingsRegister bindings) { super(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/GuiBindingsRegister.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/GuiBindingsRegister.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/GuiBindingsRegister.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -5,7 +5,7 @@ public class GuiBindingsRegister { - private transient final Map<Class<?>, GuiBinding> map; + private final Map<Class<?>, GuiBinding> map; public GuiBindingsRegister() { map = new HashMap<Class<?>, GuiBinding>(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuBinding.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuBinding.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuBinding.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -6,7 +6,7 @@ public static final String UI_MENU = "UI_MENU"; - private transient Boolean isSubmenu; + private Boolean isSubmenu; @Override public AbstractGuiItem create(final AbstractGuiActionDescrip descriptor) { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuCheckItemDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuCheckItemDescriptor.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuCheckItemDescriptor.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -5,7 +5,7 @@ public class MenuCheckItemDescriptor extends MenuItemDescriptor { private static final String CHECKED = "checked"; - private transient boolean checked = false; + private boolean checked = false; public MenuCheckItemDescriptor(final MenuDescriptor parent, final AbstractAction action) { super(parent, action); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuGui.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuGui.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuGui.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -7,7 +7,7 @@ public class MenuGui extends AbstractMenuGui { - private transient final ToolbarButton button; + private final ToolbarButton button; public MenuGui(final AbstractGuiActionDescrip descriptor) { super(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuRadioItemDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuRadioItemDescriptor.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuRadioItemDescriptor.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -4,7 +4,7 @@ public class MenuRadioItemDescriptor extends MenuCheckItemDescriptor { - private transient final String group; + private final String group; public MenuRadioItemDescriptor(final MenuDescriptor parent, final AbstractAction action, final String group) { super(parent, action); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/PushButtonDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/PushButtonDescriptor.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/PushButtonDescriptor.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -6,7 +6,7 @@ public static final String PUSHED = "pushed"; - protected transient boolean pushed = false; + protected boolean pushed = false; public PushButtonDescriptor(final AbstractAction action) { super(action); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/SubMenuGui.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/SubMenuGui.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/SubMenuGui.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -7,7 +7,7 @@ public class SubMenuGui extends AbstractMenuGui { - private transient final MenuItem item; + private final MenuItem item; public SubMenuGui(final AbstractGuiActionDescrip descriptor) { super(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ToolbarSeparatorDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ToolbarSeparatorDescriptor.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ToolbarSeparatorDescriptor.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -7,7 +7,7 @@ spacer, separator, fill } - private transient final Type type; + private final Type type; public ToolbarSeparatorDescriptor(final Type type) { super(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -33,40 +33,37 @@ import com.google.gwt.user.client.DeferredCommand; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.Window; -import com.google.gwt.user.client.WindowCloseListener; +import com.google.gwt.user.client.Window.ClosingEvent; +import com.google.gwt.user.client.Window.ClosingHandler; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.RootPanel; public class ApplicationDefault implements Application { private final Session session; - private final Event0 onApplicationStart; - private final Event0 onApplicationStop; + private final Event0 onAppStart; + private final Event0 onAppStop; public ApplicationDefault(final Session session) { this.session = session; - this.onApplicationStart = new Event0("onApplicationStart"); - this.onApplicationStop = new Event0("onApplicationStop"); - Window.addWindowCloseListener(new WindowCloseListener() { - public void onWindowClosed() { - } - - public String onWindowClosing() { + this.onAppStart = new Event0("onApplicationStart"); + this.onAppStop = new Event0("onApplicationStop"); + Window.addWindowClosingHandler(new ClosingHandler() { + public void onWindowClosing(final ClosingEvent event) { stop(); - return null; } }); } public void onApplicationStart(final Listener0 listener) { - onApplicationStart.add(listener); + onAppStart.add(listener); } public void onApplicationStop(final Listener0 listener) { - onApplicationStop.add(listener); + onAppStop.add(listener); } public void start() { - onApplicationStart.fire(); + onAppStart.fire(); PrefetchUtilities.preFetchImpImages(); getInitData(); final Timer prefetchTimer = new Timer() { @@ -102,6 +99,6 @@ } private void stop() { - onApplicationStop.fire(); + onAppStop.fire(); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessRightsDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessRightsDTO.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessRightsDTO.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -25,7 +25,6 @@ private boolean administrable; private boolean editable; private boolean visible; - private static final int PRIME = 31; public AccessRightsDTO() { this(false, false, false); @@ -48,7 +47,7 @@ if (getClass() != obj.getClass()) { return false; } - AccessRightsDTO other = (AccessRightsDTO) obj; + final AccessRightsDTO other = (AccessRightsDTO) obj; if (administrable != other.administrable) { return false; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -173,7 +173,7 @@ public StateManager create() { final StateManagerDefault stateManager = new StateManagerDefault($(ContentProvider.class), $(Session.class), $(HistoryWrapper.class)); - History.addHistoryListener(stateManager); + History.addValueChangeHandler(stateManager); return stateManager; } }); @@ -560,7 +560,7 @@ }); - $(TestButton.class); + // $(TestButton.class); $(ApplicationComponentGroup.class).createAll(); $(ToolGroup.class).createAll(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/GlobalShortcutRegister.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/GlobalShortcutRegister.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/GlobalShortcutRegister.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -3,35 +3,44 @@ import org.ourproject.kune.platf.client.actions.ActionItem; import org.ourproject.kune.platf.client.actions.ActionManager; -import com.google.gwt.user.client.DOM; +import com.google.gwt.dom.client.NativeEvent; +import com.google.gwt.event.dom.client.KeyDownEvent; +import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.Event; -import com.google.gwt.user.client.EventPreview; +import com.google.gwt.user.client.Event.NativePreviewEvent; +import com.google.gwt.user.client.Event.NativePreviewHandler; public class GlobalShortcutRegister extends ShortcutRegister { - private final EventPreview eventPreview; + private final NativePreviewHandler eventHandler; + private HandlerRegistration handlerReg; public GlobalShortcutRegister(final ActionManager actionManager) { - eventPreview = new EventPreview() { + super(); + eventHandler = new NativePreviewHandler() { @SuppressWarnings("unchecked") - public boolean onEventPreview(Event event) { - ActionItem actionItem = get(event); - if (actionItem != null) { - // Log.debug("Not propagating event"); - DOM.eventPreventDefault(event); - actionManager.doAction(actionItem); - return false; + public void onPreviewNativeEvent(final NativePreviewEvent nativeEventPrev) { + final NativeEvent event = nativeEventPrev.getNativeEvent(); + if (nativeEventPrev.getAssociatedType().equals(KeyDownEvent.getType())) { + final ActionItem actionItem = get(event); + if (actionItem != null) { + // Log.debug("Not propagating event"); + event.stopPropagation(); + actionManager.doAction(actionItem); + nativeEventPrev.cancel(); + } } - return true; } }; } public void disable() { - DOM.removeEventPreview(eventPreview); + if (handlerReg != null) { + handlerReg.removeHandler(); + } } public void enable() { - DOM.addEventPreview(eventPreview); + handlerReg = Event.addNativePreviewHandler(eventHandler); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/Keyboard.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/Keyboard.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/Keyboard.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -2,6 +2,11 @@ public final class Keyboard { + public final static int MODIFIER_SHIFT = 1; + public final static int MODIFIER_CTRL = 2; + public final static int MODIFIER_ALT = 4; + public final static int MODIFIER_META = 8; + @Deprecated public final static int KEY_F1 = 112; /* Browser's help */ public final static int KEY_F2 = 113; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/ShortcutDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/ShortcutDescriptor.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/ShortcutDescriptor.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -2,8 +2,6 @@ import org.ourproject.kune.platf.client.i18n.Resources; -import com.google.gwt.user.client.ui.KeyboardListener; - public class ShortcutDescriptor { private static final String NO_KEYNAME = "nokeyname"; @@ -52,13 +50,13 @@ } public ShortcutDescriptor(final int keycode, final int modifiers) { - this(has(modifiers, KeyboardListener.MODIFIER_CTRL), has(modifiers, KeyboardListener.MODIFIER_ALT), has( - modifiers, KeyboardListener.MODIFIER_SHIFT), keycode, NO_KEYNAME); + this(has(modifiers, Keyboard.MODIFIER_CTRL), has(modifiers, Keyboard.MODIFIER_ALT), has(modifiers, + Keyboard.MODIFIER_SHIFT), keycode, NO_KEYNAME); } public ShortcutDescriptor(final int keycode, final int modifiers, final String keyName) { - this(has(modifiers, KeyboardListener.MODIFIER_CTRL), has(modifiers, KeyboardListener.MODIFIER_ALT), has( - modifiers, KeyboardListener.MODIFIER_SHIFT), keycode, keyName); + this(has(modifiers, Keyboard.MODIFIER_CTRL), has(modifiers, Keyboard.MODIFIER_ALT), has(modifiers, + Keyboard.MODIFIER_SHIFT), keycode, keyName); } @Override @@ -72,7 +70,7 @@ if (getClass() != obj.getClass()) { return false; } - ShortcutDescriptor other = (ShortcutDescriptor) obj; + final ShortcutDescriptor other = (ShortcutDescriptor) obj; if (alt != other.alt) { return false; } @@ -100,9 +98,8 @@ } public boolean is(final char keyCode, final int modifiers) { - return (this.keycode == keyCode && same(modifiers, KeyboardListener.MODIFIER_ALT, alt) - && same(modifiers, KeyboardListener.MODIFIER_CTRL, ctrl) && same(modifiers, - KeyboardListener.MODIFIER_SHIFT, shift)); + return (this.keycode == keyCode && same(modifiers, Keyboard.MODIFIER_ALT, alt) + && same(modifiers, Keyboard.MODIFIER_CTRL, ctrl) && same(modifiers, Keyboard.MODIFIER_SHIFT, shift)); } public boolean same(final int modifiers, final int modifier, final boolean keyValue) { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/ShortcutRegister.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/ShortcutRegister.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/ShortcutRegister.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -4,12 +4,12 @@ import org.ourproject.kune.platf.client.actions.ActionDescriptor; import org.ourproject.kune.platf.client.actions.ActionItem; +import org.ourproject.kune.platf.client.actions.KeyStroke; import org.ourproject.kune.platf.client.dto.AccessRolDTO; import com.allen_sauer.gwt.log.client.Log; import com.calclab.suco.client.events.Listener0; -import com.google.gwt.user.client.Event; -import com.google.gwt.user.client.ui.KeyboardListenerCollection; +import com.google.gwt.dom.client.NativeEvent; public class ShortcutRegister { @@ -22,21 +22,19 @@ } @SuppressWarnings("unchecked") - public ActionItem get(Event event) { - if (event.getTypeInt() == Event.ONKEYDOWN) { - int modifiers = KeyboardListenerCollection.getKeyboardModifiers(event); - boolean fnKey = (event.getKeyCode() >= Keyboard.KEY_F2 && event.getKeyCode() <= Keyboard.KEY_F12); - if (modifiers != 0 || fnKey) { - ShortcutDescriptor shortcut = new ShortcutDescriptor(event.getKeyCode(), modifiers); - return get(shortcut); - } + public ActionItem get(final NativeEvent event) { + final int modifiers = KeyStroke.getKeyboardModifiers(event); + final boolean fnKey = (event.getKeyCode() >= Keyboard.KEY_F2 && event.getKeyCode() <= Keyboard.KEY_F12); + if (modifiers != 0 || fnKey) { + final ShortcutDescriptor shortcut = new ShortcutDescriptor(event.getKeyCode(), modifiers); + return get(shortcut); } return null; } @SuppressWarnings("unchecked") - public ActionItem get(ShortcutDescriptor shortcut) { - ActionItem actionItem = shortcuts.get(shortcut); + public ActionItem get(final ShortcutDescriptor shortcut) { + final ActionItem actionItem = shortcuts.get(shortcut); if (actionItem != null) { Log.debug("Shortcut pressed" + actionItem.getAction().getShortcut()); } @@ -44,7 +42,7 @@ } @SuppressWarnings("unchecked") - public void put(ShortcutDescriptor shortcut, ActionItem actionItem) { + public void put(final ShortcutDescriptor shortcut, final ActionItem actionItem) { if (shortcuts.get(shortcut) != null) { Log.warn("Shortcut" + shortcut + " already registered"); } @@ -52,13 +50,13 @@ } @SuppressWarnings("unchecked") - public void put(ShortcutDescriptor shortcut, final Listener0 listener) { - ActionDescriptor descriptor = new ActionDescriptor(AccessRolDTO.Viewer, new Listener0() { + public void put(final ShortcutDescriptor shortcut, final Listener0 listener) { + final ActionDescriptor descriptor = new ActionDescriptor(AccessRolDTO.Viewer, new Listener0() { public void onEvent() { listener.onEvent(); } }); - ActionItem item = new ActionItem(descriptor, null); + final ActionItem item = new ActionItem(descriptor, null); put(shortcut, item); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -37,9 +37,10 @@ import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.events.Listener2; -import com.google.gwt.user.client.HistoryListener; +import com.google.gwt.event.logical.shared.ValueChangeEvent; +import com.google.gwt.event.logical.shared.ValueChangeHandler; -public class StateManagerDefault implements StateManager, HistoryListener { +public class StateManagerDefault implements StateManager, ValueChangeHandler<String> { private final ContentProvider contentProvider; private StateToken previousToken; /** @@ -86,7 +87,7 @@ beforeStateChangeCollection = new BeforeActionCollection(); } - public void addBeforeStateChangeListener(BeforeActionListener listener) { + public void addBeforeStateChangeListener(final BeforeActionListener listener) { beforeStateChangeCollection.add(listener); } @@ -107,28 +108,6 @@ onGroupChanged.add(listener); } - public void onHistoryChanged(final String historyToken) { - // http://code.google.com/p/google-web-toolkit-doc-1-5/wiki/DevGuideHistory - if (beforeStateChangeCollection.checkBeforeAction()) { - final Listener0 tokenListener = siteTokens.get(historyToken); - Log.debug("StateManager: history token changed (" + historyToken + ")"); - if (tokenListener == null) { - // Ok, normal token change - onHistoryChanged(new StateToken(historyToken)); - } else { - // token is one of #newgroup #signin #translate ... - if (previousToken == null) { - // Starting with some token like "signin": load defContent - // also - onHistoryChanged(""); - } - tokenListener.onEvent(); - } - } else { - resumedToken = new StateToken(historyToken); - } - } - public void onSocialNetworkChanged(final Listener<StateAbstractDTO> listener) { onSocialNetworkChanged.add(listener); } @@ -141,6 +120,10 @@ onToolChanged.add(listener); } + public void onValueChange(final ValueChangeEvent<String> event) { + onHistoryChanged(event.getValue()); + } + /** * <p> * Reload current state (using client cache if available) @@ -150,7 +133,7 @@ onHistoryChanged(history.getToken()); } - public void removeBeforeStateChangeListener(BeforeActionListener listener) { + public void removeBeforeStateChangeListener(final BeforeActionListener listener) { beforeStateChangeCollection.remove(listener); } @@ -187,6 +170,28 @@ } } + void onHistoryChanged(final String historyToken) { + // http://code.google.com/p/google-web-toolkit-doc-1-5/wiki/DevGuideHistory + if (beforeStateChangeCollection.checkBeforeAction()) { + final Listener0 tokenListener = siteTokens.get(historyToken); + Log.debug("StateManager: history token changed (" + historyToken + ")"); + if (tokenListener == null) { + // Ok, normal token change + onHistoryChanged(new StateToken(historyToken)); + } else { + // token is one of #newgroup #signin #translate ... + if (previousToken == null) { + // Starting with some token like "signin": load defContent + // also + onHistoryChanged(""); + } + tokenListener.onEvent(); + } + } else { + resumedToken = new StateToken(historyToken); + } + } + void setState(final StateAbstractDTO newState) { session.setCurrentState(newState); onStateChanged.fire(newState); @@ -198,10 +203,10 @@ private void checkGroupAndToolChange(final StateAbstractDTO newState) { final String previousGroup = previousToken == null ? "" : previousToken.getGroup(); final String newGroup = newState.getStateToken().getGroup(); - String previousTokenTool = previousToken == null ? "" : previousToken.getTool(); - String newTokenTool = newState.getStateToken().getTool(); - String previousToolName = previousTokenTool == null ? "" : previousTokenTool; - String newToolName = newTokenTool == null ? "" : newTokenTool; + final String previousTokenTool = previousToken == null ? "" : previousToken.getTool(); + final String newTokenTool = newState.getStateToken().getTool(); + final String previousToolName = previousTokenTool == null ? "" : previousTokenTool; + final String newToolName = newTokenTool == null ? "" : newTokenTool; if (previousToken == null || previousToolName == null || !previousToolName.equals(newToolName)) { onToolChanged.fire(previousToolName, newToolName); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractLabel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractLabel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractLabel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -19,19 +19,36 @@ */ package org.ourproject.kune.platf.client.ui; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.DoubleClickHandler; +import com.google.gwt.event.dom.client.MouseDownHandler; +import com.google.gwt.event.dom.client.MouseMoveHandler; +import com.google.gwt.event.dom.client.MouseOutHandler; +import com.google.gwt.event.dom.client.MouseOverHandler; +import com.google.gwt.event.dom.client.MouseUpHandler; +import com.google.gwt.event.dom.client.MouseWheelHandler; +import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Event; -import com.google.gwt.user.client.ui.ClickListener; -import com.google.gwt.user.client.ui.MouseListener; public interface AbstractLabel { - void addClickListener(final ClickListener listener); + HandlerRegistration addClickHandler(final ClickHandler handler); - void addDoubleClickListener(ClickListener listener); + HandlerRegistration addDoubleClickHandler(final DoubleClickHandler handler); - void addMouseListener(final MouseListener listener); + HandlerRegistration addMouseDownHandler(final MouseDownHandler handler); + HandlerRegistration addMouseMoveHandler(final MouseMoveHandler handler); + + HandlerRegistration addMouseOutHandler(final MouseOutHandler handler); + + HandlerRegistration addMouseOverHandler(final MouseOverHandler handler); + + HandlerRegistration addMouseUpHandler(final MouseUpHandler handler); + + HandlerRegistration addMouseWheelHandler(final MouseWheelHandler handler); + void addStyleDependentName(String string); Element getElement(); @@ -40,12 +57,6 @@ void onBrowserEvent(final Event event); - void removeClickListener(final ClickListener listener); - - void removeDoubleClickListener(ClickListener listener); - - void removeMouseListener(final MouseListener listener); - void removeStyleDependentName(String string); void setColor(final String color); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/BasicThumb.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/BasicThumb.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/BasicThumb.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.platf.client.ui; -import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Label; @@ -33,55 +33,56 @@ private final Image thumbImg; private final Label thumbLabel; - public BasicThumb(String imageUrl, int imgSize, String text, int textMaxLenght, boolean crop, - ClickListener clickListener) { - VerticalPanel vp = new VerticalPanel(); - if (imgSize != NOSIZE) { + public BasicThumb(final String imageUrl, final int imgSize, final String text, final int textMaxLenght, + final boolean crop, final ClickHandler clickHandler) { + super(); + final VerticalPanel vpanel = new VerticalPanel(); + if (imgSize == NOSIZE) { + thumbImg = new Image(imageUrl); + } else { if (crop) { thumbImg = new Image(imageUrl, 0, 0, imgSize, imgSize); } else { thumbImg = new Image(imageUrl); thumbImg.setPixelSize(imgSize, imgSize); } - } else { - thumbImg = new Image(imageUrl); } - String title = textMaxLenght == NOSIZE ? text : Format.ellipsis(text, textMaxLenght); + final String title = textMaxLenght == NOSIZE ? text : Format.ellipsis(text, textMaxLenght); thumbLabel = new Label(title); - vp.add(thumbImg); - vp.add(thumbLabel); - vp.addStyleName("k-basic-thumb"); - vp.addStyleName("kune-Margin-Small-trbl"); - vp.addStyleName("kune-pointer"); - vp.addStyleName("kune-floatleft"); - thumbLabel.addClickListener(clickListener); - vp.setCellHorizontalAlignment(thumbLabel, VerticalPanel.ALIGN_CENTER); - thumbImg.addClickListener(clickListener); - initWidget(vp); + vpanel.add(thumbImg); + vpanel.add(thumbLabel); + vpanel.addStyleName("k-basic-thumb"); + vpanel.addStyleName("kune-Margin-Small-trbl"); + vpanel.addStyleName("kune-pointer"); + vpanel.addStyleName("kune-floatleft"); + thumbLabel.addClickHandler(clickHandler); + vpanel.setCellHorizontalAlignment(thumbLabel, VerticalPanel.ALIGN_CENTER); + thumbImg.addClickHandler(clickHandler); + initWidget(vpanel); } - public BasicThumb(String imageUrl, String thumText, ClickListener clickListener) { - this(imageUrl, NOSIZE, thumText, NOSIZE, false, clickListener); + public BasicThumb(final String imageUrl, final String thumText, final ClickHandler clickHandler) { + this(imageUrl, NOSIZE, thumText, NOSIZE, false, clickHandler); } - public BasicThumb(String imageUrl, String text, int textMaxLenght, ClickListener clickListener) { - this(imageUrl, NOSIZE, text, textMaxLenght, false, clickListener); + public BasicThumb(final String imageUrl, final String text, final int textMaxLenght, final ClickHandler clickHandler) { + this(imageUrl, NOSIZE, text, textMaxLenght, false, clickHandler); } - public void setText(String text) { + public void setText(final String text) { thumbLabel.setText(text); } - public void setThumbUrl(String url) { + public void setThumbUrl(final String url) { thumbImg.setUrl(url); } - public void setTooltip(String tip) { + public void setTooltip(final String tip) { KuneUiUtils.setQuickTip(thumbImg, tip); KuneUiUtils.setQuickTip(thumbLabel, tip); } - public void setTooltip(String tipTitle, String tip) { + public void setTooltip(final String tipTitle, final String tip) { KuneUiUtils.setQuickTip(thumbImg, tip, tipTitle); KuneUiUtils.setQuickTip(thumbLabel, tip, tipTitle); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/DropDownPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/DropDownPanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/DropDownPanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -21,7 +21,8 @@ import org.ourproject.kune.platf.client.services.Images; -import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Image; @@ -36,15 +37,15 @@ * </p> * */ -public class DropDownPanel extends Composite implements ClickListener { - private transient final VerticalPanel vpanel; - private transient final HorizontalPanel titleHP; - private transient final Label titleLabel; - private transient final SimplePanel contentPanel; - private transient final Images img; - private transient final Image arrowImage; - private transient final RoundedPanel outerBorder; - private transient String stylePrimaryName; +public class DropDownPanel extends Composite implements ClickHandler { + private final VerticalPanel vpanel; + private final HorizontalPanel titleHP; + private final Label titleLabel; + private final SimplePanel contentPanel; + private final Images img; + private final Image arrowImage; + private final RoundedPanel outerBorder; + private String stylePrimaryName; public DropDownPanel(final Images img) { super(); @@ -74,8 +75,8 @@ contentPanel.setStylePrimaryName("k-dropdowninner"); setContentVisibleImpl(false); - arrowImage.addClickListener(this); - titleLabel.addClickListener(this); + arrowImage.addClickHandler(this); + titleLabel.addClickHandler(this); } public DropDownPanel(final Images img, final boolean visible) { @@ -93,10 +94,8 @@ return contentPanel.isVisible(); } - public void onClick(final Widget sender) { - if (sender.equals(titleHP) || sender.equals(arrowImage) || sender.equals(titleLabel)) { - setContentVisible(!isContentVisible()); - } + public void onClick(final ClickEvent event) { + setContentVisible(!isContentVisible()); } public void setBorderStylePrimaryName(final String stylePrimaryName) { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconHyperlink.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconHyperlink.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconHyperlink.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -19,24 +19,36 @@ */ package org.ourproject.kune.platf.client.ui; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.DoubleClickEvent; +import com.google.gwt.event.dom.client.DoubleClickHandler; +import com.google.gwt.event.dom.client.HasAllMouseHandlers; +import com.google.gwt.event.dom.client.HasClickHandlers; +import com.google.gwt.event.dom.client.HasDoubleClickHandlers; +import com.google.gwt.event.dom.client.MouseDownEvent; +import com.google.gwt.event.dom.client.MouseDownHandler; +import com.google.gwt.event.dom.client.MouseMoveEvent; +import com.google.gwt.event.dom.client.MouseMoveHandler; +import com.google.gwt.event.dom.client.MouseOutEvent; +import com.google.gwt.event.dom.client.MouseOutHandler; +import com.google.gwt.event.dom.client.MouseOverEvent; +import com.google.gwt.event.dom.client.MouseOverHandler; +import com.google.gwt.event.dom.client.MouseUpEvent; +import com.google.gwt.event.dom.client.MouseUpHandler; +import com.google.gwt.event.dom.client.MouseWheelEvent; +import com.google.gwt.event.dom.client.MouseWheelHandler; +import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; -import com.google.gwt.user.client.Event; -import com.google.gwt.user.client.History; import com.google.gwt.user.client.ui.AbstractImagePrototype; -import com.google.gwt.user.client.ui.ClickListener; -import com.google.gwt.user.client.ui.ClickListenerCollection; -import com.google.gwt.user.client.ui.MouseListener; -import com.google.gwt.user.client.ui.MouseListenerCollection; -import com.google.gwt.user.client.ui.SourcesClickEvents; import com.google.gwt.user.client.ui.Widget; -public class IconHyperlink extends Widget implements SourcesClickEvents, AbstractLabel { +public class IconHyperlink extends Widget implements AbstractLabel, HasClickHandlers, HasDoubleClickHandlers, + HasAllMouseHandlers { private Element anchorElem; - private ClickListenerCollection clickListeners; - private ClickListenerCollection doubleClickListeners; - private MouseListenerCollection mouseListeners; + private String targetHistoryToken; private final Element link; private final Element icon; @@ -44,7 +56,6 @@ public IconHyperlink(final AbstractImagePrototype image) { setElement(DOM.createDiv()); DOM.appendChild(getElement(), anchorElem = DOM.createAnchor()); - sinkEvents(Event.ONCLICK | Event.ONDBLCLICK | Event.MOUSEEVENTS); setStyleName("kune-IconHyperlink"); icon = image.createImage().getElement(); link = DOM.createSpan(); @@ -69,81 +80,46 @@ setTargetHistoryTokenImpl(targetHistoryToken); } - public void addClickListener(final ClickListener listener) { - if (clickListeners == null) { - clickListeners = new ClickListenerCollection(); - } - clickListeners.add(listener); + public HandlerRegistration addClickHandler(final ClickHandler handler) { + return addHandler(handler, ClickEvent.getType()); } - public void addDoubleClickListener(final ClickListener listener) { - if (doubleClickListeners == null) { - doubleClickListeners = new ClickListenerCollection(); - } - doubleClickListeners.add(listener); + public HandlerRegistration addDoubleClickHandler(final DoubleClickHandler handler) { + return addDomHandler(handler, DoubleClickEvent.getType()); } - public void addMouseListener(final MouseListener listener) { - if (mouseListeners == null) { - mouseListeners = new MouseListenerCollection(); - } - mouseListeners.add(listener); + public HandlerRegistration addMouseDownHandler(final MouseDownHandler handler) { + return addDomHandler(handler, MouseDownEvent.getType()); } - public String getTargetHistoryToken() { - return targetHistoryToken; + public HandlerRegistration addMouseMoveHandler(final MouseMoveHandler handler) { + return addDomHandler(handler, MouseMoveEvent.getType()); } - public String getText() { - return DOM.getInnerText(link); + public HandlerRegistration addMouseOutHandler(final MouseOutHandler handler) { + return addDomHandler(handler, MouseOutEvent.getType()); } - @Override - public void onBrowserEvent(final Event event) { - switch (DOM.eventGetType(event)) { - case Event.ONDBLCLICK: - if (doubleClickListeners != null) { - doubleClickListeners.fireClick(this); - } - DOM.eventPreventDefault(event); - break; - case Event.ONCLICK: - if (clickListeners != null) { - clickListeners.fireClick(this); - } - History.newItem(targetHistoryToken); - DOM.eventPreventDefault(event); - break; - case Event.ONMOUSEDOWN: - case Event.ONMOUSEUP: - case Event.ONMOUSEMOVE: - case Event.ONMOUSEOVER: - case Event.ONMOUSEOUT: - if (mouseListeners != null) { - mouseListeners.fireMouseEvent(this, event); - } - break; - } + public HandlerRegistration addMouseOverHandler(final MouseOverHandler handler) { + return addDomHandler(handler, MouseOverEvent.getType()); } - public void removeClickListener(final ClickListener listener) { - if (clickListeners != null) { - clickListeners.remove(listener); - } + public HandlerRegistration addMouseUpHandler(final MouseUpHandler handler) { + return addDomHandler(handler, MouseUpEvent.getType()); } - public void removeDoubleClickListener(final ClickListener listener) { - if (doubleClickListeners != null) { - doubleClickListeners.remove(listener); - } + public HandlerRegistration addMouseWheelHandler(final MouseWheelHandler handler) { + return addDomHandler(handler, MouseWheelEvent.getType()); } - public void removeMouseListener(final MouseListener listener) { - if (mouseListeners != null) { - mouseListeners.remove(listener); - } + public String getTargetHistoryToken() { + return targetHistoryToken; } + public String getText() { + return DOM.getInnerText(link); + } + public void setColor(final String color) { DOM.setStyleAttribute(link, "color", color); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconLabel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconLabel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconLabel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -17,22 +17,32 @@ \*/ package org.ourproject.kune.platf.client.ui; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.DoubleClickEvent; +import com.google.gwt.event.dom.client.DoubleClickHandler; +import com.google.gwt.event.dom.client.HasAllMouseHandlers; +import com.google.gwt.event.dom.client.HasClickHandlers; +import com.google.gwt.event.dom.client.HasDoubleClickHandlers; +import com.google.gwt.event.dom.client.MouseDownEvent; +import com.google.gwt.event.dom.client.MouseDownHandler; +import com.google.gwt.event.dom.client.MouseMoveEvent; +import com.google.gwt.event.dom.client.MouseMoveHandler; +import com.google.gwt.event.dom.client.MouseOutEvent; +import com.google.gwt.event.dom.client.MouseOutHandler; +import com.google.gwt.event.dom.client.MouseOverEvent; +import com.google.gwt.event.dom.client.MouseOverHandler; +import com.google.gwt.event.dom.client.MouseUpEvent; +import com.google.gwt.event.dom.client.MouseUpHandler; +import com.google.gwt.event.dom.client.MouseWheelEvent; +import com.google.gwt.event.dom.client.MouseWheelHandler; +import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; -import com.google.gwt.user.client.Event; import com.google.gwt.user.client.ui.AbstractImagePrototype; -import com.google.gwt.user.client.ui.ClickListener; -import com.google.gwt.user.client.ui.ClickListenerCollection; import com.google.gwt.user.client.ui.HasHorizontalAlignment; import com.google.gwt.user.client.ui.HasText; import com.google.gwt.user.client.ui.HasWordWrap; -import com.google.gwt.user.client.ui.MouseListener; -import com.google.gwt.user.client.ui.MouseListenerCollection; -import com.google.gwt.user.client.ui.MouseWheelListener; -import com.google.gwt.user.client.ui.MouseWheelListenerCollection; -import com.google.gwt.user.client.ui.SourcesClickEvents; -import com.google.gwt.user.client.ui.SourcesMouseEvents; -import com.google.gwt.user.client.ui.SourcesMouseWheelEvents; import com.google.gwt.user.client.ui.Widget; /** @@ -47,15 +57,13 @@ * </p> */ -public class IconLabel extends Widget implements SourcesClickEvents, SourcesMouseEvents, SourcesMouseWheelEvents, +public class IconLabel extends Widget implements HasClickHandlers, HasDoubleClickHandlers, HasAllMouseHandlers, HasHorizontalAlignment, HasText, HasWordWrap, AbstractLabel { - private ClickListenerCollection clickListeners; - private ClickListenerCollection doubleClickListeners; private HorizontalAlignmentConstant horzAlign; - private MouseListenerCollection mouseListeners; - private MouseWheelListenerCollection mouseWheelListeners; + private Element icon; + private final Element textLabel; /** @@ -66,7 +74,6 @@ */ public IconLabel(final AbstractImagePrototype image, final boolean leftIcon) { setElement(DOM.createDiv()); - sinkEvents(Event.ONCLICK | Event.MOUSEEVENTS | Event.ONMOUSEWHEEL | Event.ONDBLCLICK); setIconImpl(image); textLabel = DOM.createSpan(); if (leftIcon) { @@ -136,101 +143,50 @@ setWordWrapImpl(wordWrap); } - public void addClickListener(final ClickListener listener) { - if (clickListeners == null) { - clickListeners = new ClickListenerCollection(); - } - clickListeners.add(listener); + public HandlerRegistration addClickHandler(final ClickHandler handler) { + return addHandler(handler, ClickEvent.getType()); } - public void addDoubleClickListener(final ClickListener listener) { - if (doubleClickListeners == null) { - doubleClickListeners = new ClickListenerCollection(); - } - doubleClickListeners.add(listener); + public HandlerRegistration addDoubleClickHandler(final DoubleClickHandler handler) { + return addDomHandler(handler, DoubleClickEvent.getType()); } - public void addMouseListener(final MouseListener listener) { - if (mouseListeners == null) { - mouseListeners = new MouseListenerCollection(); - } - mouseListeners.add(listener); + public HandlerRegistration addMouseDownHandler(final MouseDownHandler handler) { + return addDomHandler(handler, MouseDownEvent.getType()); } - public void addMouseWheelListener(final MouseWheelListener listener) { - if (mouseWheelListeners == null) { - mouseWheelListeners = new MouseWheelListenerCollection(); - } - mouseWheelListeners.add(listener); + public HandlerRegistration addMouseMoveHandler(final MouseMoveHandler handler) { + return addDomHandler(handler, MouseMoveEvent.getType()); } - public HorizontalAlignmentConstant getHorizontalAlignment() { - return horzAlign; + public HandlerRegistration addMouseOutHandler(final MouseOutHandler handler) { + return addDomHandler(handler, MouseOutEvent.getType()); } - public String getText() { - return DOM.getInnerText(textLabel); + public HandlerRegistration addMouseOverHandler(final MouseOverHandler handler) { + return addDomHandler(handler, MouseOverEvent.getType()); } - public boolean getWordWrap() { - return !DOM.getStyleAttribute(textLabel, "whiteSpace").equals("nowrap"); + public HandlerRegistration addMouseUpHandler(final MouseUpHandler handler) { + return addDomHandler(handler, MouseUpEvent.getType()); } - @Override - public void onBrowserEvent(final Event event) { - switch (DOM.eventGetType(event)) { - case Event.ONCLICK: - if (clickListeners != null) { - clickListeners.fireClick(this); - } - break; - case Event.ONMOUSEDOWN: - case Event.ONMOUSEUP: - case Event.ONMOUSEMOVE: - case Event.ONMOUSEOVER: - case Event.ONMOUSEOUT: - if (mouseListeners != null) { - mouseListeners.fireMouseEvent(this, event); - } - break; - - case Event.ONMOUSEWHEEL: - if (mouseWheelListeners != null) { - mouseWheelListeners.fireMouseWheelEvent(this, event); - } - break; - case Event.ONDBLCLICK: - if (doubleClickListeners != null) { - doubleClickListeners.fireClick(this); - } - break; - } + public HandlerRegistration addMouseWheelHandler(final MouseWheelHandler handler) { + return addDomHandler(handler, MouseWheelEvent.getType()); } - public void removeClickListener(final ClickListener listener) { - if (clickListeners != null) { - clickListeners.remove(listener); - } + public HorizontalAlignmentConstant getHorizontalAlignment() { + return horzAlign; } - public void removeDoubleClickListener(final ClickListener listener) { - if (doubleClickListeners != null) { - doubleClickListeners.remove(listener); - } + public String getText() { + return DOM.getInnerText(textLabel); } - public void removeMouseListener(final MouseListener listener) { - if (mouseListeners != null) { - mouseListeners.remove(listener); - } + public boolean getWordWrap() { + return !DOM.getStyleAttribute(textLabel, "whiteSpace").equals("nowrap"); } - public void removeMouseWheelListener(final MouseWheelListener listener) { - if (mouseWheelListeners != null) { - mouseWheelListeners.remove(listener); - } - } - public void setColor(final String color) { DOM.setStyleAttribute(textLabel, "color", color); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconLabelEditable.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconLabelEditable.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconLabelEditable.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -19,15 +19,27 @@ */ package org.ourproject.kune.platf.client.ui; +import java.util.ArrayList; +import java.util.List; + import com.calclab.suco.client.events.Event2; import com.calclab.suco.client.events.Listener2; +import com.google.gwt.event.dom.client.BlurEvent; +import com.google.gwt.event.dom.client.BlurHandler; +import com.google.gwt.event.dom.client.ChangeEvent; +import com.google.gwt.event.dom.client.ChangeHandler; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.DoubleClickEvent; +import com.google.gwt.event.dom.client.DoubleClickHandler; +import com.google.gwt.event.dom.client.MouseOutEvent; +import com.google.gwt.event.dom.client.MouseOutHandler; +import com.google.gwt.event.dom.client.MouseOverEvent; +import com.google.gwt.event.dom.client.MouseOverHandler; +import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.ui.AbstractImagePrototype; -import com.google.gwt.user.client.ui.ChangeListener; -import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.FocusListener; import com.google.gwt.user.client.ui.HorizontalPanel; -import com.google.gwt.user.client.ui.MouseListenerAdapter; import com.google.gwt.user.client.ui.TextBox; import com.google.gwt.user.client.ui.Widget; @@ -37,16 +49,19 @@ */ public class IconLabelEditable extends Composite { - private transient boolean useDoubleClick; - private transient ClickListener listener; - private transient String currentText; - private transient MouseListenerAdapter mouseOverListener; - private transient final AbstractLabel label; - private transient String dblClickLabel; - private transient String clickLabel; - private transient Event2<String, String> onEditEvent; - private transient TextBox editor; - private transient HorizontalPanel hpanel; + private boolean useDoubleClick; + private String currentText; + private final AbstractLabel label; + private String dblClickLabel; + private String clickLabel; + private Event2<String, String> onEditEvent; + private TextBox editor; + private HorizontalPanel hpanel; + private List<HandlerRegistration> registrations; + private ClickHandler clickHandler; + private DoubleClickHandler doubleClickHandler; + private MouseOutHandler mouseOutHandler; + private MouseOverHandler mouseOverHandler; public IconLabelEditable() { this(""); @@ -132,6 +147,7 @@ private void init(final String text, final boolean useDoubleClick) { this.onEditEvent = new Event2<String, String>("onLabelEdit"); + registrations = new ArrayList<HandlerRegistration>(); dblClickLabel = "Double click to rename"; clickLabel = "Click to rename"; hpanel = new HorizontalPanel(); @@ -139,34 +155,37 @@ initWidget(hpanel); this.currentText = text; this.useDoubleClick = useDoubleClick; - this.listener = new ClickListener() { - public void onClick(final Widget sender) { + label.setStylePrimaryName("kune-EditableLabel"); + doubleClickHandler = new DoubleClickHandler() { + public void onDoubleClick(final DoubleClickEvent event) { showEditor(); } }; - - mouseOverListener = new MouseListenerAdapter() { - @Override - public void onMouseEnter(final Widget sender) { + clickHandler = new ClickHandler() { + public void onClick(final ClickEvent event) { + showEditor(); + } + }; + mouseOverHandler = new MouseOverHandler() { + public void onMouseOver(final MouseOverEvent event) { label.addStyleDependentName("high"); } - - @Override - public void onMouseLeave(final Widget sender) { + }; + mouseOutHandler = new MouseOutHandler() { + public void onMouseOut(final MouseOutEvent event) { label.removeStyleDependentName("high"); } }; - label.setStylePrimaryName("kune-EditableLabel"); - label.addMouseListener(mouseOverListener); setEditableImpl(false); } private void reset() { label.removeStyleDependentName("noneditable"); label.removeStyleDependentName("editable"); - label.removeClickListener(listener); - label.removeDoubleClickListener(listener); - label.removeMouseListener(mouseOverListener); + for (final HandlerRegistration reg : registrations) { + reg.removeHandler(); + } + registrations.clear(); } private void setEditableImpl(final boolean editable) { @@ -174,14 +193,14 @@ if (editable) { if (useDoubleClick) { label.setTitle(dblClickLabel); - label.addDoubleClickListener(listener); + registrations.add(label.addDoubleClickHandler(doubleClickHandler)); } else { label.setTitle(clickLabel); - label.addClickListener(listener); + registrations.add(label.addClickHandler(clickHandler)); } + registrations.add(label.addMouseOverHandler(mouseOverHandler)); + registrations.add(label.addMouseOutHandler(mouseOutHandler)); label.addStyleDependentName("editable"); - // label.addDoubleClickListener(listener); - label.addMouseListener(mouseOverListener); } else { label.setTitle(null); label.addStyleDependentName("noneditable"); @@ -200,17 +219,13 @@ editor = new TextBox(); editor.setStyleName("k-eil-edit"); hpanel.add(editor); - editor.addFocusListener(new FocusListener() { - public void onFocus(final Widget sender) { - // doNothing - } - - public void onLostFocus(final Widget sender) { + editor.addBlurHandler(new BlurHandler() { + public void onBlur(final BlurEvent event) { afterEdit(); } }); - editor.addChangeListener(new ChangeListener() { - public void onChange(final Widget sender) { + editor.addChangeHandler(new ChangeHandler() { + public void onChange(final ChangeEvent event) { editor.setFocus(false); } }); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/LabelWrapper.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/LabelWrapper.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/LabelWrapper.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -19,50 +19,30 @@ */ package org.ourproject.kune.platf.client.ui; +import com.google.gwt.event.dom.client.DoubleClickEvent; +import com.google.gwt.event.dom.client.DoubleClickHandler; +import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.Event; -import com.google.gwt.user.client.ui.ClickListener; -import com.google.gwt.user.client.ui.ClickListenerCollection; import com.google.gwt.user.client.ui.Label; public class LabelWrapper extends Label implements AbstractLabel { - private transient ClickListenerCollection dblClickListeners; - public LabelWrapper() { super(); } public LabelWrapper(final String text) { super(text); - sinkEvents(Event.ONCLICK | Event.MOUSEEVENTS | Event.ONMOUSEWHEEL | Event.ONDBLCLICK); } public LabelWrapper(final String text, final boolean wordWrap) { super(text, wordWrap); } - public void addDoubleClickListener(final ClickListener listener) { - if (dblClickListeners == null) { - dblClickListeners = new ClickListenerCollection(); - } - dblClickListeners.add(listener); + public HandlerRegistration addDoubleClickHandler(final DoubleClickHandler handler) { + return addDomHandler(handler, DoubleClickEvent.getType()); } - @Override - public void onBrowserEvent(final Event event) { - if (DOM.eventGetType(event) == Event.ONDBLCLICK && dblClickListeners != null) { - dblClickListeners.fireClick(this); - } - super.onBrowserEvent(event); - } - - public void removeDoubleClickListener(final ClickListener listener) { - if (dblClickListeners != null) { - dblClickListeners.remove(listener); - } - } - public void setColor(final String color) { DOM.setStyleAttribute(super.getElement(), "color", color); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/AbstractPopupPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/AbstractPopupPanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/AbstractPopupPanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -6,16 +6,20 @@ public abstract class AbstractPopupPanel { - private transient PopupPanel popupPalette; - protected transient Widget widget; + private PopupPanel popupPalette; + protected Widget widget; - private final transient boolean autoHide; - private final transient boolean modal; + private final boolean autoHide; + private final boolean modal; public AbstractPopupPanel() { this(true, true); } + public AbstractPopupPanel(final boolean autohide) { + this(autohide, false); + } + public AbstractPopupPanel(final boolean autohide, final boolean modal) { this.autoHide = autohide; this.modal = modal; @@ -35,9 +39,8 @@ public boolean isVisible() { if (popupPalette != null && popupPalette.isVisible()) { return true; - } else { - return false; } + return false; } public void show(final int left, final int top) { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/BasicDialogExtended.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/BasicDialogExtended.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/BasicDialogExtended.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -35,7 +35,7 @@ public BasicDialogExtended(final String dialogId, final String title, final boolean modal, final boolean autoscroll, final int width, final int heigth, final String icon, final String firstButtonTitle, final String cancelButtonTitle, final Listener0 onFirstButtonClick, - Listener0 onCancelButtonClick, int tabIndexStart) { + final Listener0 onCancelButtonClick, final int tabIndexStart) { this(dialogId, title, modal, autoscroll, width, heigth, icon, firstButtonTitle, Ext.generateId(), cancelButtonTitle, Ext.generateId(), onFirstButtonClick, onCancelButtonClick, tabIndexStart); } @@ -44,7 +44,7 @@ final boolean autoscroll, final int width, final int heigth, final String icon, final String firstButtonTitle, final String firstButtonId, final String cancelButtonTitle, final String cancelButtonId, final Listener0 onFirstButtonClick, final Listener0 onCancelButtonClick, - int tabIndexStart) { + final int tabIndexStart) { super(dialogId, title, modal, autoscroll, width, heigth); setLayout(new FitLayout()); setCollapsible(false); @@ -55,7 +55,7 @@ firstButton.setId(firstButtonId); firstButton.addListener(new ButtonListenerAdapter() { @Override - public void onClick(final Button button, final EventObject e) { + public void onClick(final Button button, final EventObject event) { onFirstButtonClick.onEvent(); } }); @@ -66,7 +66,7 @@ cancel.setId(cancelButtonId); cancel.addListener(new ButtonListenerAdapter() { @Override - public void onClick(final Button button, final EventObject e) { + public void onClick(final Button button, final EventObject event) { onCancelButtonClick.onEvent(); } }); Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/BasicPopupPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/BasicPopupPanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/BasicPopupPanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -0,0 +1,27 @@ +package org.ourproject.kune.platf.client.ui.dialogs; + +import com.google.gwt.user.client.ui.Widget; + +public class BasicPopupPanel extends AbstractPopupPanel { + + public BasicPopupPanel() { + super(); + } + + public BasicPopupPanel(final boolean autohide) { + super(autohide); + } + + public BasicPopupPanel(final boolean autohide, final boolean modal) { + super(autohide, modal); + } + + public void setWidget(final Widget widget) { + this.widget = widget; + } + + @Override + protected void createWidget() { + // Nothing + } +} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/form/AbstractFormPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/form/AbstractFormPanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/form/AbstractFormPanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -19,8 +19,9 @@ */ package org.ourproject.kune.platf.client.ui.form; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.Button; -import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Label; @@ -36,25 +37,25 @@ content = new VerticalPanel(); add(content); - btnOk = new Button("", new ClickListener() { - public void onClick(final Widget sender) { + btnOk = new Button("", new ClickHandler() { + public void onClick(final ClickEvent event) { listener.onAccept(); } }); - btnCancel = new Button("", new ClickListener() { - public void onClick(final Widget sender) { + btnCancel = new Button("", new ClickHandler() { + public void onClick(final ClickEvent event) { listener.onCancel(); } }); - FlowPanel controls = new FlowPanel(); + final FlowPanel controls = new FlowPanel(); controls.add(btnOk); controls.add(btnCancel); add(controls); } public void addRow(final String label, final Widget widget) { - HorizontalPanel panel = new HorizontalPanel(); + final HorizontalPanel panel = new HorizontalPanel(); panel.add(new Label(label)); panel.add(widget); content.add(panel); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalettePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalettePanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalettePanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -19,10 +19,11 @@ */ package org.ourproject.kune.platf.client.ui.palette; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.Grid; -import com.google.gwt.user.client.ui.SourcesTableEvents; -import com.google.gwt.user.client.ui.TableListener; +import com.google.gwt.user.client.ui.HTMLTable.Cell; /** * @@ -32,7 +33,7 @@ */ public class ColorWebSafePalettePanel extends AbstractPalettePanel implements ColorWebSafePaletteView { - private final transient ColorWebSafePalettePresenter presenter; + private final ColorWebSafePalettePresenter presenter; public ColorWebSafePalettePanel(final ColorWebSafePalettePresenter initPresenter) { super(); @@ -49,9 +50,9 @@ int row; int col; int num = 0; - for (String element : COLORS) { - for (String element2 : COLORS) { - for (String element3 : COLORS) { + for (final String element : COLORS) { + for (final String element2 : COLORS) { + for (final String element3 : COLORS) { row = num / COLS; col = num % COLS; final String currentColor = "#" + element3 + element + element2; @@ -63,9 +64,10 @@ } } paletteGrid.addStyleName("kune-WebSafePalette"); - paletteGrid.addTableListener(new TableListener() { - public void onCellClicked(final SourcesTableEvents sender, final int row, final int col) { - presenter.onColorSelected(row, col); + paletteGrid.addClickHandler(new ClickHandler() { + public void onClick(final ClickEvent event) { + final Cell cell = paletteGrid.getCellForEvent(event); + presenter.onColorSelected(cell.getRowIndex(), cell.getCellIndex()); } }); widget = paletteGrid; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/SimplePalettePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/SimplePalettePanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/SimplePalettePanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -7,8 +7,8 @@ public class SimplePalettePanel extends AbstractPalettePanel implements SimplePaletteView { - private transient final SimplePalettePresenter presenter; - private transient final I18nTranslationService i18n; + private final SimplePalettePresenter presenter; + private final I18nTranslationService i18n; public SimplePalettePanel(final SimplePalettePresenter presenter, final I18nTranslationService i18n) { super(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/RichTextArea.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/RichTextArea.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/RichTextArea.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -20,13 +20,9 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.IFrameElement; -import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.Event; +import com.google.gwt.event.dom.client.HasAllMouseHandlers; import com.google.gwt.user.client.ui.FocusWidget; import com.google.gwt.user.client.ui.HasHTML; -import com.google.gwt.user.client.ui.MouseListener; -import com.google.gwt.user.client.ui.MouseListenerCollection; -import com.google.gwt.user.client.ui.SourcesMouseEvents; /** * A rich text editor that allows complex styling and formatting. @@ -45,7 +41,7 @@ * <h3>CSS Style Rules</h3> <ul class="css"> <li>.gwt-RichTextArea { }</li> * </ul> */ -public class RichTextArea extends FocusWidget implements HasHTML, SourcesMouseEvents { +public class RichTextArea extends FocusWidget implements HasHTML, HasAllMouseHandlers { /** * This interface is used to access basic formatting options, when @@ -310,7 +306,7 @@ private final int number; - private FontSize(int number) { + private FontSize(final int number) { this.number = number; } @@ -352,7 +348,7 @@ private final String tag; - private Justification(String tag) { + private Justification(final String tag) { this.tag = tag; } @@ -363,7 +359,6 @@ } private final RichTextAreaImpl impl = GWT.create(RichTextAreaImpl.class); - private MouseListenerCollection mouseListeners; /** * Creates a new, blank {@link RichTextArea} object with no stylesheet. @@ -373,13 +368,6 @@ setStyleName("gwt-RichTextArea"); } - public void addMouseListener(MouseListener listener) { - if (mouseListeners == null) { - mouseListeners = new MouseListenerCollection(); - } - mouseListeners.add(listener); - } - /** * Gets the basic rich text formatting interface. * @@ -435,32 +423,7 @@ } @Override - public void onBrowserEvent(Event event) { - switch (DOM.eventGetType(event)) { - case Event.ONMOUSEDOWN: - case Event.ONMOUSEUP: - case Event.ONMOUSEMOVE: - case Event.ONMOUSEOVER: - case Event.ONMOUSEOUT: - if (mouseListeners != null) { - mouseListeners.fireMouseEvent(this, event); - } - break; - - default: - // ClickEvents, KeyboardEvents, and FocusEvents - super.onBrowserEvent(event); - } - } - - public void removeMouseListener(MouseListener listener) { - if (mouseListeners != null) { - mouseListeners.remove(listener); - } - } - - @Override - public void setFocus(boolean focused) { + public void setFocus(final boolean focused) { // There are different problems on each browser when you try to focus an // unattached rich text iframe, so just cut it off early. if (isAttached()) { @@ -468,11 +431,11 @@ } } - public void setHTML(String html) { + public void setHTML(final String html) { impl.setHTML(html); } - public void setText(String text) { + public void setText(final String text) { impl.setText(text); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTELinkPopup.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTELinkPopup.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTELinkPopup.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -6,14 +6,14 @@ import org.ourproject.kune.platf.client.ui.dialogs.AbstractPopupPanel; import com.calclab.suco.client.events.Listener0; -import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.Widget; public class RTELinkPopup extends AbstractPopupPanel { - private final transient HorizontalPanel hpanel; + private final HorizontalPanel hpanel; public RTELinkPopup() { super(false, false); @@ -22,8 +22,8 @@ KuneUiUtils.setUnselectable(hpanel.getElement()); final Image close = new Image(); Images.App.getInstance().kuneClose().applyTo(close); - close.addClickListener(new ClickListener() { - public void onClick(final Widget sender) { + close.addClickHandler(new ClickHandler() { + public void onClick(final ClickEvent event) { hide(); } }); @@ -35,8 +35,8 @@ actionLabel.setText(item.getAction().getText()); actionLabel.addStyleName("k-rte-changelink"); KuneUiUtils.setUnselectable(actionLabel.getElement()); - actionLabel.addClickListener(new ClickListener() { - public void onClick(final Widget arg0) { + actionLabel.addClickHandler(new ClickHandler() { + public void onClick(final ClickEvent event) { onClick.onEvent(); } }); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -1,15 +1,5 @@ package org.ourproject.kune.platf.client.ui.rte.basic; -import static com.google.gwt.user.client.ui.KeyboardListener.KEY_DOWN; -import static com.google.gwt.user.client.ui.KeyboardListener.KEY_END; -import static com.google.gwt.user.client.ui.KeyboardListener.KEY_ESCAPE; -import static com.google.gwt.user.client.ui.KeyboardListener.KEY_HOME; -import static com.google.gwt.user.client.ui.KeyboardListener.KEY_LEFT; -import static com.google.gwt.user.client.ui.KeyboardListener.KEY_PAGEDOWN; -import static com.google.gwt.user.client.ui.KeyboardListener.KEY_PAGEUP; -import static com.google.gwt.user.client.ui.KeyboardListener.KEY_RIGHT; -import static com.google.gwt.user.client.ui.KeyboardListener.KEY_UP; - import java.util.Date; import org.ourproject.kune.platf.client.actions.ActionDescriptor; @@ -31,6 +21,7 @@ import com.allen_sauer.gwt.log.client.Log; import com.calclab.suco.client.events.Listener0; import com.google.gwt.dom.client.Element; +import com.google.gwt.event.dom.client.KeyCodes; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.DeferredCommand; @@ -38,6 +29,7 @@ import com.google.gwt.user.client.ui.FocusListener; import com.google.gwt.user.client.ui.Widget; +@SuppressWarnings("deprecation") public class RTEditorPanel extends RichTextArea implements RTEditorView { private class EventListener implements FocusListener { @@ -68,7 +60,7 @@ basic = getBasicFormatter(); extended = getExtendedFormatter(); shortcutRegister = new ShortcutRegister(); - EventListener listener = new EventListener(); + final EventListener listener = new EventListener(); addFocusListener(listener); setWidth("96%"); setHeight("100%"); @@ -76,10 +68,10 @@ } public void addActions(final ActionItemCollection<Object> actionItems) { - for (ActionItem<Object> actionItem : actionItems) { - ActionDescriptor<Object> action = actionItem.getAction(); + for (final ActionItem<Object> actionItem : actionItems) { + final ActionDescriptor<Object> action = actionItem.getAction(); if (action.hasShortcut() && action.mustBeAdded(null)) { - ShortcutDescriptor shortcut = action.getShortcut(); + final ShortcutDescriptor shortcut = action.getShortcut(); shortcutRegister.put(shortcut, actionItem); } } @@ -131,7 +123,7 @@ public LinkInfo getLinkInfoIfHref() { LinkInfo linkinfo = null; - org.xwiki.gwt.dom.client.Element selectedAnchor = selectAndGetLink(); + final org.xwiki.gwt.dom.client.Element selectedAnchor = selectAndGetLink(); if (selectedAnchor != null) { linkinfo = LinkInfo.parse(selectedAnchor); } else { @@ -149,7 +141,7 @@ // "<br/>range 0 as html: " // + selection.getRangeAt(0).toHTML(); // NotifyUser.info(info); - String info = "range count: " + getFstRange().getCommonAncestorContainer().getFirstChild().getNodeName(); + final String info = "range count: " + getFstRange().getCommonAncestorContainer().getFirstChild().getNodeName(); NotifyUser.info(info); } @@ -162,14 +154,14 @@ } public void insertBlockquote() { - DocumentFragment extracted = getFstRange().cloneContents(); + final DocumentFragment extracted = getFstRange().cloneContents(); // delete(); insertHtml("<blockquote>" + extracted.getInnerHTML() + "</blockquote>"); focus(); } public void insertComment(final String author) { - String comment = null; + final String comment = null; createCommentAndSelectIt(author, comment); } @@ -180,9 +172,9 @@ } public void insertCommentUsingSelection(final String author) { - DocumentFragment extracted = getFstRange().cloneContents(); + final DocumentFragment extracted = getFstRange().cloneContents(); extended.delete(); - String comment = extracted.getInnerText(); + final String comment = extracted.getInnerText(); createCommentAndSelectIt(author, comment); focus(); } @@ -277,8 +269,8 @@ super.onBrowserEvent(event); break; case Event.ONKEYDOWN: - ActionItem rtaActionItem = shortcutRegister.get(event); - ActionItem actionItem = rtaActionItem != null ? rtaActionItem : globalShortcutReg.get(event); + final ActionItem rtaActionItem = shortcutRegister.get(event); + final ActionItem actionItem = rtaActionItem != null ? rtaActionItem : globalShortcutReg.get(event); if (actionItem != null) { updateStatus(); fireEdit(); @@ -345,7 +337,7 @@ public void showLinkCtxMenu() { DeferredCommand.addCommand(new Command() { public void execute() { - org.xwiki.gwt.dom.client.Element selectedAnchor = LinkExecutableUtils.getSelectedAnchor(RTEditorPanel.this); + final org.xwiki.gwt.dom.client.Element selectedAnchor = LinkExecutableUtils.getSelectedAnchor(RTEditorPanel.this); if (selectedAnchor != null) { linkCtxMenu.show(RTEditorPanel.this.getAbsoluteLeft() + selectedAnchor.getAbsoluteLeft(), RTEditorPanel.this.getAbsoluteTop() + selectedAnchor.getAbsoluteTop() + 20); @@ -392,8 +384,8 @@ } private void createCommentAndSelectIt(final String author, final String comment) { - Element commentEl = createCommentElement(author, comment); - Range innerCommentRange = getDocument().createRange(); + final Element commentEl = createCommentElement(author, comment); + final Range innerCommentRange = getDocument().createRange(); getFstRange().insertNode(commentEl); innerCommentRange.selectNodeContents(commentEl.getFirstChild()); getSelection().addRange(innerCommentRange); @@ -401,9 +393,9 @@ } private Element createCommentElement(final String userName, final String insertComment) { - String time = i18n.formatDateWithLocale(new Date(), true); - Element span = getDocument().createSpanElement(); - String comment = insertComment != null ? insertComment : i18n.t("type your comment here"); + final String time = i18n.formatDateWithLocale(new Date(), true); + final Element span = getDocument().createSpanElement(); + final String comment = insertComment != null ? insertComment : i18n.t("type your comment here"); span.setInnerHTML("<em>" + comment + "</em> -" + userName + " " + time); DOM.setElementProperty(span.<com.google.gwt.user.client.Element> cast(), "className", "k-rte-comment"); // insertHtml(" " + span.getString() + " "); @@ -419,9 +411,9 @@ } private boolean isAnEditionKey(final int keyCode) { - if (keyCode != KEY_HOME && keyCode != KEY_END && keyCode != KEY_UP && keyCode != KEY_DOWN - && keyCode != KEY_LEFT && keyCode != KEY_RIGHT && keyCode != KEY_PAGEDOWN && keyCode != KEY_PAGEUP - && keyCode != KEY_ESCAPE) { + if (keyCode != KeyCodes.KEY_HOME && keyCode != KeyCodes.KEY_END && keyCode != KeyCodes.KEY_UP + && keyCode != KeyCodes.KEY_DOWN && keyCode != KeyCodes.KEY_LEFT && keyCode != KeyCodes.KEY_RIGHT + && keyCode != KeyCodes.KEY_PAGEDOWN && keyCode != KeyCodes.KEY_PAGEUP && keyCode != KeyCodes.KEY_ESCAPE) { return true; } else { return false; @@ -429,9 +421,9 @@ } private org.xwiki.gwt.dom.client.Element selectAndGetLink() { - org.xwiki.gwt.dom.client.Element selectedAnchor = LinkExecutableUtils.getSelectedAnchor(this); + final org.xwiki.gwt.dom.client.Element selectedAnchor = LinkExecutableUtils.getSelectedAnchor(this); if (selectedAnchor != null) { - Range range = getDocument().createRange(); + final Range range = getDocument().createRange(); range.selectNode(selectedAnchor); getSelection().addRange(range); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanelNew.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanelNew.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanelNew.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -1,27 +1,23 @@ package org.ourproject.kune.platf.client.ui.rte.basic; -import static com.google.gwt.user.client.ui.KeyboardListener.KEY_DOWN; -import static com.google.gwt.user.client.ui.KeyboardListener.KEY_END; -import static com.google.gwt.user.client.ui.KeyboardListener.KEY_ESCAPE; -import static com.google.gwt.user.client.ui.KeyboardListener.KEY_HOME; -import static com.google.gwt.user.client.ui.KeyboardListener.KEY_LEFT; -import static com.google.gwt.user.client.ui.KeyboardListener.KEY_PAGEDOWN; -import static com.google.gwt.user.client.ui.KeyboardListener.KEY_PAGEUP; -import static com.google.gwt.user.client.ui.KeyboardListener.KEY_RIGHT; -import static com.google.gwt.user.client.ui.KeyboardListener.KEY_UP; - import java.util.Date; import org.ourproject.kune.platf.client.actions.ActionDescriptor; import org.ourproject.kune.platf.client.actions.ActionItem; import org.ourproject.kune.platf.client.actions.ActionItemCollection; import org.ourproject.kune.platf.client.actions.ActionManager; +import org.ourproject.kune.platf.client.actions.ui.AbstractComplexGuiItem; +import org.ourproject.kune.platf.client.actions.ui.GuiActionCollection; import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; import org.ourproject.kune.platf.client.shortcuts.ShortcutDescriptor; import org.ourproject.kune.platf.client.shortcuts.ShortcutRegister; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.platf.client.ui.rte.RichTextArea; +import org.ourproject.kune.platf.client.ui.rte.RichTextArea.BasicFormatter; +import org.ourproject.kune.platf.client.ui.rte.RichTextArea.ExtendedFormatter; +import org.ourproject.kune.platf.client.ui.rte.RichTextArea.FontSize; +import org.ourproject.kune.platf.client.ui.rte.RichTextArea.Justification; import org.ourproject.kune.platf.client.ui.rte.insertlink.LinkExecutableUtils; import org.ourproject.kune.platf.client.ui.rte.insertlink.LinkInfo; import org.xwiki.gwt.dom.client.DocumentFragment; @@ -31,24 +27,26 @@ import com.allen_sauer.gwt.log.client.Log; import com.calclab.suco.client.events.Listener0; import com.google.gwt.dom.client.Element; +import com.google.gwt.event.dom.client.BlurEvent; +import com.google.gwt.event.dom.client.BlurHandler; +import com.google.gwt.event.dom.client.FocusEvent; +import com.google.gwt.event.dom.client.FocusHandler; +import com.google.gwt.event.dom.client.KeyCodes; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.DeferredCommand; import com.google.gwt.user.client.Event; -import com.google.gwt.user.client.ui.FocusListener; -import com.google.gwt.user.client.ui.Widget; -public class RTEditorPanelNew extends RichTextArea implements RTEditorViewNew { +public class RTEditorPanelNew extends AbstractComplexGuiItem implements RTEditorViewNew { - private class EventListener implements FocusListener { + private class EventListener implements FocusHandler, BlurHandler { + public void onBlur(final BlurEvent event) { + presenter.onLostFocus(); + } - public void onFocus(final Widget sender) { + public void onFocus(final FocusEvent event) { presenter.onEditorFocus(); } - - public void onLostFocus(final Widget sender) { - presenter.onLostFocus(); - } } private final I18nUITranslationService i18n; private final BasicFormatter basic; @@ -58,21 +56,26 @@ private final ShortcutRegister shortcutRegister; private final GlobalShortcutRegister globalShortcutReg; private final RTELinkPopup linkCtxMenu; + private final RichTextArea rta; public RTEditorPanelNew(final RTEditorPresenter presenter, final I18nUITranslationService i18n, final ActionManager actionManager, final GlobalShortcutRegister globalShortcutReg) { + super(); this.presenter = presenter; this.i18n = i18n; this.actionManager = actionManager; this.globalShortcutReg = globalShortcutReg; - basic = getBasicFormatter(); - extended = getExtendedFormatter(); + rta = new RichTextArea(); + basic = rta.getBasicFormatter(); + extended = rta.getExtendedFormatter(); shortcutRegister = new ShortcutRegister(); - final EventListener listener = new EventListener(); - addFocusListener(listener); + final EventListener handler = new EventListener(); + rta.addFocusHandler(handler); + rta.addBlurHandler(handler); setWidth("96%"); setHeight("100%"); linkCtxMenu = new RTELinkPopup(); + initWidget(rta); } public void addActions(final ActionItemCollection<Object> actionItems) { @@ -85,6 +88,10 @@ } } + public void addActions(final GuiActionCollection actions) { + super.addAll(actions); + } + public void addCtxAction(final ActionItem<Object> actionItem) { linkCtxMenu.addAction(actionItem, new Listener0() { public void onEvent() { @@ -98,7 +105,7 @@ } public void adjustSize(final int height) { - setHeight("" + height); + setHeight(Integer.toString(height)); } public boolean canBeBasic() { @@ -129,13 +136,17 @@ setFocus(true); } + public String getHTML() { + return rta.getHTML(); + } + public LinkInfo getLinkInfoIfHref() { LinkInfo linkinfo = null; final org.xwiki.gwt.dom.client.Element selectedAnchor = selectAndGetLink(); - if (selectedAnchor != null) { + if (selectedAnchor == null) { + linkinfo = new LinkInfo(getSelectionText()); + } else { linkinfo = LinkInfo.parse(selectedAnchor); - } else { - linkinfo = new LinkInfo(getSelectionText()); } Log.debug("Link info: " + linkinfo); return linkinfo; @@ -157,6 +168,10 @@ return getFstRange().cloneContents().getInnerText(); } + public String getText() { + return rta.getText(); + } + public void hideLinkCtxMenu() { linkCtxMenu.hide(); } @@ -169,8 +184,7 @@ } public void insertComment(final String author) { - final String comment = null; - createCommentAndSelectIt(author, comment); + createCommentAndSelectIt(author, null); } public void insertCommentNotUsingSelection(final String author) { @@ -208,7 +222,7 @@ } public boolean isAnythingSelected() { - return !getDocument().getSelection().isCollapsed(); + return !rta.getDocument().getSelection().isCollapsed(); } public boolean isBold() { @@ -228,11 +242,11 @@ } public boolean isLink() { - if (isAttached() && LinkExecutableUtils.getSelectedAnchor(this) != null) { - return true; - } else { - return false; + boolean isLink = false; + if (isAttached() && LinkExecutableUtils.getSelectedAnchor(rta) != null) { + isLink = true; } + return isLink; } public boolean isStrikethrough() { @@ -278,21 +292,21 @@ break; case Event.ONKEYDOWN: final ActionItem rtaActionItem = shortcutRegister.get(event); - final ActionItem actionItem = rtaActionItem != null ? rtaActionItem : globalShortcutReg.get(event); - if (actionItem != null) { - updateStatus(); - fireEdit(); - event.cancelBubble(true); - event.preventDefault(); - actionManager.doAction(actionItem); - updateStatus(); - } else { + final ActionItem actionItem = rtaActionItem == null ? globalShortcutReg.get(event) : rtaActionItem; + if (actionItem == null) { super.onBrowserEvent(event); updateStatus(); updateLinkInfo(); if (isAnEditionKey(event.getKeyCode())) { fireEdit(); } + } else { + updateStatus(); + fireEdit(); + event.stopPropagation(); + event.preventDefault(); + actionManager.doAction(actionItem); + updateStatus(); } break; default: @@ -330,6 +344,10 @@ basic.setBackColor(color); } + public void setFocus(final boolean focused) { + rta.setFocus(focused); + } + public void setFontName(final String name) { basic.setFontName(name); } @@ -342,10 +360,18 @@ basic.setForeColor(color); } + public void setHTML(final String html) { + rta.setHTML(html); + } + + public void setText(final String text) { + rta.setText(text); + } + public void showLinkCtxMenu() { DeferredCommand.addCommand(new Command() { public void execute() { - final org.xwiki.gwt.dom.client.Element selectedAnchor = LinkExecutableUtils.getSelectedAnchor(RTEditorPanelNew.this); + final org.xwiki.gwt.dom.client.Element selectedAnchor = LinkExecutableUtils.getSelectedAnchor(rta); if (selectedAnchor != null) { linkCtxMenu.show(RTEditorPanelNew.this.getAbsoluteLeft() + selectedAnchor.getAbsoluteLeft(), RTEditorPanelNew.this.getAbsoluteTop() + selectedAnchor.getAbsoluteTop() + 20); @@ -393,7 +419,7 @@ private void createCommentAndSelectIt(final String author, final String comment) { final Element commentEl = createCommentElement(author, comment); - final Range innerCommentRange = getDocument().createRange(); + final Range innerCommentRange = rta.getDocument().createRange(); getFstRange().insertNode(commentEl); innerCommentRange.selectNodeContents(commentEl.getFirstChild()); getSelection().addRange(innerCommentRange); @@ -402,8 +428,8 @@ private Element createCommentElement(final String userName, final String insertComment) { final String time = i18n.formatDateWithLocale(new Date(), true); - final Element span = getDocument().createSpanElement(); - final String comment = insertComment != null ? insertComment : i18n.t("type your comment here"); + final Element span = rta.getDocument().createSpanElement(); + final String comment = insertComment == null ? i18n.t("type your comment here") : insertComment; span.setInnerHTML("<em>" + comment + "</em> -" + userName + " " + time); DOM.setElementProperty(span.<com.google.gwt.user.client.Element> cast(), "className", "k-rte-comment"); // insertHtml(" " + span.getString() + " "); @@ -415,23 +441,30 @@ } private Selection getSelection() { - return getDocument().getSelection(); + return rta.getDocument().getSelection(); } private boolean isAnEditionKey(final int keyCode) { - if (keyCode != KEY_HOME && keyCode != KEY_END && keyCode != KEY_UP && keyCode != KEY_DOWN - && keyCode != KEY_LEFT && keyCode != KEY_RIGHT && keyCode != KEY_PAGEDOWN && keyCode != KEY_PAGEUP - && keyCode != KEY_ESCAPE) { + switch (keyCode) { // NOPMD by vjrj on 5/06/09 19:14 + case KeyCodes.KEY_HOME: + case KeyCodes.KEY_END: + case KeyCodes.KEY_UP: + case KeyCodes.KEY_DOWN: + case KeyCodes.KEY_LEFT: + case KeyCodes.KEY_RIGHT: + case KeyCodes.KEY_PAGEDOWN: + case KeyCodes.KEY_PAGEUP: + case KeyCodes.KEY_ESCAPE: + return false; + default: return true; - } else { - return false; } } private org.xwiki.gwt.dom.client.Element selectAndGetLink() { - final org.xwiki.gwt.dom.client.Element selectedAnchor = LinkExecutableUtils.getSelectedAnchor(this); + final org.xwiki.gwt.dom.client.Element selectedAnchor = LinkExecutableUtils.getSelectedAnchor(rta); if (selectedAnchor != null) { - final Range range = getDocument().createRange(); + final Range range = rta.getDocument().createRange(); range.selectNode(selectedAnchor); getSelection().addRange(range); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenterNew.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenterNew.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenterNew.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -41,7 +41,6 @@ import com.calclab.suco.client.ioc.Provider; import com.google.gwt.libideas.resources.client.ImageResource; import com.google.gwt.user.client.Event; -import com.google.gwt.user.client.ui.KeyboardListener; public class RTEditorPresenterNew implements RTEditorNew { @@ -74,7 +73,7 @@ } public void actionPerformed(final ActionEvent actionEvent) { - getPalette(); + createPalette(); final Event event = actionEvent.getEvent(); palette.show(event.getClientX(), event.getClientY(), new Listener<String>() { public void onEvent(final String color) { @@ -240,7 +239,7 @@ } public class EditHtmlAction extends AbstractRTEAction { - private transient EditHtmlDialog editHtmlDialog; + private EditHtmlDialog editHtmlDialog; public EditHtmlAction(final String text, final String tooltip, final ImageResource icon) { super(text, tooltip, icon); @@ -266,7 +265,7 @@ } public class FontAction extends AbstractRTEAction { - private final transient String fontName; + private final String fontName; public FontAction(final String fontName, final String tooltip, final ImageResource icon) { super("<span style=\"font-family: " + fontName + "\">" + fontName + "</span>", tooltip, icon); @@ -286,7 +285,7 @@ } public void actionPerformed(final ActionEvent actionEvent) { - getPalette(); + createPalette(); final Event event = actionEvent.getEvent(); palette.show(event.getClientX(), event.getClientY(), new Listener<String>() { public void onEvent(final String color) { @@ -300,8 +299,8 @@ } public class FontSizeAction extends AbstractRTEAction { - private final transient String fontSizeName; - private final transient int fontSize; + private final String fontSizeName; + private final int fontSize; public FontSizeAction(final String fontSizeName, final int fontSize, final String tooltip, final ImageResource icon) { @@ -404,7 +403,7 @@ } public class InsertSpecialCharAction extends AbstractRTEAction { - private transient InsertSpecialCharDialog insCharDialog; + private InsertSpecialCharDialog insCharDialog; public InsertSpecialCharAction(final String text, final String tooltip, final ImageResource icon) { super(text, tooltip, icon); @@ -430,7 +429,7 @@ } public class InsertTableAction extends AbstractRTEAction { - private transient InsertTableDialog insTableDialog; + private InsertTableDialog insTableDialog; public InsertTableAction(final String text, final String tooltip, final ImageResource icon) { super(text, tooltip, icon); @@ -645,43 +644,43 @@ private static final String NONE = null; private static final ImageResource NO_ICON = null; - private transient RTEditorViewNew view; + private RTEditorViewNew view; private boolean extended; - private final transient I18nTranslationService i18n; - private final transient Session session; - private final transient RTEImgResources imgResources; - private final transient RTEActionTopToolbar topBar; - private final transient RTEActionSndToolbar sndBar; - private final transient Event0 onEdit; - private final transient DeferredCommandWrapper deferred; - private final transient Provider<ColorWebSafePalette> paletteProvider; - private final transient Provider<InsertLinkDialog> insLinkDialogPv; - private final transient Provider<EditHtmlDialog> editHtmlDialogPv; - private final transient Provider<InsertImageDialog> insImgDialogProv; - private final transient Provider<InsertTableDialog> insTableDialogPv; - private final transient Provider<InsertSpecialCharDialog> insCharDialogProv; - private final transient Provider<InsertMediaDialog> insMediaDialogPv; - private transient Listener<String> insTableListener; - private transient Listener<LinkInfo> insLinkListener; - private transient Listener<ImageInfo> insImgListener; - private transient Listener<String> insMediaListener; - private transient Listener<String> updHtmlListener; - protected transient Listener<String> insCharListener; - protected transient ColorWebSafePalette palette; - private transient PushButtonDescriptor bold; - private transient PushButtonDescriptor italic; - private transient PushButtonDescriptor underline; - private transient PushButtonDescriptor strikethrough; - private transient final GuiAddCondition basicAddCond; - private transient final GuiAddCondition extendedAddCond; - private transient final InputMap inputMap; - private transient MenuDescriptor editMenu; - private transient MenuDescriptor insertMenu; - private transient MenuDescriptor formatMenu; - private transient MenuDescriptor linkCtxMenu; - private transient GuiActionCollection actions; - private transient MenuDescriptor fontMenu; - private transient MenuDescriptor fontSizeMenu; + private final I18nTranslationService i18n; + private final Session session; + private final RTEImgResources imgResources; + private final RTEActionTopToolbar topBar; + private final RTEActionSndToolbar sndBar; + private final Event0 onEdit; + private final DeferredCommandWrapper deferred; + private final Provider<ColorWebSafePalette> paletteProvider; + private final Provider<InsertLinkDialog> insLinkDialogPv; + private final Provider<EditHtmlDialog> editHtmlDialogPv; + private final Provider<InsertImageDialog> insImgDialogProv; + private final Provider<InsertTableDialog> insTableDialogPv; + private final Provider<InsertSpecialCharDialog> insCharDialogProv; + private final Provider<InsertMediaDialog> insMediaDialogPv; + private Listener<String> insTableListener; + private Listener<LinkInfo> insLinkListener; + private Listener<ImageInfo> insImgListener; + private Listener<String> insMediaListener; + private Listener<String> updHtmlListener; + protected Listener<String> insCharListener; + protected ColorWebSafePalette palette; + private PushButtonDescriptor bold; + private PushButtonDescriptor italic; + private PushButtonDescriptor underline; + private PushButtonDescriptor strikethrough; + private final GuiAddCondition basicAddCond; + private final GuiAddCondition extendedAddCond; + private final InputMap inputMap; + private MenuDescriptor editMenu; + private MenuDescriptor insertMenu; + private MenuDescriptor formatMenu; + private MenuDescriptor linkCtxMenu; + private GuiActionCollection actions; + private MenuDescriptor fontMenu; + private MenuDescriptor fontSizeMenu; public RTEditorPresenterNew(final I18nTranslationService i18n, final Session session, final RTEActionTopToolbar topBar, final RTEActionSndToolbar sndBar, final RTEImgResources imgResources, @@ -739,6 +738,7 @@ public void attach() { topBar.clear(); sndBar.clear(); + view.addActions(actions); // FIXME // topBar.addActions(actions, TOPBAR); // sndBar.addActions(actions, SNDBAR); @@ -877,70 +877,69 @@ final SelectAllAction selectAllAction = new SelectAllAction(i18n.t("Select all"), NONE, imgResources.selectall()); final MenuItemDescriptor select = new MenuItemDescriptor(editMenu, selectAllAction); - setActionShortcut(KeyStroke.getKeyStroke('A', KeyboardListener.MODIFIER_CTRL), selectAllAction); + setActionShortcut(KeyStroke.getKeyStroke('A', Keyboard.MODIFIER_CTRL), selectAllAction); final BoldAction boldAction = new BoldAction(NONE, i18n.t("Bold"), imgResources.bold()); bold = new PushButtonDescriptor(boldAction); - setActionShortcut(KeyStroke.getKeyStroke('B', KeyboardListener.MODIFIER_CTRL), boldAction); + setActionShortcut(KeyStroke.getKeyStroke('B', Keyboard.MODIFIER_CTRL), boldAction); final ItalicAction italicAction = new ItalicAction(NONE, i18n.t("Italic"), imgResources.italic()); italic = new PushButtonDescriptor(italicAction); - setActionShortcut(KeyStroke.getKeyStroke('I', KeyboardListener.MODIFIER_CTRL), italicAction); + setActionShortcut(KeyStroke.getKeyStroke('I', Keyboard.MODIFIER_CTRL), italicAction); final UnderlineAction underlineAction = new UnderlineAction(NONE, i18n.t("Underline"), imgResources.underline()); underline = new PushButtonDescriptor(underlineAction); - setActionShortcut(KeyStroke.getKeyStroke('U', KeyboardListener.MODIFIER_CTRL), underlineAction); + setActionShortcut(KeyStroke.getKeyStroke('U', Keyboard.MODIFIER_CTRL), underlineAction); final SubscriptAction subscriptAction = new SubscriptAction(i18n.t("Subscript"), NONE, imgResources.subscript()); final MenuItemDescriptor subscript = new MenuItemDescriptor(formatMenu, subscriptAction); - setActionShortcut(KeyStroke.getKeyStroke(Keyboard.KEY_COMMA, KeyboardListener.MODIFIER_CTRL), subscriptAction); + setActionShortcut(KeyStroke.getKeyStroke(Keyboard.KEY_COMMA, Keyboard.MODIFIER_CTRL), subscriptAction); final SuperscriptAction superscriptAction = new SuperscriptAction(i18n.t("Superscript"), NONE, imgResources.superscript()); final MenuItemDescriptor superscript = new MenuItemDescriptor(formatMenu, superscriptAction); - setActionShortcut(KeyStroke.getKeyStroke(Keyboard.KEY_PERIOD, KeyboardListener.MODIFIER_CTRL), - superscriptAction); + setActionShortcut(KeyStroke.getKeyStroke(Keyboard.KEY_PERIOD, Keyboard.MODIFIER_CTRL), superscriptAction); final JustifyLeftAction jfyLeftAction = new JustifyLeftAction(NONE, i18n.t("Left Justify"), imgResources.alignleft()); final ButtonDescriptor justifyLeft = new ButtonDescriptor(jfyLeftAction); - setActionShortcut(KeyStroke.getKeyStroke('L', KeyboardListener.MODIFIER_CTRL), jfyLeftAction); + setActionShortcut(KeyStroke.getKeyStroke('L', Keyboard.MODIFIER_CTRL), jfyLeftAction); final JustifyCentreAction jfyCentreAction = new JustifyCentreAction(NONE, i18n.t("Centre Justify"), imgResources.centerpara()); final ButtonDescriptor justifyCentre = new ButtonDescriptor(jfyCentreAction); - setActionShortcut(KeyStroke.getKeyStroke('E', KeyboardListener.MODIFIER_CTRL), jfyCentreAction); + setActionShortcut(KeyStroke.getKeyStroke('E', Keyboard.MODIFIER_CTRL), jfyCentreAction); final JustifyRightAction jfyRightAction = new JustifyRightAction(NONE, i18n.t("Right Justify"), imgResources.alignright()); final ButtonDescriptor justifyRight = new ButtonDescriptor(jfyRightAction); - setActionShortcut(KeyStroke.getKeyStroke('R', KeyboardListener.MODIFIER_CTRL), jfyRightAction); + setActionShortcut(KeyStroke.getKeyStroke('R', Keyboard.MODIFIER_CTRL), jfyRightAction); final UndoAction undoAction = new UndoAction(i18n.t("Undo"), NONE, imgResources.undo()); final UndoAction undoActionBtn = new UndoAction(NONE, i18n.t("Undo"), imgResources.undo()); final MenuItemDescriptor undo = new MenuItemDescriptor(editMenu, undoAction); final ButtonDescriptor undoBtn = new ButtonDescriptor(undoActionBtn); undoBtn.setPosition(0); - setActionShortcut(KeyStroke.getKeyStroke(Keyboard.KEY_Z, KeyboardListener.MODIFIER_CTRL), undoAction); + setActionShortcut(KeyStroke.getKeyStroke(Keyboard.KEY_Z, Keyboard.MODIFIER_CTRL), undoAction); final RedoAction redoAction = new RedoAction(i18n.t("Redo"), NONE, imgResources.redo()); final RedoAction redoActionBtn = new RedoAction(NONE, i18n.t("Redo"), imgResources.redo()); final MenuItemDescriptor redo = new MenuItemDescriptor(editMenu, redoAction); final ButtonDescriptor redoBtn = new ButtonDescriptor(redoActionBtn); redoBtn.setPosition(1); - setActionShortcut(KeyStroke.getKeyStroke(Keyboard.KEY_Y, KeyboardListener.MODIFIER_CTRL), redoAction); + setActionShortcut(KeyStroke.getKeyStroke(Keyboard.KEY_Y, Keyboard.MODIFIER_CTRL), redoAction); final CopyAction copyAction = new CopyAction(i18n.t("Copy"), NONE, imgResources.copy()); final MenuItemDescriptor copy = new MenuItemDescriptor(editMenu, copyAction); - setActionShortcut(KeyStroke.getKeyStroke(Keyboard.KEY_C, KeyboardListener.MODIFIER_CTRL), copyAction); + setActionShortcut(KeyStroke.getKeyStroke(Keyboard.KEY_C, Keyboard.MODIFIER_CTRL), copyAction); final CutAction cutAction = new CutAction(i18n.t("Cut"), NONE, imgResources.cut()); final MenuItemDescriptor cut = new MenuItemDescriptor(editMenu, cutAction); - setActionShortcut(KeyStroke.getKeyStroke(Keyboard.KEY_X, KeyboardListener.MODIFIER_CTRL), cutAction); + setActionShortcut(KeyStroke.getKeyStroke(Keyboard.KEY_X, Keyboard.MODIFIER_CTRL), cutAction); final PasteAction pasteAction = new PasteAction(i18n.t("Paste"), NONE, imgResources.paste()); final MenuItemDescriptor paste = new MenuItemDescriptor(editMenu, pasteAction); - setActionShortcut(KeyStroke.getKeyStroke(Keyboard.KEY_V, KeyboardListener.MODIFIER_CTRL), pasteAction); + setActionShortcut(KeyStroke.getKeyStroke(Keyboard.KEY_V, Keyboard.MODIFIER_CTRL), pasteAction); final EditHtmlAction editHtmlAction = new EditHtmlAction(i18n.t("Edit HTML"), NONE, imgResources.edithtml()); final MenuItemDescriptor editHtml = new MenuItemDescriptor(editMenu, editHtmlAction); @@ -949,7 +948,7 @@ final CommentAction commentAction = new CommentAction(i18n.t("Comment"), NONE, NO_ICON); final MenuItemDescriptor comment = new MenuItemDescriptor(insertMenu, commentAction); comment.setAddCondition(extendedAddCond); - setActionShortcut(KeyStroke.getKeyStroke(Keyboard.KEY_M, KeyboardListener.MODIFIER_CTRL), commentAction); + setActionShortcut(KeyStroke.getKeyStroke(Keyboard.KEY_M, Keyboard.MODIFIER_CTRL), commentAction); final HrAction hlineAction = new HrAction(i18n.t("Horizontal line"), NONE, imgResources.hfixedline()); final HrAction hlineBtnAction = new HrAction(NONE, i18n.t("Horizontal line"), imgResources.hfixedline()); @@ -957,9 +956,7 @@ final ButtonDescriptor hlineBtn = new ButtonDescriptor(hlineBtnAction); hline.setAddCondition(extendedAddCond); hlineBtn.setAddCondition(extendedAddCond); - setActionShortcut( - KeyStroke.getKeyStroke(' ', KeyboardListener.MODIFIER_CTRL & KeyboardListener.MODIFIER_SHIFT), - hlineAction); + setActionShortcut(KeyStroke.getKeyStroke(' ', Keyboard.MODIFIER_CTRL & Keyboard.MODIFIER_SHIFT), hlineAction); final BlockquoteAction blockquoteAction = new BlockquoteAction(i18n.t("Block Quotation"), NONE, imgResources.hfixedline()); @@ -984,12 +981,12 @@ final OlAction olistAction = new OlAction(NONE, i18n.t("Numbered List"), imgResources.defaultnumbering()); final ButtonDescriptor olist = new ButtonDescriptor(olistAction); olist.setAddCondition(extendedAddCond); - setActionShortcut(KeyStroke.getKeyStroke(Keyboard.KEY_7, KeyboardListener.MODIFIER_CTRL), olistAction); + setActionShortcut(KeyStroke.getKeyStroke(Keyboard.KEY_7, Keyboard.MODIFIER_CTRL), olistAction); final UlAction ulistAction = new UlAction(NONE, i18n.t("Bullet List"), imgResources.defaultbullet()); final ButtonDescriptor ulist = new ButtonDescriptor(ulistAction); ulist.setAddCondition(extendedAddCond); - setActionShortcut(KeyStroke.getKeyStroke(Keyboard.KEY_8, KeyboardListener.MODIFIER_CTRL), ulistAction); + setActionShortcut(KeyStroke.getKeyStroke(Keyboard.KEY_8, Keyboard.MODIFIER_CTRL), ulistAction); final ImgAction imgAction = new ImgAction(i18n.t("Image..."), NONE, imgResources.images()); final ImgAction imgBtnAction = new ImgAction(NONE, i18n.t("Insert Image"), imgResources.images()); @@ -1015,11 +1012,10 @@ editLink.setAddCondition(extendedAddCond); editLinkBtn.setAddCondition(extendedAddCond); editLinkCtx.setAddCondition(extendedAddCond); - setActionShortcut(KeyStroke.getKeyStroke(Keyboard.KEY_K, KeyboardListener.MODIFIER_CTRL), editLinkAction, + setActionShortcut(KeyStroke.getKeyStroke(Keyboard.KEY_K, Keyboard.MODIFIER_CTRL), editLinkAction, editLinkBtnAction); - final KeyStroke key_K = KeyStroke.getKeyStroke(Keyboard.KEY_K, KeyboardListener.MODIFIER_CTRL - & KeyboardListener.MODIFIER_SHIFT); + final KeyStroke key_K = KeyStroke.getKeyStroke(Keyboard.KEY_K, Keyboard.MODIFIER_CTRL & Keyboard.MODIFIER_SHIFT); final RemoveLinkAction delLinkBtnAction = new RemoveLinkAction(NONE, i18n.t("Remove Link"), imgResources.linkbreak()); final RemoveLinkAction delLinkCtxAction = new RemoveLinkAction(i18n.t("Remove"), NONE, imgResources.linkbreak()); @@ -1037,7 +1033,7 @@ final ButtonDescriptor removeFormatBtn = new ButtonDescriptor(remFormatBtnAc); removeFormat.setAddCondition(extendedAddCond); removeFormatBtn.setAddCondition(extendedAddCond); - setActionShortcut(KeyStroke.getKeyStroke(' ', KeyboardListener.MODIFIER_CTRL), remFormatAction, remFormatBtnAc); + setActionShortcut(KeyStroke.getKeyStroke(' ', Keyboard.MODIFIER_CTRL), remFormatAction, remFormatBtnAc); final InsertSpecialCharAction insCharAction = new InsertSpecialCharAction(i18n.t("Special characters..."), NONE, imgResources.specialchars()); @@ -1067,7 +1063,7 @@ imgResources.specialchars()); final MenuItemDescriptor devInfo = new MenuItemDescriptor(formatMenu, devInfoAction); devInfo.setAddCondition(extendedAddCond); - setActionShortcut(KeyStroke.getKeyStroke(Keyboard.KEY_I, KeyboardListener.MODIFIER_ALT), devInfoAction); + setActionShortcut(KeyStroke.getKeyStroke(Keyboard.KEY_I, Keyboard.MODIFIER_ALT), devInfoAction); fontMenu = new MenuDescriptor(NONE, i18n.t("Font"), imgResources.charfontname()); fontSizeMenu = new MenuDescriptor(NONE, i18n.t("Font size"), imgResources.fontheight()); @@ -1105,7 +1101,7 @@ NO_ICON); final MenuItemDescriptor fontSizeItem = new MenuItemDescriptor(fontSizeMenu, fontSizeAction); fontSizeItem.setAddCondition(basicAddCond); - setActionShortcut(KeyStroke.getKeyStroke(48 + fontSize, KeyboardListener.MODIFIER_CTRL), fontSizeAction); + setActionShortcut(KeyStroke.getKeyStroke(48 + fontSize, Keyboard.MODIFIER_CTRL), fontSizeAction); fontSizeItem.setLocation(SNDBAR); actions.add(fontSizeItem); } @@ -1117,7 +1113,7 @@ linkCtxMenu = new MenuDescriptor(i18n.t("Change Link")); } - private void getPalette() { + private void createPalette() { if (palette == null) { palette = paletteProvider.get(); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorViewNew.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorViewNew.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorViewNew.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -1,11 +1,14 @@ package org.ourproject.kune.platf.client.ui.rte.basic; import org.ourproject.kune.platf.client.View; +import org.ourproject.kune.platf.client.actions.ui.GuiActionCollection; import org.ourproject.kune.platf.client.ui.rte.RichTextArea.FontSize; import org.ourproject.kune.platf.client.ui.rte.insertlink.LinkInfo; public interface RTEditorViewNew extends View { + void addActions(GuiActionCollection actions); + void adjustSize(int height); boolean canBeBasic(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImpl.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImpl.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImpl.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -20,8 +20,8 @@ import com.google.gwt.user.client.Event; /** - * Base class for RichText platform implementations. The default version simply - * creates a text area with no rich text support. + * Base class for RichText platform implementations. The default version + * simply creates a text area with no rich text support. * * This is not currently used by any user-agent, but will provide a * <textarea> fallback in the event a future browser fails to implement @@ -84,7 +84,8 @@ } protected void hookEvents() { - DOM.sinkEvents(elem, Event.MOUSEEVENTS | Event.KEYEVENTS | Event.ONCHANGE | Event.ONCLICK | Event.FOCUSEVENTS); + DOM.sinkEvents(elem, Event.MOUSEEVENTS | Event.KEYEVENTS | Event.ONCHANGE + | Event.ONCLICK | Event.FOCUSEVENTS); } protected void onElementInitialized() { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplIE6.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplIE6.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplIE6.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -76,7 +76,7 @@ // Weird: this code has the context of the script frame, but we need the // event from the edit iframe's window. var evt = elem.contentWindow.event; - elem.__listener.@org.ourproject.kune.platf.client.ui.rte.RichTextArea::onBrowserEvent(Lcom/google/gwt/user/client/Event;)(evt); + [email protected]::onBrowserEvent(Lcom/google/gwt/user/client/Event;)(evt); } }; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplMozilla.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplMozilla.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplMozilla.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -51,8 +51,7 @@ @Override public void setBackColor(String color) { - // Gecko uses 'BackColor' for the *entire area's* background. - // 'HiliteColor' + // Gecko uses 'BackColor' for the *entire area's* background. 'HiliteColor' // does what we actually want. execCommand("HiliteColor", color); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOpera.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOpera.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOpera.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -22,8 +22,7 @@ @Override public void setBackColor(String color) { - // Opera uses 'BackColor' for the *entire area's* background. - // 'HiliteColor' + // Opera uses 'BackColor' for the *entire area's* background. 'HiliteColor' // does what we actually want. execCommand("HiliteColor", color); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplSafari.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplSafari.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplSafari.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -24,8 +24,9 @@ public class RichTextAreaImplSafari extends RichTextAreaImplStandard { // @PMD:REVIEWED:VariableNamingConventions: by vjrj on 21/05/09 16:12 - private static final String[] sizeNumberCSSValues = new String[] { "medium", "xx-small", "x-small", "small", - "medium", "large", "x-large", "xx-large" }; + private static final String[] sizeNumberCSSValues = new String[] { + "medium", "xx-small", "x-small", "small", "medium", "large", "x-large", + "xx-large"}; private static int webKitVersion = getWebKitVersion(); @@ -111,8 +112,7 @@ @Override public void setFontSize(FontSize fontSize) { if (oldSchoolSizeValues) { - // Safari2 only accepts css-style 'small, medium, large, etc' - // values. + // Safari2 only accepts css-style 'small, medium, large, etc' values. // Setting these doesn't seem to hurt Safari3. int number = fontSize.getNumber(); if ((number >= 0) && (number <= 7)) { @@ -168,7 +168,7 @@ // Dispatch the event. if (elem.__listener) { - elem.__listener.@org.ourproject.kune.platf.client.ui.rte.RichTextArea::onBrowserEvent(Lcom/google/gwt/user/client/Event;)(evt); + [email protected]::onBrowserEvent(Lcom/google/gwt/user/client/Event;)(evt); } }; @@ -188,13 +188,13 @@ // there interferes with focus. elem.onfocus = function(evt) { if (elem.__listener) { - elem.__listener.@org.ourproject.kune.platf.client.ui.rte.RichTextArea::onBrowserEvent(Lcom/google/gwt/user/client/Event;)(evt); + [email protected]::onBrowserEvent(Lcom/google/gwt/user/client/Event;)(evt); } }; elem.onblur = function(evt) { if (elem.__listener) { - elem.__listener.@org.ourproject.kune.platf.client.ui.rte.RichTextArea::onBrowserEvent(Lcom/google/gwt/user/client/Event;)(evt); + [email protected]::onBrowserEvent(Lcom/google/gwt/user/client/Event;)(evt); } }; }-*/; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplStandard.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplStandard.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplStandard.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -275,10 +275,8 @@ // Unhook all custom event handlers when the element is detached. unhookEvents(); - // Recreate the placeholder element and store the iframe's contents in - // it. - // This is necessary because some browsers will wipe the iframe's - // contents + // Recreate the placeholder element and store the iframe's contents in it. + // This is necessary because some browsers will wipe the iframe's contents // when it is removed from the DOM. String html = getHTML(); beforeInitPlaceholder = DOM.createDiv(); @@ -300,7 +298,7 @@ elem.__gwt_handler = function(evt) { if (elem.__listener) { - elem.__listener.@org.ourproject.kune.platf.client.ui.rte.RichTextArea::onBrowserEvent(Lcom/google/gwt/user/client/Event;)(evt); + [email protected]::onBrowserEvent(Lcom/google/gwt/user/client/Event;)(evt); } }; @@ -338,8 +336,7 @@ @Override protected void onElementInitialized() { - // Issue 1897: This method is called after a timeout, during which time - // the + // Issue 1897: This method is called after a timeout, during which time the // element might by detached. if (!initializing) { return; @@ -387,8 +384,7 @@ void execCommand(String cmd, String param) { if (isRichEditingActive(elem)) { - // When executing a command, focus the iframe first, since some - // commands + // When executing a command, focus the iframe first, since some commands // don't take properly when it's not focused. setFocus(true); execCommandAssumingFocus(cmd, param); @@ -405,8 +401,7 @@ boolean queryCommandState(String cmd) { if (isRichEditingActive(elem)) { - // When executing a command, focus the iframe first, since some - // commands + // When executing a command, focus the iframe first, since some commands // don't take properly when it's not focused. setFocus(true); return queryCommandStateAssumingFocus(cmd); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/AbstractRichTextAreaTest.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/AbstractRichTextAreaTest.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/AbstractRichTextAreaTest.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -24,18 +24,18 @@ import org.xwiki.gwt.dom.client.Range; import org.xwiki.gwt.dom.client.Selection; +import com.google.gwt.event.dom.client.HasLoadHandlers; +import com.google.gwt.event.dom.client.LoadEvent; +import com.google.gwt.event.dom.client.LoadHandler; import com.google.gwt.user.client.Timer; -import com.google.gwt.user.client.ui.LoadListener; import com.google.gwt.user.client.ui.RootPanel; -import com.google.gwt.user.client.ui.SourcesLoadEvents; -import com.google.gwt.user.client.ui.Widget; /** * Base class for tests running on a rich text area. * * @version $Id$ */ -public class AbstractRichTextAreaTest extends AbstractWysiwygClientTest implements LoadListener { +public class AbstractRichTextAreaTest extends AbstractWysiwygClientTest implements LoadHandler { /** * The number of milliseconds we delay the test finish. This delay is needed * because in some browsers the rich text area is initialized after a @@ -56,21 +56,7 @@ */ protected RichTextArea rta; - /** - * {@inheritDoc} - * - * @see LoadListener#onError(Widget) - */ - public void onError(Widget sender) { - // ignore - } - - /** - * {@inheritDoc} - * - * @see LoadListener#onLoad(Widget) - */ - public void onLoad(Widget sender) { + public void onLoad(final LoadEvent event) { // http://wiki.codetalks.org/wiki/index.php/Docs/Keyboard_navigable_JS_widgets // #Use_setTimeout_with_element.focus.28.29_to_set_focus (new Timer() { @@ -89,7 +75,7 @@ * The HTML fragment to be cleaned. * @return The input string in lower case, stripped of new lines. */ - protected String clean(String html) { + protected String clean(final String html) { return html.replaceAll("\r\n", "").toLowerCase(); } @@ -114,8 +100,8 @@ rta = new RichTextArea(); // Workaround till GWT provides a way to detect when the rich text // area has finished loading. - if (rta.getBasicFormatter() != null && rta.getBasicFormatter() instanceof SourcesLoadEvents) { - ((SourcesLoadEvents) rta.getBasicFormatter()).addLoadListener(this); + if (rta.getBasicFormatter() instanceof HasLoadHandlers) { + ((HasLoadHandlers) rta.getBasicFormatter()).addLoadHandler(this); } } RootPanel.get().add(rta); @@ -143,7 +129,7 @@ * the HTML fragment to be cleaned of non-breaking spaces * @return the input HTML fragment without any non-breaking spaces */ - protected String removeNonBreakingSpaces(String html) { + protected String removeNonBreakingSpaces(final String html) { return html.replace(" ", ""); } @@ -153,8 +139,8 @@ * @param range * The range to be selected. */ - protected void select(Range range) { - Selection selection = rta.getDocument().getSelection(); + protected void select(final Range range) { + final Selection selection = rta.getDocument().getSelection(); selection.removeAllRanges(); selection.addRange(range); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -12,7 +12,7 @@ public class InsertMediaAbstractPanel extends InsertElementAbstractPanel implements InsertMediaAbstractView { - protected transient TextField hrefField; + protected TextField hrefField; public InsertMediaAbstractPanel(final String title, final InsertMediaAbstractPresenter presenter) { super(title, InsertMediaDialogView.HEIGHT); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/occidental/AbstractInsertCharPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/occidental/AbstractInsertCharPanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/occidental/AbstractInsertCharPanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -1,30 +1,35 @@ package org.ourproject.kune.platf.client.ui.rte.insertspecialchar.occidental; +import org.ourproject.kune.platf.client.ui.dialogs.BasicPopupPanel; import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.InsertSpecialCharDialog; import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.InsertSpecialCharDialogView; -import com.allen_sauer.gwt.log.client.Log; -import com.google.gwt.user.client.ui.FocusListener; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.MouseOutEvent; +import com.google.gwt.event.dom.client.MouseOutHandler; +import com.google.gwt.event.dom.client.MouseOverEvent; +import com.google.gwt.event.dom.client.MouseOverHandler; import com.google.gwt.user.client.ui.Grid; import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.PushButton; -import com.google.gwt.user.client.ui.SourcesTableEvents; -import com.google.gwt.user.client.ui.TableListener; import com.google.gwt.user.client.ui.Widget; +import com.google.gwt.user.client.ui.HTMLTable.Cell; import com.gwtext.client.widgets.Panel; public class AbstractInsertCharPanel extends Panel { - private FocusListener focusListener; + private MouseOverHandler mouseOverhandler; + protected BasicPopupPanel popup; + private MouseOutHandler mouseOutHandler; - public AbstractInsertCharPanel(final InsertSpecialCharDialog insertSpecialCharDialog, final String title, - final String initialLabel, final char[] specialChars, final int rows, final int cols) { + public AbstractInsertCharPanel(final InsertSpecialCharDialog dialog, final String title, final String initialLabel, + final char[] specialChars, final int rows, final int cols) { super(title); setAutoWidth(true); setHeight(InsertSpecialCharDialogView.HEIGHT - 10); setPaddings(20); - Label label = new Label(initialLabel); + final Label label = new Label(initialLabel); label.addStyleName("kune-Margin-Medium-b"); add(label); final Grid grid = new Grid(rows, cols); @@ -32,17 +37,18 @@ int row; int col; - int n = 0; - for (char c : specialChars) { - row = n / cols; - col = n % cols; + int num = 0; + for (final char c : specialChars) { + row = num / cols; + col = num % cols; grid.setWidget(row, col, createButton(c)); - n++; + num++; } - grid.addTableListener(new TableListener() { - public void onCellClicked(final SourcesTableEvents sender, final int row, final int cell) { - if (sender.equals(grid)) { - insertSpecialCharDialog.onInsert(specialChars[row * cols + cell]); + grid.addClickHandler(new ClickHandler() { + public void onClick(final ClickEvent event) { + final Cell cell = grid.getCellForEvent(event); + if (cell != null) { + dialog.onInsert(specialChars[cell.getRowIndex() * cols + cell.getCellIndex()]); } } }); @@ -50,28 +56,30 @@ add(grid); } - private Widget createButton(final char c) { - PushButton button = new PushButton(); - button.setText("" + c); + private Widget createButton(final char character) { + final PushButton button = new PushButton(); + button.setText(String.valueOf(character)); button.setStyleName("k-specialchar-pb"); - if (focusListener == null) { - focusListener = new FocusListener() { - public void onFocus(final Widget sender) { - PopupPanel popup = new PopupPanel(true); - popup.setStyleName("k-specialchar-popup"); - Label characterLabel = new Label(sender.getElement().getInnerText()); + + if (mouseOverhandler == null) { + mouseOverhandler = new MouseOverHandler() { + public void onMouseOver(final MouseOverEvent event) { + popup = new BasicPopupPanel(true); + final Label characterLabel = new Label(event.getRelativeElement().getInnerText()); characterLabel.setStyleName("k-specialchar-big"); - popup.add(characterLabel); - popup.show(); - Log.info("Focus!!!!!"); + popup.setWidget(characterLabel); + popup.show(event.getClientX() + 10, event.getClientY() + 10); + popup.addStyleName("k-specialchar-popup"); } - - public void onLostFocus(final Widget sender) { + }; + mouseOutHandler = new MouseOutHandler() { + public void onMouseOut(final MouseOutEvent event) { + popup.hide(); } }; } - // button.addFocusListener(focusListener); + button.addMouseOverHandler(mouseOverhandler); + button.addMouseOutHandler(mouseOutHandler); return button; } - } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/utils/Url.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/utils/Url.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/client/utils/Url.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -23,8 +23,8 @@ import java.util.List; public class Url { - private transient final String base; - private transient final List<UrlParam> params; + private final String base; + private final List<UrlParam> params; public Url(final String base) { this.base = base; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -89,7 +89,7 @@ public String getUserAvatarBaser64(final String userHash, final StateToken userToken) throws DefaultException { final UserSession userSession = getUserSession(); final User user = userSession.getUser(); - Group userGroup = user.getUserGroup(); + final Group userGroup = user.getUserGroup(); if (!userGroup.getShortName().equals(userToken.getGroup())) { throw new AccessViolationException(); } @@ -138,7 +138,7 @@ final UserSession userSession = getUserSession(); final User user = userSession.getUser(); if (!groupToken.getGroup().equals(user.getShortName())) { - new AccessViolationException(); + throw new AccessViolationException(); } user.setBuddiesVisibility(UserBuddiesVisibility.valueOf(visibility.toString())); }; @@ -149,8 +149,7 @@ private UserInfoDTO loadUserInfo(final User user) throws DefaultException { final UserInfo userInfo = userInfoService.buildInfo(user, getUserSession().getHash()); - final UserInfoDTO map = mapper.map(userInfo, UserInfoDTO.class); - return map; + return mapper.map(userInfo, UserInfoDTO.class); } private UserInfoDTO loginUser(final User user) throws DefaultException { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -26,7 +26,8 @@ import org.ourproject.kune.platf.client.ui.RoundedPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Label; @@ -40,7 +41,7 @@ private final RoundedPanel messagePanel; private final IconLabel messageLabel; - public FoldableContentPanel(final WorkspaceSkeleton ws, I18nTranslationService i18n) { + public FoldableContentPanel(final WorkspaceSkeleton ws, final I18nTranslationService i18n) { super(ws); this.i18n = i18n; messageLabel = new IconLabel(Images.App.getInstance().info(), ""); @@ -50,31 +51,31 @@ messagePanel.addStyleName("kune-Margin-7-b"); } - public void setContent(String content, boolean showPreviewMsg) { + 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); } - public void setInfo(String info) { + public void setInfo(final String info) { setLabel(info); } - public void setInfoMessage(String text) { - VerticalPanel vp = createMessageVp(true); + public void setInfoMessage(final String text) { + final VerticalPanel vp = createMessageVp(true); messageLabel.setText(text); setWidgetAsContent(vp, true); } - public void setLabel(String text) { - Label label = new Label(text); + public void setLabel(final String text) { + final Label label = new Label(text); setDefStyle(label); setWidget(label); } public void setNoPreview() { - VerticalPanel vp = createMessageVp(true); + final VerticalPanel vp = createMessageVp(true); setNoPreviewLabelMsg(); setWidgetAsContent(vp, true); } @@ -85,14 +86,14 @@ setContent(html); } - public void setWidgetAsContent(final Widget widget, boolean setDefMargins) { + public void setWidgetAsContent(final Widget widget, final boolean setDefMargins) { if (setDefMargins) { widget.addStyleName(DEF_CONTENT_MARGINS_STYLE); } setContent(widget); } - public void showImage(String imageUrl, String imageResizedUrl, boolean showPreviewMsg) { + 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); @@ -102,14 +103,14 @@ setDefStyle(imgResized); imgOrig.addStyleName("kune-pointer"); imgResized.addStyleName("kune-pointer"); - imgResized.addClickListener(new ClickListener() { - public void onClick(Widget sender) { + imgResized.addClickHandler(new ClickHandler() { + public void onClick(final ClickEvent event) { imgResized.removeFromParent(); vp.add(imgOrig); } }); - imgOrig.addClickListener(new ClickListener() { - public void onClick(Widget sender) { + imgOrig.addClickHandler(new ClickHandler() { + public void onClick(final ClickEvent event) { imgOrig.removeFromParent(); vp.add(imgResized); } @@ -119,7 +120,7 @@ Image.prefetch(imageUrl); } - private VerticalPanel createMessageVp(boolean showMsg) { + private VerticalPanel createMessageVp(final boolean showMsg) { final VerticalPanel vp = new VerticalPanel(); if (showMsg) { setDefPreviewMsg(); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditor.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditor.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -23,7 +23,8 @@ import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; import com.google.gwt.user.client.Window; -import com.google.gwt.user.client.WindowCloseListener; +import com.google.gwt.user.client.Window.ClosingEvent; +import com.google.gwt.user.client.Window.ClosingHandler; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; import com.gwtext.client.widgets.BoxComponent; @@ -42,10 +43,11 @@ private final String fileMenuTitle; private final AbstractToolbar sndbar; - public ContentEditor(RTEditor editor, boolean autoSave, final I18nTranslationService i18n, - StateManager stateManager, SiteSignOutLink siteSignOutLink, DeferredCommandWrapper deferredCommandWrapper, - RTEImgResources imgResources, WorkspaceSkeleton ws, TimerWrapper timer, RTESavingEditorView view, - EntityTitle entityTitle) { + public ContentEditor(final RTEditor editor, final boolean autoSave, final I18nTranslationService i18n, + final StateManager stateManager, final SiteSignOutLink siteSignOutLink, + final DeferredCommandWrapper deferredCommandWrapper, final RTEImgResources imgResources, + final WorkspaceSkeleton ws, final TimerWrapper timer, final RTESavingEditorView view, + final EntityTitle entityTitle) { super(editor, autoSave, i18n, stateManager, deferredCommandWrapper, imgResources, timer); this.i18n = i18n; this.siteSignOutLink = siteSignOutLink; @@ -53,18 +55,13 @@ super.init(view); this.ws = ws; fileMenuTitle = i18n.t(RTESavingEditorPresenter.FILE_DEF_MENU_OPTION); - Window.addWindowCloseListener(new WindowCloseListener() { - public void onWindowClosed() { - } - - public String onWindowClosing() { + Window.addWindowClosingHandler(new ClosingHandler() { + public void onWindowClosing(final ClosingEvent event) { if (isSavePending()) { - return i18n.t("You have changes without save. Are you sure?"); + event.setMessage(i18n.t("You have changes without save. Are you sure?")); } // onDoSaveAndClose(); - return null; } - }); vp = new VerticalPanel(); basicEditor = super.getBasicEditor(); @@ -86,8 +83,8 @@ } @Override - public void edit(String html, Listener<String> onSave, Listener0 onEditCancelled) { - Toolbar contentTopBar = ws.getEntityWorkspace().getContentTopBar(); + public void edit(final String html, final Listener<String> onSave, final Listener0 onEditCancelled) { + final Toolbar contentTopBar = ws.getEntityWorkspace().getContentTopBar(); contentTopBar.removeAll(); contentTopBar.add((Widget) topbar); ws.getEntityWorkspace().setContent(vp); @@ -96,7 +93,7 @@ siteSignOutLink.addBeforeSignOut(getBeforeSavingListener()); } - public void setFileMenuTitle(String fileMenuTitleNew) { + public void setFileMenuTitle(final String fileMenuTitleNew) { basicEditor.getTopBar().setParentMenuTitle(RTEditor.TOPBAR, fileMenuTitle, null, fileMenuTitleNew); } @@ -108,7 +105,7 @@ } private void addContentActions() { - ActionToolbarMenuDescriptor<Object> rename = new ActionToolbarMenuDescriptor<Object>(AccessRolDTO.Editor, + final ActionToolbarMenuDescriptor<Object> rename = new ActionToolbarMenuDescriptor<Object>(AccessRolDTO.Editor, RTEditor.TOPBAR, new Listener0() { public void onEvent() { entityTitle.edit(); @@ -122,8 +119,8 @@ } private void adjHeight(final int height) { - int barHeight = sndbar.getOffsetHeight(); - int newHeight = height - 20 - barHeight; + final int barHeight = sndbar.getOffsetHeight(); + final int newHeight = height - 20 - barHeight; // Log.debug("Sndbar height: " + barHeight + " new height: " + // newHeight); editorPanel.adjustSize(newHeight); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -33,8 +33,8 @@ private static final int MEDIUM_NAME_LIMIT = 90; private static final int LARGE_NAME_LIMIT = 20; - private transient EntityHeaderView view; - private transient final Session session; + private EntityHeaderView view; + private final Session session; public EntityHeaderPresenter(final StateManager stateManager, final WsThemePresenter theme, final Session session) { this.session = session; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -6,8 +6,8 @@ import org.ourproject.kune.workspace.client.entityheader.EntityHeaderButton; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import com.google.gwt.user.client.ui.ClickListener; -import com.google.gwt.user.client.ui.Widget; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; public class MaxMinWorkspacePanel implements MaxMinWorkspaceView { @@ -17,20 +17,20 @@ private final EntityHeaderButton maxBtn; private final EntityHeaderButton minBtn; - public MaxMinWorkspacePanel(final MaxMinWorkspacePresenter presenter, WorkspaceSkeleton ws, Images images, - final EntityHeader entityHeader, I18nTranslationService i18n) { + public MaxMinWorkspacePanel(final MaxMinWorkspacePresenter presenter, final WorkspaceSkeleton ws, + final Images images, final EntityHeader entityHeader, final I18nTranslationService i18n) { this.ws = ws; maxBtn = new EntityHeaderButton("", images.arrowOut()); minBtn = new EntityHeaderButton("", images.arrowIn()); maxBtn.setTitle(i18n.t("Maximize the workspace")); minBtn.setTitle(i18n.t("Minimize the workspace")); - maxBtn.addClickListener(new ClickListener() { - public void onClick(Widget arg0) { + maxBtn.addClickHandler(new ClickHandler() { + public void onClick(final ClickEvent event) { presenter.onMaximize(); } }); - minBtn.addClickListener(new ClickListener() { - public void onClick(Widget arg0) { + minBtn.addClickHandler(new ClickHandler() { + public void onClick(final ClickEvent event) { presenter.onMinimize(); } }); @@ -41,11 +41,11 @@ entityHeader.addWidget(minBtn); } - public void setMaximized(boolean maximized) { + public void setMaximized(final boolean maximized) { ws.setMaximized(maximized); } - public void showMaxButton(boolean showMax) { + public void showMaxButton(final boolean showMax) { maxBtn.setVisible(showMax); minBtn.setVisible(!showMax); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -25,12 +25,15 @@ import org.ourproject.kune.platf.client.ui.SimpleToolbar; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.MouseOutEvent; +import com.google.gwt.event.dom.client.MouseOutHandler; +import com.google.gwt.event.dom.client.MouseOverEvent; +import com.google.gwt.event.dom.client.MouseOverHandler; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.MouseListenerAdapter; import com.google.gwt.user.client.ui.VerticalPanel; -import com.google.gwt.user.client.ui.Widget; import com.gwtext.client.core.Ext; import com.gwtext.client.core.ExtElement; @@ -55,29 +58,26 @@ licenseBar.add(licenseImage, VerticalPanel.ALIGN_TOP); licenseBar.add(licenseLabel); - final ClickListener clickListener = new ClickListener() { - public void onClick(final Widget arg0) { + final ClickHandler clickListener = new ClickHandler() { + public void onClick(final ClickEvent event) { presenter.onLicenseClick(); } }; - // licenseLabel.addClickListener(clickListener); - licenseImage.addClickListener(clickListener); + // licenseLabel.addClickHandler(clickListener); + licenseImage.addClickHandler(clickListener); - MouseListenerAdapter mouseListenerAdapter = new MouseListenerAdapter() { - @Override - public void onMouseEnter(final Widget sender) { + licenseImage.addMouseOutHandler(new MouseOutHandler() { + public void onMouseOut(final MouseOutEvent event) { + // fade(false); + } + }); + licenseImage.addMouseOverHandler(new MouseOverHandler() { + public void onMouseOver(final MouseOverEvent event) { fade(true); } + }); - @Override - public void onMouseLeave(final Widget sender) { - // fade(false); - } - }; - - licenseImage.addMouseListener(mouseListenerAdapter); - licenseLabel.addStyleName("kune-Margin-Large-l"); licenseLabel.setStyleName("k-elp-limg"); licenseImage.setStyleName("k-elp-limg"); @@ -98,7 +98,7 @@ } public void showLicense(final String groupName, final LicenseDTO licenseDTO) { - String licenseText = i18n.t("© [%s], under license: [%s]", groupName, licenseDTO.getLongName()); + final String licenseText = i18n.t("© [%s], under license: [%s]", groupName, licenseDTO.getLongName()); licenseLabel.setText(licenseText); // KuneUiUtils.setQuickTip(licenseLabel, licenseText); licenseImage.setUrl(licenseDTO.getImageUrl()); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFlags.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFlags.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFlags.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -24,8 +24,8 @@ import org.ourproject.kune.platf.client.ui.IconLabel; import org.ourproject.kune.platf.client.ui.KuneWindowUtils; -import com.google.gwt.user.client.ui.ClickListener; -import com.google.gwt.user.client.ui.Widget; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.gwtext.client.widgets.Panel; public class LicenseWizardFlags extends Panel { @@ -35,7 +35,7 @@ private final IconLabel nonCulturalWorks; private final IconLabel nonCommercialReasons; - public LicenseWizardFlags(Images images, I18nTranslationService i18n) { + public LicenseWizardFlags(final Images images, final I18nTranslationService i18n) { copyleft = new IconLabel(images.copyleft(), i18n.t("This is a copyleft license.")); nonCopyleft = new IconLabel(images.noCopyleft(), i18n.t("This is not a copyleft license.")); culturalWorks = new IconLabel(images.info(), i18n.t("This is appropriate for free cultural works.")); @@ -53,33 +53,34 @@ add(nonCommercialReasons); } - public void setCopyleft(boolean isCopyleft) { + public void setCopyleft(final boolean isCopyleft) { copyleft.setVisible(isCopyleft); nonCopyleft.setVisible(!isCopyleft); } - public void setCulturalWorks(boolean isAppropiateForCulturalWorks) { + public void setCulturalWorks(final boolean isAppropiateForCulturalWorks) { culturalWorks.setVisible(isAppropiateForCulturalWorks); nonCulturalWorks.setVisible(!isAppropiateForCulturalWorks); } - public void setNonComercial(boolean isNonComercial) { + public void setNonComercial(final boolean isNonComercial) { nonCommercialReasons.setVisible(isNonComercial); } - public void setVisible(boolean isCopyleft, boolean isAppropiateForCulturalWorks, boolean isNonComercial) { + public void setVisible(final boolean isCopyleft, final boolean isAppropiateForCulturalWorks, + final boolean isNonComercial) { setCopyleft(isCopyleft); setCulturalWorks(isAppropiateForCulturalWorks); setNonComercial(isNonComercial); } - private void addLink(IconLabel label, final String url) { - label.addClickListener(new ClickListener() { - public void onClick(Widget sender) { + private void addLink(final IconLabel label, final String url) { + label.addClickHandler(new ClickHandler() { + public void onClick(final ClickEvent event) { openWindow(url); } - private void openWindow(String url) { + private void openWindow(final String url) { KuneWindowUtils.open(url); } }); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -34,9 +34,9 @@ import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; -import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.Image; -import com.google.gwt.user.client.ui.Widget; import com.gwtext.client.core.EventObject; import com.gwtext.client.core.Position; import com.gwtext.client.widgets.Button; @@ -244,18 +244,18 @@ form.add(tags); licenseImage = new Image("images/lic/bysa80x15.png"); - licenseImage.addClickListener(new ClickListener() { - public void onClick(final Widget arg0) { + licenseImage.addClickHandler(new ClickHandler() { + public void onClick(final ClickEvent event) { KuneWindowUtils.open(license.getUrl()); } }); licenseImage.addStyleName("kune-pointer"); - Panel licenseImagePanel = new Panel(); + final Panel licenseImagePanel = new Panel(); // licenseImagePanel.setLayout(new FitLayout()); // licenseImagePanel.setWidth(80); licenseImagePanel.add(licenseImage); - Button changeLicenseButton = new Button(i18n.t("Change")); + final Button changeLicenseButton = new Button(i18n.t("Change")); changeLicenseButton.setTabIndex(5); changeLicenseButton.addListener(new ButtonListenerAdapter() { @Override @@ -269,12 +269,12 @@ }); changeLicenseButton.addClass("kune-Margin-Medium-trbl"); - Label licenseLabel = new Label(); + final Label licenseLabel = new Label(); licenseLabel.setHtml(i18n.t("Default license for this group:") + DefaultFormUtils.br()); form.add(licenseLabel); licenseLabel.setStyle(MARGIN_LEFT_105PX); - Panel licPanel = new Panel(); + final Panel licPanel = new Panel(); licPanel.setBorder(false); licPanel.setLayout(new HorizontalLayout(5)); licPanel.add(licenseImagePanel); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -42,12 +42,12 @@ public class NewGroupPresenter implements NewGroup { - private transient NewGroupView view; - private transient final I18nTranslationService i18n; - private transient final Session session; - private transient final StateManager stateManager; - private transient final Provider<GroupServiceAsync> groupService; - private transient boolean mustGoToPrevious; + private NewGroupView view; + private final I18nTranslationService i18n; + private final Session session; + private final StateManager stateManager; + private final Provider<GroupServiceAsync> groupService; + private boolean mustGoToPrevious; public NewGroupPresenter(final I18nTranslationService i18n, final Session session, final StateManager stateManager, final Provider<GroupServiceAsync> groupService) { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -27,8 +27,8 @@ import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.entityheader.EntityHeaderButton; -import com.google.gwt.user.client.ui.ClickListener; -import com.google.gwt.user.client.ui.Widget; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; public class EntityOptionsPanel extends AbstractTabbedDialogPanel implements EntityOptionsView { @@ -80,8 +80,8 @@ private void createOptionsButton() { optionsButton = new EntityHeaderButton("", images.emblemSystem()); - optionsButton.addClickListener(new ClickListener() { - public void onClick(final Widget arg0) { + optionsButton.addClickHandler(new ClickHandler() { + public void onClick(final ClickEvent event) { createAndShowItImpl(); } }); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -27,9 +27,9 @@ import org.ourproject.kune.workspace.client.options.EntityOptionsView; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.Image; -import com.google.gwt.user.client.ui.Widget; import com.gwtext.client.core.EventObject; import com.gwtext.client.core.Position; import com.gwtext.client.widgets.Button; @@ -43,31 +43,31 @@ private final Image licenseImage; public EntityOptionsDefLicensePanel(final EntityOptionsDefLicensePresenter presenter, final WorkspaceSkeleton ws, - I18nTranslationService i18n) { + final I18nTranslationService i18n) { super(i18n.t("License")); super.setIconCls("k-copyleft-icon"); super.setHeight(EntityOptionsView.HEIGHT); super.setFrame(true); super.getFormPanel().setButtonAlign(Position.LEFT); - Label intro = new Label(); + final Label intro = new Label(); intro.setHtml(i18n.t("This is the default license for all the contents of this group (you can also select another different license per content):") + DefaultFormUtils.brbr()); licenseImage = new Image(); - Panel imagePanel = new Panel(); + final Panel imagePanel = new Panel(); imagePanel.setBorder(false); imagePanel.add(licenseImage); - licenseImage.addClickListener(new ClickListener() { - public void onClick(Widget arg0) { + licenseImage.addClickHandler(new ClickHandler() { + public void onClick(final ClickEvent event) { presenter.onLicenseClick(); } }); licenseImage.addStyleName("kune-pointer"); - Button change = new Button(i18n.t("Change")); + final Button change = new Button(i18n.t("Change")); change.addListener(new ButtonListenerAdapter() { @Override - public void onClick(Button button, EventObject e) { + public void onClick(final Button button, final EventObject event) { presenter.onChange(); } }); @@ -81,7 +81,7 @@ } - public void setLicense(LicenseDTO defaultLicense) { + public void setLicense(final LicenseDTO defaultLicense) { licenseImage.setUrl(defaultLicense.getImageUrl()); KuneUiUtils.setQuickTip(licenseImage, defaultLicense.getLongName()); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -27,18 +27,18 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsThemePresenter; -import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.Widget; import com.gwtext.client.widgets.Panel; import com.gwtext.client.widgets.ToolbarButton; public class EntityOptionsPublicSpaceConfPanel extends Panel implements EntityOptionsPublicSpaceConfView { public EntityOptionsPublicSpaceConfPanel(final EntityOptionsPublicSpaceConfPresenter presenter, - final WorkspaceSkeleton ws, I18nTranslationService i18n, WsThemePresenter wsPresenter) { + final WorkspaceSkeleton ws, final I18nTranslationService i18n, final WsThemePresenter wsPresenter) { super.setTitle(i18n.t("Style")); super.setIconCls("k-colors-icon"); super.setAutoScroll(true); @@ -47,24 +47,25 @@ super.setFrame(true); super.setPaddings(10); - HorizontalPanel wsHP = new HorizontalPanel(); - Label wsThemeInfo = new Label(i18n.t("Change this workspace theme:")); - ToolbarButton toolbarWsChange = (ToolbarButton) wsPresenter.getView(); + final HorizontalPanel wsHP = new HorizontalPanel(); + final Label wsThemeInfo = new Label(i18n.t("Change this workspace theme:")); + final ToolbarButton toolbarWsChange = (ToolbarButton) wsPresenter.getView(); toolbarWsChange.addStyleName("kune-Margin-Medium-l"); wsHP.add(wsThemeInfo); wsHP.add(toolbarWsChange); add(wsHP); - Label wsInfo = new Label(i18n.t("Select and configure the public space theme of this group:")); + final Label wsInfo = new Label(i18n.t("Select and configure the public space theme of this group:")); wsInfo.addStyleName("kune-Margin-Medium-tb"); add(wsInfo); - FlowPanel stylesPanel = new FlowPanel(); + final FlowPanel stylesPanel = new FlowPanel(); for (int i = 1; i <= 6; i++) { - BasicThumb thumb = new BasicThumb("images/styles/styl" + i + ".png", "Style " + i, new ClickListener() { - public void onClick(Widget sender) { - NotifyUser.info(TextUtils.IN_DEVELOPMENT_P); - } - }); + final BasicThumb thumb = new BasicThumb("images/styles/styl" + i + ".png", "Style " + i, + new ClickHandler() { + public void onClick(final ClickEvent event) { + NotifyUser.info(TextUtils.IN_DEVELOPMENT_P); + } + }); thumb.setTooltip(i18n.t("Click to select and configure this theme")); add(thumb); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -23,15 +23,19 @@ import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.dom.client.Element; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.MouseOutEvent; +import com.google.gwt.event.dom.client.MouseOutHandler; +import com.google.gwt.event.dom.client.MouseOverEvent; +import com.google.gwt.event.dom.client.MouseOverHandler; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Grid; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.MouseListenerAdapter; -import com.google.gwt.user.client.ui.Widget; -public class RateItPanel extends Composite implements ClickListener, RateItView { +public class RateItPanel extends Composite implements ClickHandler, RateItView { private Grid rateGrid; private Image[] starImg; private Label rateDesc; @@ -41,7 +45,7 @@ private final I18nTranslationService i18n; public RateItPanel(final RateItPresenter presenter, final I18nTranslationService i18n, final WorkspaceSkeleton ws, - Images img) { + final Images img) { this.presenter = presenter; this.i18n = i18n; this.img = img; @@ -57,9 +61,10 @@ } } - public void onClick(final Widget sender) { + public void onClick(final ClickEvent event) { + final Element sender = event.getRelativeElement(); for (int i = 0; i < 5; i++) { - if (sender == starImg[i]) { + if (sender.equals(starImg[i].getElement())) { presenter.starClicked(i); } } @@ -90,22 +95,21 @@ starImg[i].addStyleName("rateit-star"); starImg[i].setStyleName("rateit-star"); starImg[i].setTitle(i18n.t("Click to rate this")); - starImg[i].addClickListener(this); - starImg[i].addMouseListener(new MouseListenerAdapter() { - @Override - public void onMouseEnter(final Widget sender) { + starImg[i].addClickHandler(this); + starImg[i].addMouseOutHandler(new MouseOutHandler() { + public void onMouseOut(final MouseOutEvent event) { + presenter.revertCurrentRate(); + } + }); + starImg[i].addMouseOverHandler(new MouseOverHandler() { + public void onMouseOver(final MouseOverEvent event) { + final Element sender = event.getRelativeElement(); for (int j = 0; j < 5; j++) { - if (sender == starImg[j]) { + if (sender.equals(starImg[j].getElement())) { presenter.starOver(j); } } - } - - @Override - public void onMouseLeave(final Widget sender) { - presenter.revertCurrentRate(); - } }); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/rate/Star.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/rate/Star.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/rate/Star.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -50,7 +50,7 @@ return stars; } - private transient AbstractImagePrototype image; + private AbstractImagePrototype image; public Star() { image = IMG.starGrey(); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -27,8 +27,8 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.allen_sauer.gwt.log.client.Log; +import com.google.gwt.event.dom.client.KeyCodes; import com.google.gwt.user.client.ui.HorizontalPanel; -import com.google.gwt.user.client.ui.KeyboardListener; import com.gwtext.client.core.EventObject; import com.gwtext.client.core.RegionPosition; import com.gwtext.client.data.FieldDef; @@ -190,7 +190,7 @@ @Override public void onSpecialKey(final Field field, final EventObject event) { - if (event.getKey() == KeyboardListener.KEY_ENTER) { + if (event.getKey() == KeyCodes.KEY_ENTER) { presenter.doSearch(field.getValueAsString()); } event.stopEvent(); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -26,10 +26,10 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.calclab.suco.client.events.Listener0; -import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.Widget; import com.gwtext.client.widgets.Component; import com.gwtext.client.widgets.Panel; import com.gwtext.client.widgets.event.WindowListenerAdapter; @@ -42,19 +42,16 @@ public static final String SIGN_IN_BUTTON_ID = "k-signinp-sib"; public static final String CREATE_ONE = "k-signinp-create"; public static final String SIGNIN_DIALOG = "k-signinp-dialog"; - static SignInForm signInForm; + private final SignInForm signInForm; private final SignInPresenter presenter; - public SignInPanel(final SignInPresenter presenter, I18nTranslationService i18n, final WorkspaceSkeleton ws, - Images images) { + public SignInPanel(final SignInPresenter presenter, final I18nTranslationService i18n, final WorkspaceSkeleton ws, + final Images images) { super(SIGNIN_DIALOG, i18n, i18n.t(PlatfMessages.SIGN_IN_TITLE), true, true, 340, 240, "", i18n.t(PlatfMessages.SIGN_IN_TITLE), SIGN_IN_BUTTON_ID, i18n.tWithNT("Cancel", "used in button"), CANCEL_BUTTON_ID, new Listener0() { public void onEvent() { - signInForm.validate(); - if (signInForm.isValid()) { - presenter.onFormSignIn(); - } + presenter.onFormSignIn(); } }, new Listener0() { public void onEvent() { @@ -65,17 +62,17 @@ super.addListener(new WindowListenerAdapter() { @Override - public void onHide(Component component) { + public void onHide(final Component component) { presenter.onClose(); } @Override - public void onShow(Component component) { + public void onShow(final Component component) { KuneUiUtils.focusOnField(getNickname()); } }); - Panel panel = new Panel(); + final Panel panel = new Panel(); panel.setBorder(false); signInForm = new SignInForm(presenter, i18n); signInForm.setWidth(310); @@ -104,24 +101,28 @@ signInForm.reset(); } + public void validate() { + signInForm.validate(); + } + private Panel createNoAccountRegister() { final Panel noAccRegisterPanel = new Panel(); noAccRegisterPanel.setBorder(false); noAccRegisterPanel.setMargins(0, 20, 0, 0); - HorizontalPanel hp = new HorizontalPanel(); - final Label dontHaveAccountLabel = new Label(i18n.t("Don't you have an account?")); + final HorizontalPanel hpanel = new HorizontalPanel(); + final Label dontHaveAccount = new Label(i18n.t("Don't you have an account?")); final Label registerLabel = new Label(i18n.t("Create one.")); registerLabel.ensureDebugId(CREATE_ONE); - registerLabel.addClickListener(new ClickListener() { - public void onClick(final Widget arg0) { + registerLabel.addClickHandler(new ClickHandler() { + public void onClick(final ClickEvent event) { presenter.onAccountRegister(); } }); registerLabel.addStyleName("kune-Margin-Medium-l"); registerLabel.addStyleName("kune-link"); - hp.add(dontHaveAccountLabel); - hp.add(registerLabel); - noAccRegisterPanel.add(hp); + hpanel.add(dontHaveAccount); + hpanel.add(registerLabel); + noAccRegisterPanel.add(hpanel); return noAccRegisterPanel; } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPresenter.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPresenter.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -38,27 +38,27 @@ public class SignInPresenter extends SignInAbstractPresenter implements SignIn { - SignInView view; - private final Provider<UserServiceAsync> userServiceProvider; + private SignInView view; + private final Provider<UserServiceAsync> userService; private final Provider<Register> registerProvider; public SignInPresenter(final Session session, final StateManager stateManager, final I18nUITranslationService i18n, - final Provider<UserServiceAsync> userServiceProvider, final Provider<Register> registerProvider) { + final Provider<UserServiceAsync> userService, final Provider<Register> registerProvider) { super(session, stateManager, i18n); - this.userServiceProvider = userServiceProvider; + this.userService = userService; this.registerProvider = registerProvider; } public void doSignIn() { registerProvider.get().hide(); - if (!session.isLogged()) { + if (session.isLogged()) { + stateManager.restorePreviousToken(); + } else { NotifyUser.showProgressProcessing(); view.show(); view.center(); NotifyUser.hideProgress(); view.focusOnNickname(); - } else { - stateManager.restorePreviousToken(); } } @@ -79,6 +79,7 @@ } public void onFormSignIn() { + view.validate(); if (view.isSignInFormValid()) { view.maskProcessing(); @@ -108,7 +109,7 @@ view.unMask(); } }; - userServiceProvider.get().login(user.getShortName(), user.getPassword(), callback); + userService.get().login(user.getShortName(), user.getPassword(), callback); } } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInView.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInView.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -51,4 +51,6 @@ void unMask(); + void validate(); + } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -26,9 +26,10 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.calclab.suco.client.ioc.Provider; -import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.dom.client.Element; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.PushButton; -import com.google.gwt.user.client.ui.Widget; import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.menu.BaseItem; import com.gwtext.client.widgets.menu.Item; @@ -50,8 +51,9 @@ ws.getSiteBar().addSpacer(); ws.getSiteBar().addSpacer(); final Menu optionsMenu = new Menu(); - optionsButton.addClickListener(new ClickListener() { - public void onClick(final Widget sender) { + optionsButton.addClickHandler(new ClickHandler() { + public void onClick(final ClickEvent event) { + final Element sender = event.getRelativeElement(); optionsMenu.showAt(sender.getAbsoluteLeft(), sender.getAbsoluteTop() + 10); } }); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteprogress/SiteProgressPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteprogress/SiteProgressPanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteprogress/SiteProgressPanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -41,8 +41,8 @@ public SiteProgressPanel(final SiteProgressPresenter presenter, final Provider<SitePublicSpaceLink> publicLinkProvider) { this.publicLinkProvider = publicLinkProvider; + progressText = RootPanel.get("kuneprogresstext"); progressPanel = RootPanel.get("kuneprogresspanel"); - progressText = RootPanel.get("kuneprogresstext"); timeProgressMaxTime = new Timer() { @Override public void run() { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -25,10 +25,10 @@ import org.ourproject.kune.platf.client.ui.IconLabel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.Window; -import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.HorizontalPanel; -import com.google.gwt.user.client.ui.Widget; public class SitePublicSpaceLinkPanel implements SitePublicSpaceLinkView { @@ -52,11 +52,11 @@ final AbstractToolbar siteBar = ws.getSiteBar(); siteBar.add(publicHP); siteBar.addFill(); - + publicUrl = ""; gotoPublic.addStyleName("kune-Margin-Medium-r"); setContentPublicImpl(true); - gotoPublic.addClickListener(new ClickListener() { - public void onClick(final Widget sender) { + gotoPublic.addClickHandler(new ClickHandler() { + public void onClick(final ClickEvent event) { gotoPublic(); } }); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -24,12 +24,17 @@ import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import com.google.gwt.user.client.ui.ClickListener; -import com.google.gwt.user.client.ui.FocusListener; -import com.google.gwt.user.client.ui.KeyboardListener; +import com.google.gwt.event.dom.client.BlurEvent; +import com.google.gwt.event.dom.client.BlurHandler; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.FocusEvent; +import com.google.gwt.event.dom.client.FocusHandler; +import com.google.gwt.event.dom.client.KeyCodes; +import com.google.gwt.event.dom.client.KeyUpEvent; +import com.google.gwt.event.dom.client.KeyUpHandler; import com.google.gwt.user.client.ui.PushButton; import com.google.gwt.user.client.ui.TextBox; -import com.google.gwt.user.client.ui.Widget; public class SiteSearchPanel implements SiteSearchView { private static final int SEARCH_TEXT_HEIGHT = 15; @@ -55,32 +60,25 @@ siteBar.add(searchTextBox); setTextSearchSmallImpl(); - searchTextBox.addFocusListener(new FocusListener() { - public void onFocus(final Widget arg0) { - presenter.onSearchFocus(); - } - - public void onLostFocus(final Widget arg0) { + searchTextBox.addBlurHandler(new BlurHandler() { + public void onBlur(final BlurEvent event) { presenter.onSearchLostFocus(searchTextBox.getText()); } }); - - searchButton.addClickListener(new ClickListener() { - public void onClick(final Widget arg0) { + searchTextBox.addFocusHandler(new FocusHandler() { + public void onFocus(final FocusEvent event) { + presenter.onSearchFocus(); + } + }); + searchButton.addClickHandler(new ClickHandler() { + public void onClick(final ClickEvent event) { NotifyUser.showProgressProcessing(); presenter.doSearch(searchTextBox.getText()); } }); - - searchTextBox.addKeyboardListener(new KeyboardListener() { - public void onKeyDown(final Widget arg0, final char arg1, final int arg2) { - } - - public void onKeyPress(final Widget arg0, final char arg1, final int arg2) { - } - - public void onKeyUp(final Widget widget, final char key, final int mod) { - if (key == KEY_ENTER) { + searchTextBox.addKeyUpHandler(new KeyUpHandler() { + public void onKeyUp(final KeyUpEvent event) { + if (event.getNativeKeyCode() == KeyCodes.KEY_ENTER) { if (searchTextBox.getText().length() > 0) { NotifyUser.showProgressProcessing(); presenter.doSearch(searchTextBox.getText()); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -23,9 +23,9 @@ import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.Widget; public class SiteSignOutLinkPanel implements SiteSignOutLinkView { @@ -40,8 +40,8 @@ signOutLabel.addStyleName("k-sitebar-labellink"); signOutLabel.ensureDebugId(SITE_SIGN_OUT); ws.getSiteBar().add(signOutLabel); - signOutLabel.addClickListener(new ClickListener() { - public void onClick(final Widget arg0) { + signOutLabel.addClickHandler(new ClickHandler() { + public void onClick(final ClickEvent event) { NotifyUser.showProgressProcessing(); presenter.doSignOut(); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPresenter.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPresenter.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -41,10 +41,10 @@ public class SiteSignOutLinkPresenter implements SiteSignOutLink { - private transient SiteSignOutLinkView view; - private transient final Session session; - private transient final Provider<UserServiceAsync> userService; - private transient final BeforeActionCollection beforeSignOut; + private SiteSignOutLinkView view; + private final Session session; + private final Provider<UserServiceAsync> userService; + private final BeforeActionCollection beforeSignOut; public SiteSignOutLinkPresenter(final Session session, final Provider<UserServiceAsync> userService, final Provider<ErrorHandler> errorHandler) { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -26,7 +26,9 @@ import org.ourproject.kune.platf.client.ui.MenuItemCollection; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.dom.client.Element; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.PushButton; import com.google.gwt.user.client.ui.Widget; import com.gwtext.client.core.EventObject; @@ -52,12 +54,13 @@ loggedUserMenu = new PushButton(""); loggedUserMenu.ensureDebugId(LOGGED_USER_MENU); loggedUserMenu.setStyleName("k-sitebar-labellink"); - AbstractToolbar siteBar = ws.getSiteBar(); + final AbstractToolbar siteBar = ws.getSiteBar(); siteBar.add(loggedUserMenu); separator = siteBar.addSeparator(); userMenu = new Menu(); - loggedUserMenu.addClickListener(new ClickListener() { - public void onClick(final Widget sender) { + loggedUserMenu.addClickHandler(new ClickHandler() { + public void onClick(final ClickEvent event) { + final Element sender = event.getRelativeElement(); userMenu.showAt(sender.getAbsoluteLeft(), sender.getAbsoluteTop() + 10); } }); @@ -99,7 +102,7 @@ for (final org.ourproject.kune.platf.client.ui.MenuItem<GroupDTO> groupItem : participateInGroups) { final Item item = new Item(groupItem.getTitle(), new BaseItemListenerAdapter() { @Override - public void onClick(BaseItem item, EventObject e) { + public void onClick(final BaseItem item, final EventObject e) { super.onClick(item, e); groupItem.fire(null); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Toolbar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Toolbar.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Toolbar.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -28,8 +28,8 @@ public class Toolbar { private static final String _100PC = "100%"; - private transient final Panel container; - private transient final HorizontalPanel childPanel; + private final Panel container; + private final HorizontalPanel childPanel; public Toolbar() { container = new Panel(); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -34,7 +34,9 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.calclab.suco.client.events.Listener; -import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.dom.client.Element; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.VerticalPanel; @@ -52,12 +54,13 @@ private final Label noBuddiesPublic; public BuddiesSummaryPanel(final BuddiesSummaryPresenter presenter, final WorkspaceSkeleton ws, - I18nTranslationService i18n, ActionManager actionManager, ActionToolbarView<UserSimpleDTO> actionToolbarView) { + final I18nTranslationService i18n, final ActionManager actionManager, + final ActionToolbarView<UserSimpleDTO> actionToolbarView) { super(i18n.t("Buddies"), i18n.t("This user buddies"), ws); this.actionManager = actionManager; menuItemsContainer = new MenuItemsContainer<UserSimpleDTO>(); this.i18n = i18n; - VerticalPanel vp = new VerticalPanel(); + final VerticalPanel vp = new VerticalPanel(); flowPanel = new FlowPanel(); otherBuddiesLabel = new Label(); otherBuddiesLabel.addStyleName("kune-Margin-Small-trbl"); @@ -73,11 +76,12 @@ noBuddiesPublic.addStyleName("k-text-gray"); } - public void addBuddie(final UserSimpleDTO user, ActionItemCollection<UserSimpleDTO> actionCollection, - String avatarUrl, String tooltipTitle, String tooltip) { - ClickListener listener = new ClickListener() { - public void onClick(Widget sender) { - Menu menu = menuItemsContainer.get(user.getShortName()); + public void addBuddie(final UserSimpleDTO user, final ActionItemCollection<UserSimpleDTO> actionCollection, + final String avatarUrl, final String tooltipTitle, final String tooltip) { + final ClickHandler listener = new ClickHandler() { + public void onClick(final ClickEvent event) { + final Element sender = event.getRelativeElement(); + final Menu menu = menuItemsContainer.get(user.getShortName()); if (menu.getItems().length > 0) { menu.showAt(sender.getAbsoluteLeft(), sender.getAbsoluteTop() + 5); } @@ -85,13 +89,13 @@ }; menuItemsContainer.createItemMenu(user.getShortName(), actionCollection, new Listener<ActionItem<UserSimpleDTO>>() { - public void onEvent(ActionItem<UserSimpleDTO> actionItem) { + public void onEvent(final ActionItem<UserSimpleDTO> actionItem) { doAction(actionItem); } }); - BasicThumb thumb = new BasicThumb(avatarUrl.equals(NOAVATAR) ? "images/persons/person2-32.png" : avatarUrl, - AVATARSIZE, user.getShortName(), AVATARLABELMAXSIZE, false, listener); + final BasicThumb thumb = new BasicThumb(avatarUrl.equals(NOAVATAR) ? "images/persons/person2-32.png" + : avatarUrl, AVATARSIZE, user.getShortName(), AVATARLABELMAXSIZE, false, listener); thumb.setTooltip(tooltipTitle, tooltip); flowPanel.add(thumb); } @@ -113,7 +117,7 @@ otherBuddiesLabel.setText(i18n.t("This user has no buddies")); } - public void setOtherUsers(String text) { + public void setOtherUsers(final String text) { otherBuddiesLabel.setText(text); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddiePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddiePanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddiePanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -5,19 +5,19 @@ import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.entityheader.EntityHeaderButton; -import com.google.gwt.user.client.ui.ClickListener; -import com.google.gwt.user.client.ui.Widget; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; public class AddAsBuddiePanel implements AddAsBuddieView { public static final String ADD_BUDDIE_BUTTON = "k-aabp-bt"; private final EntityHeaderButton button; - public AddAsBuddiePanel(final AddAsBuddiePresenter presenter, final EntityHeader entityHeader, Images images, - I18nTranslationService i18n) { + public AddAsBuddiePanel(final AddAsBuddiePresenter presenter, final EntityHeader entityHeader, final Images images, + final I18nTranslationService i18n) { button = new EntityHeaderButton(images.addGreen(), i18n.t("Add as a buddie")); - button.addClickListener(new ClickListener() { - public void onClick(Widget arg0) { + button.addClickHandler(new ClickHandler() { + public void onClick(final ClickEvent event) { presenter.onAdd(); } }); @@ -27,7 +27,7 @@ entityHeader.addWidget(button); } - public void setVisible(boolean visible) { + public void setVisible(final boolean visible) { button.setVisible(visible); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -25,11 +25,11 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsTheme; -import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.VerticalPanel; -import com.google.gwt.user.client.ui.Widget; public class TagsSummaryPanel extends SummaryPanel implements TagsSummaryView { @@ -54,7 +54,7 @@ addInSummary(); } - public void addTag(final String name, Long count, String style) { + public void addTag(final String name, final Long count, final String style) { final Label label = new Label(name); // i18n pluralization if (count > 1) { @@ -62,8 +62,8 @@ } else { KuneUiUtils.setQuickTip(label, i18n.t("There are [%d] item with this tag", count)); } - label.addClickListener(new ClickListener() { - public void onClick(final Widget sender) { + label.addClickHandler(new ClickHandler() { + public void onClick(final ClickEvent event) { presenter.doSearchTag(name); } }); @@ -77,7 +77,7 @@ flowPanel.clear(); } - public void setTheme(WsTheme oldTheme, WsTheme newTheme) { + public void setTheme(final WsTheme oldTheme, final WsTheme newTheme) { // TODO Auto-generated method stub } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -41,9 +41,9 @@ private static final int MINSIZE = 11; private static final int MAXSIZE = 26; - private transient TagsSummaryView view; - private transient final Provider<SiteSearcher> searcherProvider; - private transient final Session session; + private TagsSummaryView view; + private final Provider<SiteSearcher> searcherProvider; + private final Session session; public TagsSummaryPresenter(final Session session, final Provider<SiteSearcher> searcherProvider, final StateManager stateManager, final WsThemePresenter wsThemePresenter) { Modified: trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/src/main/webapp/WEB-INF/web.xml 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/main/webapp/WEB-INF/web.xml 2009-06-08 02:40:16 UTC (rev 1117) @@ -6,13 +6,19 @@ <display-name>ws</display-name> <description>kune workspace</description> + <!-- Default page to serve --> + <welcome-file-list> + <welcome-file>ws.html</welcome-file> + </welcome-file-list> + <context-param> <param-name>jruby.standalone</param-name> <param-value>true</param-value> </context-param> <context-param> <param-name>rails.root</param-name> - <param-value>/WEB-INF/publicspace/</param-value> + <param-value>/WEB-INF/publicspace/ + </param-value> </context-param> <context-param> <param-name>files.prefix</param-name> @@ -55,13 +61,13 @@ <filter-name>rack</filter-name> <filter-class> org.ourproject.kune.rack.RackServletFilter - </filter-class> + </filter-class> <init-param> <param-name>org.ourproject.kune.rack.RackModule </param-name> <param-value> org.ourproject.kune.app.server.KuneRackModule - </param-value> + </param-value> </init-param> </filter> @@ -91,4 +97,28 @@ <servlet-name>Proxy</servlet-name> <url-pattern>/http-bind/</url-pattern> </servlet-mapping> + <servlet> + <servlet-name>remoteLoggerServiceImpl + </servlet-name> + <servlet-class> + com.allen_sauer.gwt.log.server.RemoteLoggerServiceImpl + </servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>remoteLoggerServiceImpl + </servlet-name> + <url-pattern>/ws/gwt-log</url-pattern> + </servlet-mapping> + +<!-- + <servlet> + <servlet-name>jUnitHostImpl</servlet-name> + <servlet-class>com.google.gwt.junit.server.JUnitHostImpl + </servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>jUnitHostImpl</servlet-name> + <url-pattern>/ws/junithost</url-pattern> + </servlet-mapping> + --> </web-app> Added: trunk/src/main/webapp/lib/gwt-log-2.5.3.jar =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/lib/gwt-log-2.5.3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/lib/gwt-servlet-1.6.4.jar =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/lib/gwt-servlet-1.6.4.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/lib/gwt-servlet.jar =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/lib/gwt-servlet.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/lib/gwt-user-1.6.4.jar =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/lib/gwt-user-1.6.4.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionShortcutTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionShortcutTest.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionShortcutTest.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -7,19 +7,18 @@ import org.junit.Test; import org.ourproject.kune.platf.client.i18n.I18nTranslationServiceMocked; import org.ourproject.kune.platf.client.i18n.Resources; +import org.ourproject.kune.platf.client.shortcuts.Keyboard; import org.ourproject.kune.platf.client.shortcuts.ShortcutDescriptor; -import com.google.gwt.user.client.ui.KeyboardListener; - public class ActionShortcutTest { @Test public void altS() { - ShortcutDescriptor shortcut = new ShortcutDescriptor(false, true, false, 'S', null); + final ShortcutDescriptor shortcut = new ShortcutDescriptor(false, true, false, 'S', null); assertEquals(" (Alt+S)", shortcut.toString()); - assertTrue(shortcut.is('S', KeyboardListener.MODIFIER_ALT)); - assertTrue(!shortcut.is('S', KeyboardListener.MODIFIER_CTRL)); - assertTrue(!shortcut.is('S', KeyboardListener.MODIFIER_SHIFT)); + assertTrue(shortcut.is('S', Keyboard.MODIFIER_ALT)); + assertTrue(!shortcut.is('S', Keyboard.MODIFIER_CTRL)); + assertTrue(!shortcut.is('S', Keyboard.MODIFIER_SHIFT)); } @Before @@ -29,36 +28,36 @@ @Test public void ctrlComa() { - ShortcutDescriptor shortcut = new ShortcutDescriptor(true, ','); + final ShortcutDescriptor shortcut = new ShortcutDescriptor(true, ','); assertEquals(" (Ctrl+,)", shortcut.toString()); - assertTrue(shortcut.is(',', KeyboardListener.MODIFIER_CTRL)); - assertTrue(!shortcut.is(',', KeyboardListener.MODIFIER_ALT)); - assertTrue(!shortcut.is(',', KeyboardListener.MODIFIER_SHIFT)); + assertTrue(shortcut.is(',', Keyboard.MODIFIER_CTRL)); + assertTrue(!shortcut.is(',', Keyboard.MODIFIER_ALT)); + assertTrue(!shortcut.is(',', Keyboard.MODIFIER_SHIFT)); } @Test public void ctrlS() { - ShortcutDescriptor shortcut = new ShortcutDescriptor(true, 's'); + final ShortcutDescriptor shortcut = new ShortcutDescriptor(true, 's'); assertEquals(" (Ctrl+S)", shortcut.toString()); - assertTrue(shortcut.is('s', KeyboardListener.MODIFIER_CTRL)); - assertTrue(!shortcut.is('s', KeyboardListener.MODIFIER_ALT)); - assertTrue(!shortcut.is('s', KeyboardListener.MODIFIER_SHIFT)); + assertTrue(shortcut.is('s', Keyboard.MODIFIER_CTRL)); + assertTrue(!shortcut.is('s', Keyboard.MODIFIER_ALT)); + assertTrue(!shortcut.is('s', Keyboard.MODIFIER_SHIFT)); } @Test public void ctrlSCapital() { - ShortcutDescriptor shortcut = new ShortcutDescriptor(true, 'S'); + final ShortcutDescriptor shortcut = new ShortcutDescriptor(true, 'S'); assertEquals(" (Ctrl+S)", shortcut.toString()); - assertTrue(shortcut.is('S', KeyboardListener.MODIFIER_CTRL)); - assertTrue(!shortcut.is('S', KeyboardListener.MODIFIER_ALT)); - assertTrue(!shortcut.is('S', KeyboardListener.MODIFIER_SHIFT)); + assertTrue(shortcut.is('S', Keyboard.MODIFIER_CTRL)); + assertTrue(!shortcut.is('S', Keyboard.MODIFIER_ALT)); + assertTrue(!shortcut.is('S', Keyboard.MODIFIER_SHIFT)); } @Test public void ctrlShiftS() { - ShortcutDescriptor shortcut = new ShortcutDescriptor(true, false, true, 'S', null); + final ShortcutDescriptor shortcut = new ShortcutDescriptor(true, false, true, 'S', null); assertEquals(" (Ctrl+Shift+S)", shortcut.toString()); - assertTrue(!shortcut.is('S', KeyboardListener.MODIFIER_ALT)); - assertTrue(shortcut.is('S', KeyboardListener.MODIFIER_SHIFT | KeyboardListener.MODIFIER_CTRL)); + assertTrue(!shortcut.is('S', Keyboard.MODIFIER_ALT)); + assertTrue(shortcut.is('S', Keyboard.MODIFIER_SHIFT | Keyboard.MODIFIER_CTRL)); } } Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentCommentServiceTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentCommentServiceTest.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentCommentServiceTest.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -12,7 +12,6 @@ public class ContentCommentServiceTest extends ContentServiceIntegrationTest { - String groupName; private StateContainerDTO defaultContent; @Test @@ -36,7 +35,6 @@ @Before public void init() throws Exception { new IntegrationTestHelper(this); - groupName = getDefSiteGroupName(); defaultContent = getSiteDefaultContent(); } Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceAddTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceAddTest.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceAddTest.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -23,13 +23,11 @@ public class ContentServiceAddTest extends ContentServiceIntegrationTest { - String groupName; private StateContentDTO defaultContent; @Before public void init() throws Exception { new IntegrationTestHelper(this); - groupName = getDefSiteGroupName(); } @Test(expected = UserMustBeLoggedException.class) @@ -126,14 +124,14 @@ public void testAddWikiContent() throws Exception { doLogin(); - StateToken wikiToken = new StateToken(super.getDefSiteGroupName(), WikiServerTool.NAME); - StateContainerDTO wiki = (StateContainerDTO) contentService.getContent(session.getHash(), wikiToken); + final StateToken wikiToken = new StateToken(super.getDefSiteGroupName(), WikiServerTool.NAME); + final StateContainerDTO wiki = (StateContainerDTO) contentService.getContent(session.getHash(), wikiToken); final String title = "New wikipage"; final StateContentDTO added = contentService.addContent(session.getHash(), wiki.getStateToken(), title, WikiServerTool.TYPE_WIKIPAGE); assertNotNull(added); - ContainerDTO wikiContainer = added.getContainer(); + final ContainerDTO wikiContainer = added.getContainer(); final List<ContentSimpleDTO> contents = wikiContainer.getContents(); assertEquals(title, added.getTitle()); assertEquals(2, contents.size()); Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -90,7 +90,7 @@ final StateToken folderToken = new StateToken(groupShortName, defaultContent.getStateToken().getTool(), newFolder.getId().toString(), null); - StateAbstractDTO result = contentService.renameContainer(getHash(), folderToken, newTitle); + final StateAbstractDTO result = contentService.renameContainer(getHash(), folderToken, newTitle); assertEquals(newTitle, result.getTitle()); @@ -102,7 +102,7 @@ newTitle = "folder last name"; - result = contentService.renameContainer(getHash(), newFolderToken, newTitle); + contentService.renameContainer(getHash(), newFolderToken, newTitle); folderAgain = (StateContainerDTO) contentService.getContent(getHash(), newFolderToken); @@ -150,7 +150,8 @@ @Test public void setTagsAndResults() throws Exception { contentService.setTags(getHash(), defaultContent.getStateToken(), "bfoo cfoa afoo2"); - TagCloudResultDTO cloudResultDTO = contentService.getSummaryTags(getHash(), defaultContent.getStateToken()); + final TagCloudResultDTO cloudResultDTO = contentService.getSummaryTags(getHash(), + defaultContent.getStateToken()); checkResult(cloudResultDTO); checkResult(((StateContentDTO) contentService.getContent(getHash(), defaultContent.getStateToken())).getTagCloudResult()); } @@ -207,7 +208,7 @@ private void checkResult(final TagCloudResultDTO cloudResultDTO) { assertNotNull(cloudResultDTO.getTagCountList()); - List<TagCountDTO> summaryTags = cloudResultDTO.getTagCountList(); + final List<TagCountDTO> summaryTags = cloudResultDTO.getTagCountList(); assertEquals(3, summaryTags.size()); TagCountDTO tagResultDTO = summaryTags.get(0); Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/selenium/KuneSeleniumTestHelper.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/selenium/KuneSeleniumTestHelper.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/selenium/KuneSeleniumTestHelper.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -55,7 +55,8 @@ selenium.refresh(); selenium.windowMaximize(); } catch (final UnsupportedOperationException e) { - new ServerException("Seems that selenium server is not running; run before: 'mvn selenium:start-server' "); + throw new ServerException( + "Seems that selenium server is not running; run before: 'mvn selenium:start-server' "); } } @@ -86,7 +87,7 @@ } protected long genPrefix() { - long prefix = new Date().getTime(); + final long prefix = new Date().getTime(); return prefix; } @@ -98,7 +99,7 @@ protected void newGroupRegistrationDefLicense(final String shortname, final String longName, final String description, final String tags) throws Exception { - GroupType organization = GroupType.ORGANIZATION; + final GroupType organization = GroupType.ORGANIZATION; signInAndNewGroup(); fillNewGroup1stPage(shortname, longName, description, tags, organization); click(NewGroupPanel.REGISTER_BUTTON); @@ -118,7 +119,7 @@ selenium.setTimeout("0"); super.open(url); selenium.setTimeout("30"); - } catch (SeleniumException e) { + } catch (final SeleniumException e) { // TODO Auto-generated method stub } } @@ -161,7 +162,7 @@ } protected String registerValidUser(final boolean wantHomepage) { - String shortName = "u" + genPrefix(); + final String shortName = "u" + genPrefix(); register(shortName, "some name " + genPrefix(), "somepasswd", "somepasswd", genPrefix() + "@example.com", "Andorra", "English", "MET", wantHomepage); return shortName; Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/selenium/SeleniumTestHelper.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/selenium/SeleniumTestHelper.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/selenium/SeleniumTestHelper.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -86,8 +86,8 @@ try { selenium.open(url); } catch (final UnsupportedOperationException e) { - new ServerException("Seems that selenium server is not running; run before: 'mvn selenium:start-server' ", - e); + throw new ServerException( + "Seems that selenium server is not running; run before: 'mvn selenium:start-server' ", e); } } @@ -102,7 +102,7 @@ protected void wait(final int milliseconds) { try { Thread.sleep(milliseconds); - } catch (InterruptedException e) { + } catch (final InterruptedException e) { // TODO Auto-generated catch block e.printStackTrace(); } @@ -114,11 +114,11 @@ fail("timeout"); } try { - String selText = selenium.getText(id); + final String selText = selenium.getText(id); if (selText.indexOf(text) >= 0) { break; } - } catch (Exception e) { + } catch (final Exception e) { } Thread.sleep(1000); } @@ -133,7 +133,7 @@ if (selenium.getText(id).matches(text)) { break; } - } catch (Exception e) { + } catch (final Exception e) { } Thread.sleep(1000); } Deleted: trunk/src/test/java/org/ourproject/kune/platf/server/content/ContentManagerDefaultTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/content/ContentManagerDefaultTest.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/test/java/org/ourproject/kune/platf/server/content/ContentManagerDefaultTest.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -1,12 +0,0 @@ -package org.ourproject.kune.platf.server.content; - -public class ContentManagerDefaultTest {// extends PersistenceTest { - - ContentManagerDefault manager; - - // @Before - public void before() { - manager = new ContentManagerDefault(null, null, null, null, null, null, null); - } - -} Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -20,8 +20,6 @@ import com.google.inject.Inject; public class UserManagerTest extends PersistencePreLoadedDataTest { - - User userFinder; @Inject Group groupFinder; @@ -87,7 +85,7 @@ public void userSearch() throws Exception, ParseException { userManager.reIndex(); final SearchResult<User> result = userManager.search(USER_SHORT_NAME); - assertEquals(1, (long) result.getSize()); + assertEquals(1, result.getSize()); assertEquals(USER_SHORT_NAME, result.getList().get(0).getShortName()); rollbackTransaction(); } Modified: trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java 2009-06-08 02:40:16 UTC (rev 1117) @@ -57,7 +57,7 @@ @Test public void groupHasLogo() { - Group group = new Group("test", "this is a test"); + final Group group = new Group("test", "this is a test"); GroupDTO groupDTO = mapper.map(group, GroupDTO.class); assertFalse(group.hasLogo()); assertFalse(groupDTO.hasLogo()); @@ -181,7 +181,7 @@ assertEquals(expectedToken, dto.getStateToken()); final ContainerDTO dtoChild = mapper.map(containerChild, ContainerDTO.class); - assertTrue(dtoChild.getAbsolutePath()[0] instanceof ContainerSimpleDTO); + assertNotNull(dtoChild.getAbsolutePath()[0]); } @Test @@ -240,21 +240,21 @@ @Test public void testSnResultMap() { - Group group = new Group("test", "this is a test"); - SocialNetwork sn = new SocialNetwork(); + final Group group = new Group("test", "this is a test"); + final SocialNetwork sn = new SocialNetwork(); sn.addAdmin(group); - ParticipationData part = new ParticipationData(); + final ParticipationData part = new ParticipationData(); part.setGroupsIsAdmin(sn.getAccessLists().getAdmins().getList()); - UserBuddiesData budData = new UserBuddiesData(); - ArrayList<User> buddies = new ArrayList<User>(); + final UserBuddiesData budData = new UserBuddiesData(); + final ArrayList<User> buddies = new ArrayList<User>(); final User user = new User(); user.setShortName("usertest"); user.setUserGroup(new Group("test2", "this is test2")); buddies.add(user); budData.setBuddies(buddies); - SocialNetworkData snResult = new SocialNetworkData(SocialNetworkVisibility.onlymembers, sn, part, + final SocialNetworkData snResult = new SocialNetworkData(SocialNetworkVisibility.onlymembers, sn, part, UserBuddiesVisibility.onlyyou, budData, new AccessRights(false, false, true), true, true); - SocialNetworkDataDTO map = mapper.map(snResult, SocialNetworkDataDTO.class); + final SocialNetworkDataDTO map = mapper.map(snResult, SocialNetworkDataDTO.class); assertNotNull(map); assertEquals(SocialNetworkVisibilityDTO.onlymembers, map.getSocialNetworkVisibility()); assertEquals(UserBuddiesVisibilityDTO.onlyyou, map.getUserBuddiesVisibility()); Property changes on: trunk/war ___________________________________________________________________ Name: svn:ignore + .generated ws Property changes on: trunk/war/WEB-INF ___________________________________________________________________ Name: svn:ignore + classes test-classes Added: trunk/war/WEB-INF/lib/gwt-log-2.5.3.jar =================================================================== (Binary files differ) Property changes on: trunk/war/WEB-INF/lib/gwt-log-2.5.3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/war/WEB-INF/lib/gwt-servlet-1.6.4.jar =================================================================== (Binary files differ) Property changes on: trunk/war/WEB-INF/lib/gwt-servlet-1.6.4.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/war/WEB-INF/lib/gwt-servlet.jar =================================================================== (Binary files differ) Property changes on: trunk/war/WEB-INF/lib/gwt-servlet.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/war/WEB-INF/lib/gwt-user-1.6.4.jar =================================================================== (Binary files differ) Property changes on: trunk/war/WEB-INF/lib/gwt-user-1.6.4.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/war/WEB-INF/web.xml =================================================================== --- trunk/war/WEB-INF/web.xml 2009-05-29 23:30:06 UTC (rev 1116) +++ trunk/war/WEB-INF/web.xml 2009-06-08 02:40:16 UTC (rev 1117) @@ -0,0 +1,123 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + <display-name>ws</display-name> + <description>kune workspace</description> + + <!-- Default page to serve --> + <welcome-file-list> + <welcome-file>ws.html</welcome-file> + </welcome-file-list> + + <context-param> + <param-name>jruby.standalone</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>rails.root</param-name> + <param-value>/WEB-INF/publicspace/ + </param-value> + </context-param> + <context-param> + <param-name>files.prefix</param-name> + <param-value>/WEB-INF/publicspace/public + </param-value> + </context-param> + <context-param> + <param-name>rails.env</param-name> + <param-value>production</param-value> + </context-param> + + <context-param> + <param-name>jruby.max.runtimes</param-name> + <param-value>1</param-value> + </context-param> + + <context-param> + <param-name>public.root</param-name> + <param-value>/public/</param-value> + </context-param> + + + <filter> + <filter-name>RackFilter</filter-name> + <filter-class>org.jruby.rack.RackFilter + </filter-class> + </filter> + <filter-mapping> + <filter-name>RackFilter</filter-name> + <url-pattern>/public/*</url-pattern> + </filter-mapping> + + <listener> + <listener-class>org.jruby.rack.rails.RailsServletContextListener + </listener-class> + </listener> + + + <filter> + <filter-name>rack</filter-name> + <filter-class> + org.ourproject.kune.rack.RackServletFilter + </filter-class> + <init-param> + <param-name>org.ourproject.kune.rack.RackModule + </param-name> + <param-value> + org.ourproject.kune.app.server.KuneRackModule + </param-value> + </init-param> + </filter> + + <filter-mapping> + <filter-name>rack</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <servlet> + <servlet-name>Proxy</servlet-name> + <servlet-class>de.spieleck.servlets.ProxyServlet + </servlet-class> + <init-param> + <param-name>remotePath</param-name> + <param-value>/http-bind/</param-value> + </init-param> + <init-param> + <param-name>remoteServer</param-name> + <param-value>localhost</param-value> + </init-param> + <init-param> + <param-name>remotePort</param-name> + <param-value>5280</param-value> + </init-param> + </servlet> + <servlet-mapping> + <servlet-name>Proxy</servlet-name> + <url-pattern>/http-bind/</url-pattern> + </servlet-mapping> + <servlet> + <servlet-name>remoteLoggerServiceImpl + </servlet-name> + <servlet-class> + com.allen_sauer.gwt.log.server.RemoteLoggerServiceImpl + </servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>remoteLoggerServiceImpl + </servlet-name> + <url-pattern>/ws/gwt-log</url-pattern> + </servlet-mapping> + + <servlet> + <servlet-name>jUnitHostImpl</servlet-name> + <servlet-class>com.google.gwt.junit.server.JUnitHostImpl + </servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>jUnitHostImpl</servlet-name> + <url-pattern>/ws/junithost</url-pattern> + </servlet-mapping> + +</web-app>