Author: vjrj_ Date: 2011-01-29 04:38:12 +0100 (Sat, 29 Jan 2011) New Revision: 1227 Added: trunk/README_FIRST trunk/src/main/java/cc/kune/chat/ trunk/src/main/java/cc/kune/chat/Chat.gwt.xml trunk/src/main/java/cc/kune/chat/client/ trunk/src/main/java/cc/kune/chat/client/ChatClient.java trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java trunk/src/main/java/cc/kune/chat/client/ShowChatDialogEvent.java trunk/src/main/java/cc/kune/chat/client/ToggleShowChatDialogEvent.java trunk/src/main/java/cc/kune/common/client/actions/ui/ActionSimplePanel.java trunk/src/main/java/cc/kune/common/client/ui/AbstractAtBorderPopupPanel.java trunk/src/main/java/cc/kune/common/client/ui/PopupBottomPanel.java trunk/src/main/java/cc/kune/common/client/ui/PopupTopPanel.java trunk/src/main/java/cc/kune/core/client/logs/Log.java trunk/src/main/java/cc/kune/core/client/resources/icons/ trunk/src/main/java/cc/kune/core/client/resources/icons/IconBorrarCssResource.java trunk/src/main/java/cc/kune/core/client/resources/icons/IconConstants.java trunk/src/main/java/cc/kune/core/client/resources/icons/IconResources.java trunk/src/main/java/cc/kune/core/client/resources/icons/add-green.png trunk/src/main/java/cc/kune/core/client/resources/icons/arrow_in.png trunk/src/main/java/cc/kune/core/client/resources/icons/arrow_out.png trunk/src/main/java/cc/kune/core/client/resources/icons/bug.png trunk/src/main/java/cc/kune/core/client/resources/icons/del-green.png trunk/src/main/java/cc/kune/core/client/resources/icons/e-icon.gif trunk/src/main/java/cc/kune/core/client/resources/icons/group-home.png trunk/src/main/java/cc/kune/core/client/resources/icons/info.png trunk/src/main/java/cc/kune/core/client/resources/icons/kicon.css trunk/src/main/java/cc/kune/core/client/resources/icons/kune-icon16.png trunk/src/main/java/cc/kune/core/client/resources/icons/language.png trunk/src/main/java/cc/kune/core/client/resources/icons/prefs.png trunk/src/main/java/cc/kune/core/client/state/GroupChangedEvent.java trunk/src/main/java/cc/kune/core/client/state/SocialNetworkChangedEvent.java trunk/src/main/java/cc/kune/core/client/state/StateChangedEvent.java trunk/src/main/java/cc/kune/core/client/state/ToolChangedEvent.java Removed: trunk/pom.xml.dic11 trunk/pom.xml.net trunk/src/main/java/cc/kune/common/client/ui/PopupPanelBottomCentered.java trunk/src/main/java/cc/kune/common/client/ui/PopupPanelTopCentered.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/IconCssResource.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgConstants.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgCssResource.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgResources.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/add-green.png trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/arrow_in.png trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/arrow_out.png trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/bug.png trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/del-green.png trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/group-home.png trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/info.png trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/kimg.css trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/kune-icon16.png trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/language.png trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/prefs.png trunk/src/main/java/org/ourproject/kune/workspace/client/wave/ Modified: trunk/.classpath trunk/pom.xml trunk/script/mvn-eclipse.sh trunk/src/main/java/cc/kune/Kune.gwt.xml trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtGuiProvider.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarSeparatorGui.java trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java trunk/src/main/java/cc/kune/common/client/actions/ui/ActionFlowPanel.java trunk/src/main/java/cc/kune/common/public/kune-common.css trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/CoreGinjector.java trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierViewImpl.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsViewImpl.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicTopDialog.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/core/public/ws.html trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java trunk/src/main/java/org/ourproject/kune/chat/KuneChat.gwt.xml trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatConnectionOptions.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java trunk/src/main/java/org/ourproject/kune/platf/KunePlatform.gwt.xml trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractGuiItem.java trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconLabelEditable.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridDropConfiguration.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridMenuPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/noti/NotifyUser.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java trunk/src/main/java/org/ourproject/kune/workspace/KuneWorkspace.gwt.xml trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java trunk/src/main/java/org/ourproject/kune/workspace/client/ActionsModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/hello/HelloWorldModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFrdForm.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardTrdForm.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipateAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UnjoinAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddieHeaderButton.java trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeManager.java trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeSelectorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderPresenter.java trunk/src/main/webapp/WEB-INF/web.xml Log: NEW - # 17: emite chat update http://kune.ourproject.org/issues/ticket/17 NEW - # 14: Site bar update http://kune.ourproject.org/issues/ticket/14 Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/.classpath 2011-01-29 03:38:12 UTC (rev 1227) @@ -1,111 +1,104 @@ -<?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/> - <classpathentry including="**/*.java" kind="src" path="src/main/java"/> - <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/> - <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar" sourcepath="M2_REPO/javax/transaction/jta/1.1/jta-1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA.jar" sourcepath="M2_REPO/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/> - <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/> - <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/> - <classpathentry kind="var" path="M2_REPO/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/> - <classpathentry kind="var" path="M2_REPO/c3p0/c3p0/0.9.1.2/c3p0-0.9.1.2.jar" sourcepath="M2_REPO/c3p0/c3p0/0.9.1.2/c3p0-0.9.1.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/cobogw/gwt/cobogw/1.3.1/cobogw-1.3.1.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar" sourcepath="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.2/commons-io-1.2.jar" sourcepath="M2_REPO/commons-io/commons-io/1.2/commons-io-1.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0.jar" sourcepath="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar" sourcepath="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar" sourcepath="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/calclab/emite/emite/0.4.7/emite-0.4.7.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sf/ezmorph/ezmorph/1.0.3/ezmorph-1.0.3.jar" sourcepath="M2_REPO/net/sf/ezmorph/ezmorph/1.0.3/ezmorph-1.0.3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/freemarker/freemarker/2.3.8/freemarker-2.3.8.jar"/> - <classpathentry kind="var" path="M2_REPO/com/googlecode/gwt/inject/gin/r137/gin-r137.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/guava/guava-gwt/r07/guava-gwt-r07.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/code/guice/guice/2.1-SNAPSHOT-r1160/guice-2.1-SNAPSHOT-r1160.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/code/guice/guice-servlet/2.0.1/guice-servlet-2.0.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/adamtacy/gwt-fx/r464/gwt-fx-r464.jar"/> - <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/log/gwt-log/gwt-log/3.0.1/gwt-log-3.0.1.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/gwt-util-src/0.3.0/gwt-util-src-0.3.0.jar"/> - <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/voices/gwt-voices/gwt-voices/1.6.0/gwt-voices-1.6.0.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtextux/gwtextux/0.4.0.924/gwtextux-0.4.0.924.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp/0.5-SNAPSHOT/gwtp-0.5-SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/com/extjs/gxt/2.2.1/gxt-2.2.1.jar"/> - <classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.0.20070617/h2-1.0.20070617.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.1.ga/hibernate-3.2.1.ga.jar" sourcepath="M2_REPO/org/hibernate/hibernate/3.2.1.ga/hibernate-3.2.1.ga-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.3.0.ga/hibernate-commons-annotations-3.3.0.ga.jar" sourcepath="M2_REPO/org/hibernate/hibernate-commons-annotations/3.3.0.ga/hibernate-commons-annotations-3.3.0.ga-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-search/3.1.0.GA/hibernate-search-3.1.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-search/3.1.0.GA/hibernate-search-3.1.0.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-tools/3.2.3.GA/hibernate-tools-3.2.3.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/4.0.2.GA/hibernate-validator-4.0.2.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-validator/4.0.2.GA/hibernate-validator-4.0.2.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.3/jaxb-impl-2.1.3.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.3/jaxb-impl-2.1.3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/codehaus/jettison/jettison/1.0-RC2/jettison-1.0-RC2.jar" sourcepath="M2_REPO/org/codehaus/jettison/jettison/1.0-RC2/jettison-1.0-RC2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/jmagick/jmagick/6.2.6-0/jmagick-6.2.6-0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jruby/jruby-complete/1.5.1/jruby-complete-1.5.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jruby/rack/jruby-rack/1.0.3/jruby-rack-1.0.3.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sf/json-lib/json-lib/2.1/json-lib-2.1-jdk15.jar" sourcepath="M2_REPO/net/sf/json-lib/json-lib/2.1/json-lib-2.1-jdk15-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sourceforge/findbugs/jsr-305/v0r47/jsr-305-v0r47.jar" sourcepath="M2_REPO/net/sourceforge/findbugs/jsr-305/v0r47/jsr-305-v0r47-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/jtidy/r8-20060801/jtidy-r8-20060801.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/4.8.1/junit-4.8.1.jar" sourcepath="M2_REPO/junit/junit/4.8.1/junit-4.8.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/liquibase/liquibase-core/1.7.0/liquibase-core-1.7.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/liquibase/liquibase-plugin/1.7.0.0/liquibase-plugin-1.7.0.0.jar"/> - <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar" sourcepath="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.4.0/lucene-core-2.4.0.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-core/2.4.0/lucene-core-2.4.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-model/2.0/maven-model-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-model/2.0/maven-model-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mockito/mockito-all/1.6/mockito-all-1.6.jar"/> - <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.13/mysql-connector-java-5.1.13.jar"/> - <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-gwt/0.3.1/proto-gwt-0.3.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jivesoftware/smack/smack/3.0.4/smack-3.0.4.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jivesoftware/smackx/smackx/3.0.4/smackx-3.0.4.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jivesoftware/smackx/debugger/smackx-debugger/3.0.4/smackx-debugger-3.0.4.jar"/> - <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/> - <classpathentry kind="var" path="M2_REPO/com/calclab/suco/0.6.5/suco-0.6.5.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/wideplay/warp-persist/2.0-SNAPSHOT/warp-persist-2.0-SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/waveinabox-server-custom/0.3.6/waveinabox-server-custom-0.3.6.jar"/> - <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/> - <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar" sourcepath="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/xwiki/platform/xwiki-web-gwt-dom/2.3-rc-1/xwiki-web-gwt-dom-2.3-rc-1.jar" sourcepath="M2_REPO/org/xwiki/platform/xwiki-web-gwt-dom/2.3-rc-1/xwiki-web-gwt-dom-2.3-rc-1-sources.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry including="**/*.java" kind="src" path="target/generated-sources/apt"/> - <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/> - <classpathentry kind="src" path=".apt_generated"> - <attributes> - <attribute name="optional" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="output" path="target/kune-0.0.7/WEB-INF/classes"/> -</classpath> + <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/> + <classpathentry kind="src" path="src/main/java" including="**/*.java"/> + <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> + <classpathentry kind="output" path="target/kune-0.0.7/WEB-INF/classes"/> + <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar" sourcepath="M2_REPO/javax/transaction/jta/1.1/jta-1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA.jar" sourcepath="M2_REPO/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/> + <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/> + <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/> + <classpathentry kind="var" path="M2_REPO/c3p0/c3p0/0.9.1.2/c3p0-0.9.1.2.jar" sourcepath="M2_REPO/c3p0/c3p0/0.9.1.2/c3p0-0.9.1.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/cobogw/gwt/cobogw/1.3.1/cobogw-1.3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar" sourcepath="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.2/commons-io-1.2.jar" sourcepath="M2_REPO/commons-io/commons-io/1.2/commons-io-1.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0.jar" sourcepath="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar" sourcepath="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar" sourcepath="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/calclab/emite/emite/r1694/emite-r1694.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sf/ezmorph/ezmorph/1.0.3/ezmorph-1.0.3.jar" sourcepath="M2_REPO/net/sf/ezmorph/ezmorph/1.0.3/ezmorph-1.0.3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/freemarker/freemarker/2.3.8/freemarker-2.3.8.jar"/> + <classpathentry kind="var" path="M2_REPO/com/googlecode/gwt/inject/gin/r137/gin-r137.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/guava/guava-gwt/r07/guava-gwt-r07.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/code/guice/guice/2.1-SNAPSHOT-r1160/guice-2.1-SNAPSHOT-r1160.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/code/guice/guice-servlet/2.0.1/guice-servlet-2.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/adamtacy/gwt-fx/r464/gwt-fx-r464.jar"/> + <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/log/gwt-log/gwt-log/3.0.1/gwt-log-3.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/gwt-util-src/0.3.0/gwt-util-src-0.3.0.jar"/> + <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/voices/gwt-voices/gwt-voices/1.6.0/gwt-voices-1.6.0.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtextux/gwtextux/0.4.0.924/gwtextux-0.4.0.924.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp/0.5-SNAPSHOT/gwtp-0.5-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/com/extjs/gxt/2.2.1/gxt-2.2.1.jar"/> + <classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.0.20070617/h2-1.0.20070617.jar"/> + <classpathentry kind="var" path="M2_REPO/com/calclab/emite/hablar/r1694/hablar-r1694.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.1.ga/hibernate-3.2.1.ga.jar" sourcepath="M2_REPO/org/hibernate/hibernate/3.2.1.ga/hibernate-3.2.1.ga-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.3.0.ga/hibernate-commons-annotations-3.3.0.ga.jar" sourcepath="M2_REPO/org/hibernate/hibernate-commons-annotations/3.3.0.ga/hibernate-commons-annotations-3.3.0.ga-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-search/3.1.0.GA/hibernate-search-3.1.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-search/3.1.0.GA/hibernate-search-3.1.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-tools/3.2.3.GA/hibernate-tools-3.2.3.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/4.0.2.GA/hibernate-validator-4.0.2.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-validator/4.0.2.GA/hibernate-validator-4.0.2.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.3/jaxb-impl-2.1.3.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.3/jaxb-impl-2.1.3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/codehaus/jettison/jettison/1.0-RC2/jettison-1.0-RC2.jar" sourcepath="M2_REPO/org/codehaus/jettison/jettison/1.0-RC2/jettison-1.0-RC2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/jmagick/jmagick/6.2.6-0/jmagick-6.2.6-0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jruby/jruby-complete/1.5.1/jruby-complete-1.5.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jruby/rack/jruby-rack/1.0.3/jruby-rack-1.0.3.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sf/json-lib/json-lib/2.1/json-lib-2.1-jdk15.jar" sourcepath="M2_REPO/net/sf/json-lib/json-lib/2.1/json-lib-2.1-jdk15-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sourceforge/findbugs/jsr-305/v0r47/jsr-305-v0r47.jar" sourcepath="M2_REPO/net/sourceforge/findbugs/jsr-305/v0r47/jsr-305-v0r47-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/jtidy/r8-20060801/jtidy-r8-20060801.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.8.1/junit-4.8.1.jar" sourcepath="M2_REPO/junit/junit/4.8.1/junit-4.8.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/liquibase/liquibase-core/1.7.0/liquibase-core-1.7.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/liquibase/liquibase-plugin/1.7.0.0/liquibase-plugin-1.7.0.0.jar"/> + <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar" sourcepath="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.4.0/lucene-core-2.4.0.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-core/2.4.0/lucene-core-2.4.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-model/2.0/maven-model-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-model/2.0/maven-model-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mockito/mockito-all/1.6/mockito-all-1.6.jar"/> + <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.13/mysql-connector-java-5.1.13.jar"/> + <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-gwt/0.3.1/proto-gwt-0.3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jivesoftware/smack/smack/3.0.4/smack-3.0.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jivesoftware/smackx/smackx/3.0.4/smackx-3.0.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jivesoftware/smackx/debugger/smackx-debugger/3.0.4/smackx-debugger-3.0.4.jar"/> + <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/wideplay/warp-persist/2.0-SNAPSHOT/warp-persist-2.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/waveinabox-server-custom/0.3.6/waveinabox-server-custom-0.3.6.jar"/> + <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/> + <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar" sourcepath="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/xwiki/platform/xwiki-web-gwt-dom/2.3-rc-1/xwiki-web-gwt-dom-2.3-rc-1.jar" sourcepath="M2_REPO/org/xwiki/platform/xwiki-web-gwt-dom/2.3-rc-1/xwiki-web-gwt-dom-2.3-rc-1-sources.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="src" path="target/generated-sources/apt" including="**/*.java"/> <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/> +</classpath> \ No newline at end of file Added: trunk/README_FIRST =================================================================== --- trunk/README_FIRST (rev 0) +++ trunk/README_FIRST 2011-01-29 03:38:12 UTC (rev 1227) @@ -0,0 +1,2 @@ +WARNING +Please note that we are doing a big refactorization of Kune to addapt it to Wave. Also we are starting to use other libraries (for instance gin for IoC instead of our old Suco library). Then don't expect to much of /trunk/ because of that (for our old more stable code see tag 0.0.6-pre-wiab). Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/pom.xml 2011-01-29 03:38:12 UTC (rev 1227) @@ -274,11 +274,11 @@ <artifactId>dozer</artifactId> <version>4.0</version> </dependency> - <dependency> + <!-- <dependency> <groupId>com.calclab</groupId> <artifactId>suco</artifactId> <version>0.6.5</version> - </dependency> + </dependency> --> <dependency> <groupId>jmagick</groupId> <artifactId>jmagick</artifactId> @@ -296,9 +296,14 @@ <dependency> <groupId>com.calclab.emite</groupId> <artifactId>emite</artifactId> - <version>0.6.0-RC1</version> + <version>r1694</version> </dependency> <dependency> + <groupId>com.calclab.emite</groupId> + <artifactId>hablar</artifactId> + <version>r1694</version> + </dependency> + <dependency> <groupId>org.jivesoftware.smack</groupId> <artifactId>smack</artifactId> <version>3.0.4</version> Deleted: trunk/pom.xml.dic11 =================================================================== --- trunk/pom.xml.dic11 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/pom.xml.dic11 2011-01-29 03:38:12 UTC (rev 1227) @@ -1,894 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.ourproject</groupId> - <artifactId>kune</artifactId> - <packaging>jar</packaging> - <version>0.0.6</version> - <description> - kune free/open/libre collaboration platform - </description> - <name>kune</name> - <url>http://kune.ourproject.org</url> - <properties> - <!-- Available versions: http://repo1.maven.org/maven2/com/google/gwt/gwt-dev/ - or also in: http://google-web-toolkit.googlecode.com/svn/2.1.0.M2/gwt/maven/ - and similars. --> - <!-- Convenience property to set the GWT version --> - <gwtVersion>2.1.0</gwtVersion> - <!-- GWT needs at least java 1.5 --> - <maven.compiler.source>1.6</maven.compiler.source> - <maven.compiler.target>1.6</maven.compiler.target> - <webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - <dependencies> - <!-- guice --> - <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice</artifactId> - <version>2.0.1</version> - </dependency> - <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice-servlet</artifactId> - <version>2.0.1</version> - </dependency> - <!-- GWT dependencies (from maven "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>${gwtVersion}</version> - <type>jar</type> - <scope>provided</scope> - </dependency> - <!-- <dependency> <groupId>com.extjs</groupId> <artifactId>gxt</artifactId> - <version>1.0-beta2</version> </dependency> --> - <dependency> - <groupId>org.cobogw</groupId> - <artifactId>gwt</artifactId> - <version>1.2.2</version> - </dependency> - <dependency> - <groupId>com.gwtext</groupId> - <artifactId>gwtext</artifactId> - <version>2.0.5</version> - </dependency> - <dependency> - <groupId>com.gwtextux</groupId> - <artifactId>gwtextux</artifactId> - <version>0.4.0.924</version> - </dependency> - <dependency> - <groupId>com.allen_sauer.gwt.log.gwt-log</groupId> - <artifactId>gwt-log</artifactId> - <version>3.0.1</version> - </dependency> - <dependency> - <groupId>com.allen_sauer.gwt.voices.gwt-voices</groupId> - <artifactId>gwt-voices</artifactId> - <version>1.6.0</version> - </dependency> - <!-- utilities --> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - <dependency> - <groupId>net.sf.dozer</groupId> - <artifactId>dozer</artifactId> - <version>4.0</version> - </dependency> - <dependency> - <groupId>com.calclab</groupId> - <artifactId>suco</artifactId> - <scope>compile</scope> - <version>0.6.5</version> - </dependency> - <dependency> - <groupId>jmagick</groupId> - <artifactId>jmagick</artifactId> - <version>6.2.6-0</version> - </dependency> - <dependency> - <groupId>org.xwiki.platform</groupId> - <artifactId>xwiki-web-gwt-dom</artifactId> - <version>2.3-rc-1</version> - <!-- <version>2.0-SNAPSHOT-g164</version> --> - <!-- <version>2.0-SNAPSHOT</version> --> - <!-- <version>2.0-SNAPSHOT-g20s</version> --> - </dependency> - <!-- xmpp --> - <dependency> - <groupId>com.calclab.emite</groupId> - <artifactId>emite</artifactId> - <version>0.4.7</version> - </dependency> - <dependency> - <groupId>org.jivesoftware.smack</groupId> - <artifactId>smack</artifactId> - <version>3.0.4</version> - </dependency> - <dependency> - <groupId>org.jivesoftware.smackx</groupId> - <artifactId>smackx</artifactId> - <version>3.0.4</version> - </dependency> - <dependency> - <groupId>org.jivesoftware.smackx.debugger</groupId> - <artifactId>smackx-debugger</artifactId> - <version>3.0.4</version> - </dependency> - <!-- mysql --> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.0.5</version> - </dependency> - <!-- hibernate JPA --> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>3.3.1.GA</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>3.1.0.GA</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.4.0.GA</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-commons-annotations</artifactId> - <version>3.3.0.ga</version> - </dependency> - <!-- <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-ehcache</artifactId> - <version>3.3.1.GA</version> </dependency> --> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-search</artifactId> - <version>3.1.0.GA</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>3.4.0.GA</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-tools</artifactId> - <version>3.2.3.GA</version> - </dependency> - <dependency> - <groupId>c3p0</groupId> - <artifactId>c3p0</artifactId> - <version>0.9.1.2</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>com.wideplay</groupId> - <artifactId>warp-persist</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.2</version> - </dependency> - <!-- REST: xml and json (stax) --> - <dependency> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - <version>1.2.2</version> - </dependency> - <dependency> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>org.codehaus.jettison</groupId> - <artifactId>jettison</artifactId> - <version>1.0-RC2</version> - </dependency> - <dependency> - <groupId>net.sf.json-lib</groupId> - <artifactId>json-lib</artifactId> - <version>2.1</version> - <classifier>jdk15</classifier> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2</version> - </dependency> - <!-- File upload --> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.1.1</version> - </dependency> - <!-- db upgrades --> - <dependency> - <groupId>org.liquibase</groupId> - <artifactId>liquibase-core</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>org.liquibase</groupId> - <artifactId>liquibase-plugin</artifactId> - <version>1.7.0.0</version> - </dependency> - <!-- jetty dependencies --> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> - <version>6.1.11</version> - <!-- <version>7.0.0.pre5</version> --> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <!-- <artifactId>jetty-maven-plugin</artifactId> --> - <!-- <version>7.0.0.1beta0</version> --> - <version>6.1.11</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - <!-- testing dependencies --> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <scope>test</scope> - <version>1.6</version> - </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.0.20070617</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.7</version> - <scope>test</scope> - </dependency> - <!-- <dependency> --> - <!-- <groupId>org.openqa.selenium.client-drivers</groupId> --> - <!-- <artifactId>selenium-java-client-driver</artifactId> --> - <!-- <version>1.0-beta-1</version> --> - <!-- <scope>test</scope> --> - <!-- </dependency> --> - <!-- public side --> - <dependency> - <groupId>org.jruby.rack</groupId> - <artifactId>jruby-rack</artifactId> - <version>0.9.4</version> - </dependency> - <!-- wave --> - <dependency> - <groupId>org.waveprotocol</groupId> - <artifactId>kune-wave-server</artifactId> - <version>0.0.2.2</version> - </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>1.2</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.3</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice-assistedinject</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>jline</groupId> - <artifactId>jline</artifactId> - <version>0.9.94</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>org.gnu.inet</groupId> - <artifactId>libidn</artifactId> - <version>1.15</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - <version>2.1.0</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - <version>1.1.4c</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3_xpath</artifactId> - <version>1.1.4c</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>aopalliance</groupId> - <artifactId>aopalliance</artifactId> - <version>1.0</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>org.wave-protocol</groupId> - <artifactId>xmpp</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.wave-protocol</groupId> - <artifactId>whack</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>com.google.common</groupId> - <artifactId>collect</artifactId> - <version>1.0-rc2</version> - </dependency> - </dependencies> - <distributionManagement> - <repository> - <id>kune.ourproject.org</id> - <url>scpexe://kune.ourproject.org/home/groups/kune/htdocs/mavenrepo/</url> - </repository> - </distributionManagement> - <!-- http://gwt-maven.googlecode.com/svn/docs/maven-googlewebtoolkit2-plugin/inde... --> - <pluginRepositories> - <!-- <pluginRepository> <id>gwt-maven</id> <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo</url> - </pluginRepository> --> - <pluginRepository> - <id>Codehaus Snapshots</id> - <url>http://snapshots.repository.codehaus.org/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> <!-- Workaround for MNG-2974, see note below --> - </releases> - </pluginRepository> - <pluginRepository> - <id>gwt-plugin-repo</id> - <url>http://google-web-toolkit.googlecode.com/svn/2.1.0.M3/gwt/maven</url> - <name>Google Web Toolkit Plugin Repository</name> - </pluginRepository> - </pluginRepositories> - <repositories> - <repository> - <id>guice-maven</id> - <name>guice maven</name> - <url>http://guice-maven.googlecode.com/svn/trunk</url> - </repository> - <repository> - <id>Codehaus Snapshots</id> - <url>http://snapshots.repository.codehaus.org/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - <repository> - <id>repository.jboss.org</id> - <name>JBoss Maven Repository</name> - <url>http://repository.jboss.org/maven2</url> - <layout>default</layout> - </repository> - <repository> - <id>dyndns-repo</id> - <url>http://maven.dyndns.org/2</url> - </repository> - <repository> - <id>gwt-maven</id> - <url> - http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/ - </url> - </repository> - <repository> - <id>kune-maven</id> - <url>http://kune.ourproject.org/mavenrepo/</url> - </repository> - <repository> - <id>gwtext</id> - <url>http://www.gwt-ext.com/maven2/</url> - </repository> - <repository> - <id>google-maven-snapshot-repository</id> - <name>Google Maven Snapshot Repository</name> - <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - <repository> - <id>openqa.org</id> - <name>Openqa Release Repository</name> - <url>http://archiva.openqa.org/repository/releases</url> - <layout>default</layout> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>openqa.org snapshots</id> - <name>Openqa Snapshot Repository</name> - <url>http://archiva.openqa.org/repository/snapshots</url> - <layout>default</layout> - <snapshots> - <enabled>true</enabled> - <updatePolicy>daily</updatePolicy> - <checksumPolicy>ignore</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - <repository> - <id>xwiki-releases</id> - <name>XWiki Maven2 Remote Repository for Releases</name> - <url>http://maven.xwiki.org/releases</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> - <id>xwiki</id> - <name>XWiki Repository</name> - <url>http://maven.xwiki.org/snapshots</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>daily</updatePolicy> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - </repository> - </repositories> - <issueManagement> - <system>kune issues list at ourproject.org</system> - <url>http://kune.ourproject.org/issues/</url> - </issueManagement> - <developers> - <developer> - <id>dani</id> - <name>Daniel Gómez Blasco</name> - <email>[email protected]</email> - </developer> - <developer> - <name>Samer Hassan</name> - <email>[email protected]</email> - </developer> - <developer> - <name>Vicente J. Ruiz Jurado</name> - <email>[email protected]</email> - </developer> - </developers> - <scm> - <url>svn://scm.ourproject.org/svnroot/kune/trunk</url> - </scm> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.3</version> - <configuration> - <forkMode>pertest</forkMode> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <!-- Uncomment and run mvn with -X -e if we have same compile problems - <compilerArgument>-verbose</compilerArgument> <fork>true</fork> <verbose>true</verbose> --> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>gwt-maven-plugin</artifactId> - <!--<version>1.2</version> --> - <version>2.1.0</version> - <executions> - <execution> - <id>test</id> - <goals> - <goal>test</goal> - <!-- <goal>i18n</goal> --> - <!-- <goal>generateAsync</goal> --> - </goals> - </execution> - <execution> - <id>gwtcompile</id><phase>prepare-package</phase> - <goals> - <goal>compile</goal> - <!-- http://mojo.codehaus.org/gwt-maven-plugin/user-guide/library.html --> - <goal>resources</goal> - </goals> - </execution> - <execution> - <configuration> - <inplace>true</inplace> - <!-- <extraJvmArgs>-Xmx512M</extraJvmArgs> --> - <soyc>false</soyc> - <style>OBF</style> - <localWorkers>2</localWorkers> - <copyWebapp>true</copyWebapp> - </configuration> - <goals> - <!-- gwt:* goals to be executed during build --> - <goal>compile</goal> - <!-- http://mojo.codehaus.org/gwt-maven-plugin/user-guide/library.html --> - <goal>resources</goal> - </goals> - </execution> - </executions> - <configuration> - <generateDirectory>${project.build.directory}/generated-sources/gwt</generateDirectory> - <gen>${project.build.directory}/generated</gen> - <productionMode>true</productionMode> - <!--<extraJvmArgs>-Xmx512m -verbose</extraJvmArgs> --> - <logLevel>INFO</logLevel> - <style>OBF</style> - <localWorkers>2</localWorkers> - <!--<mode>htmlunit</mode> --> - <hostedWebapp>${webappDirectory}</hostedWebapp> - <runTarget>org.ourproject.kune.app.Kune/ws.html?log_level=DEBUG</runTarget> - <gwt.module>org.ourproject.kune.app.Kune</gwt.module> - <!-- <webappDirectory>${basedir}/war</webappDirectory> --> - <inplace>true</inplace> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>2.1</version> - <executions> - <execution> - <phase>compile</phase> - <goals> - <goal>exploded</goal> - </goals> - </execution> - </executions> - <configuration> - <webappDirectory>${webappDirectory}</webappDirectory> - </configuration> - </plugin> - <plugin> - <artifactId>maven-eclipse-plugin</artifactId> - <version>2.7</version> - <configuration> - <downloadSources>true</downloadSources> - <downloadJavadocs>false</downloadJavadocs> - <wtpversion>2.0</wtpversion> - <additionalBuildcommands> - <buildCommand> - <name>com.google.gwt.eclipse.core.gwtProjectValidator</name> - </buildCommand> - </additionalBuildcommands> - <additionalProjectnatures> - <projectnature>org.eclipse.ajdt.ui.ajnature</projectnature> - <projectnature>com.google.gwt.eclipse.core.gwtNature</projectnature> - </additionalProjectnatures> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.7</version> - <executions> - <execution> - <id>javadoc-jar</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - <configuration> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>2.1.2</version> - <executions> - <execution> - <id>attach-sources</id> - <phase>package</phase> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <!-- <artifactId>jetty-maven-plugin</artifactId> --> - <!-- <version>7.0.0.1beta0</version> --> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.14</version> - <configuration> - <contextPath>/</contextPath> - <!-- <webAppSourceDirectory>war</webAppSourceDirectory> --> - <!-- <tmpDir>war</tmpDir> --> - <reload>manual</reload> - <scanIntervalSeconds>0</scanIntervalSeconds> - <!-- <scanTargets> --> - <!-- <scanTarget>${basedir}/war</scanTarget> --> - <!-- </scanTargets> --> - </configuration> - </plugin> - <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>deb-maven-plugin</artifactId> - <version>1.0-SNAPSHOT</version> <configuration> <description>kune free/open/libre - collaboration platform</description> <maintainer>Kune Development Team <[email protected]></maintainer> - <section>web</section> <priority>optional</priority> <architecture>all</architecture> - </configuration> <executions> <execution> <goals> <goal>deb</goal> </goals> - </execution> </executions> </plugin> --> - <plugin> - <groupId>org.liquibase</groupId> - <artifactId>liquibase-plugin</artifactId> - <version>1.7.0.0</version> - <executions> - <execution> - <phase>process-resources</phase> - <configuration> - <changeLogFile> - src/main/resources/db/liquibase_changelog.xml </changeLogFile> - <driver>com.mysql.jdbc.Driver</driver> - <url>jdbc:mysql://localhost/kune_dev</url> - <username>kune</username> - <password>db4kune</password> - <verbose>true</verbose> - </configuration> - <!-- <configuration> <verbose>true</verbose> <propertiesFile> - src/main/resources/db/liquibase.properties </propertiesFile> </configuration> --> - <goals> - <goal>update</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> - <executions> - <execution> - <id>core</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <classifier>core</classifier> - <includes> - <include>**/KunePlatform.gwt.xml**</include> - <include>**/i18n/I18nTranslationService.**</include> - <include>**/i18n/I18nTranslationServiceMocked.**</include> - <include>**/TextUtils.**</include> - <include>**/IconLabelEditable.**</include> - <include>**/QuickTipsHelper.**</include> - <include>**/RichText.gwt.xml**</include> - <include>**/BasicDialog.**</include> - <include>**/HorizontalLine.**</include> - <include>**/AbstractLabel.**</include> - <include>**/IconLabel.**</include> - <include> **/EditableIconLabel.** </include> - <include> **/EditableClickListener.** </include> - <include>**/KuneStringUtils.**</include> - <include>**/IconHyperlink*.**</include> - <include>**/LabelWrapper*.**</include> - <include>**/KuneUiUtils.**</include> - <include>**/View.**</include> - <!-- <include>**/platf/**</include> <include>**/platf/client/extend/**</include> - <include>**/platf/client/*java</include> <include>**/platf/client/app/**</include> - <include>**/platf/client/dispatch/**</include> --> - </includes> - </configuration> - </execution> - <execution> - <id>helloworldmodule</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <classifier>helloworldmodule</classifier> - <includes> - <include>**/HelloWorld*</include> - </includes> - </configuration> - </execution> - </executions> - </plugin> - <!-- <plugin> --> - <!-- <groupId>org.codehaus.mojo</groupId> --> - <!-- <artifactId>selenium-maven-plugin</artifactId> --> - <!-- <configuration> --> - <!-- <port>4441</port> --> - <!-- </configuration> --> - <!-- <executions> --> - <!-- <execution> --> - <!-- <phase>pre-integration-test</phase> --> - <!-- <goals> --> - <!-- <goal>start-server</goal> --> - <!-- </goals> --> - <!-- <configuration> --> - <!-- <background>true</background> --> - <!-- </configuration> --> - <!-- </execution> --> - <!-- </executions> --> - <!-- </plugin> --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>pertest</forkMode> - <!-- Skip the normal tests, we'll run them in the integration-test - phase --> - <skip>true</skip> - </configuration> - <executions> - <execution> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - </configuration> - </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> --> - </plugins> - <!-- Generate compiled stuff in the folder used for developing mode --> -<!-- <outputDirectory>${webappDirectory}/WEB-INF/classes</outputDirectory>--> - <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory> - <testOutputDirectory>war/WEB-INF/test-classes</testOutputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - <resource> - <directory>src/main/java</directory> - </resource> - </resources> - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-external</artifactId> - <version>1.0-beta-2</version> - </extension> - </extensions> - </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <version>2.4</version> - <configuration> - <linkXref>true</linkXref> - <sourceEncoding>utf-8</sourceEncoding> - <minimumTokens>100</minimumTokens> - <targetJdk>1.5</targetJdk> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jdepend-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - </plugin> - </plugins> - </reporting> - <profiles> - <profile> - <!-- Activate only when within eclipse --> - <id>m2eclipse</id> - <activation> - <property> - <name>!m2e.version</name> - </property> - </activation> - <!-- GWT SDK is provided by GWT SDK Classpath Container --> - <dependencies> - <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>${gwtVersion}</version> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - </profiles> -</project> Deleted: trunk/pom.xml.net =================================================================== --- trunk/pom.xml.net 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/pom.xml.net 2011-01-29 03:38:12 UTC (rev 1227) @@ -1,826 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.ourproject</groupId> - <artifactId>kune</artifactId> - <packaging>jar</packaging> - <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.7.0</gwtVersion> - </properties> - <dependencies> - <!-- guice --> - <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice-servlet</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>aopalliance</groupId> - <artifactId>aopalliance</artifactId> - <version>1.0</version> - </dependency> - - <!-- 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>${gwtVersion}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <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-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> - </dependency> - --> - <dependency> - <groupId>org.cobogw</groupId> - <artifactId>gwt</artifactId> - <version>1.2.2</version> - </dependency> - <dependency> - <groupId>com.gwtext</groupId> - <artifactId>gwtext</artifactId> - <version>2.0.5</version> - </dependency> - <dependency> - <groupId>com.gwtextux</groupId> - <artifactId>gwtextux</artifactId> - <version>0.4.0.924</version> - </dependency> - <dependency> - <groupId>com.allen_sauer.gwt.log.gwt-log</groupId> - <artifactId>gwt-log</artifactId> - <version>2.6.2</version> - </dependency> - <dependency> - <groupId>com.allen_sauer.gwt.voices.gwt-voices</groupId> - <artifactId>gwt-voices</artifactId> - <version>1.6.0</version> - </dependency> - - <!-- utilities --> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - <dependency> - <groupId>net.sf.dozer</groupId> - <artifactId>dozer</artifactId> - <version>4.0</version> - </dependency> - <dependency> - <groupId>com.calclab</groupId> - <artifactId>suco</artifactId> - <version>0.6.1</version> - </dependency> - <dependency> - <groupId>jmagick</groupId> - <artifactId>jmagick</artifactId> - <version>6.2.6-0</version> - </dependency> - <dependency> - <groupId>org.xwiki.platform</groupId> - <artifactId>xwiki-web-gwt-dom</artifactId> - <version>2.0-SNAPSHOT</version> - <!-- <version>2.0-SNAPSHOT-g164</version> --> - </dependency> - - <!-- xmpp --> - <dependency> - <groupId>com.calclab.emite</groupId> - <artifactId>emite</artifactId> - <version>0.4.7</version> - </dependency> - <dependency> - <groupId>org.jivesoftware.smack</groupId> - <artifactId>smack</artifactId> - <version>3.0.4</version> - </dependency> - <dependency> - <groupId>org.jivesoftware.smackx</groupId> - <artifactId>smackx</artifactId> - <version>3.0.4</version> - </dependency> - <dependency> - <groupId>org.jivesoftware.smackx.debugger</groupId> - <artifactId>smackx-debugger</artifactId> - <version>3.0.4</version> - </dependency> - - <!-- mysql --> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.0.5</version> - </dependency> - - <!-- hibernate JPA --> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-search</artifactId> - <version>3.1.0.GA</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>3.2.6.ga</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.4.0.GA</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>3.0.0.ga</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>3.4.0.GA</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-tools</artifactId> - <version>3.2.3.GA</version> - </dependency> - <dependency> - <groupId>c3p0</groupId> - <artifactId>c3p0</artifactId> - <version>0.9.1.2</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>com.wideplay</groupId> - <artifactId>warp-persist</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.2</version> - </dependency> - - <!-- REST: xml and json (stax) --> - <dependency> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - <version>1.2.2</version> - </dependency> - <dependency> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>org.codehaus.jettison</groupId> - <artifactId>jettison</artifactId> - <version>1.0-RC2</version> - </dependency> - <dependency> - <groupId>net.sf.json-lib</groupId> - <artifactId>json-lib</artifactId> - <version>2.1</version> - <classifier>jdk15</classifier> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2</version> - </dependency> - - <!-- File upload --> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.1.1</version> - </dependency> - - <!-- db upgrades --> - <dependency> - <groupId>org.liquibase</groupId> - <artifactId>liquibase-core</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>org.liquibase</groupId> - <artifactId>liquibase-plugin</artifactId> - <version>1.7.0.0</version> - </dependency> - - <!-- jetty dependencies --> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> - <version>6.1.5</version> - <!-- - <version>7.0.0.pre5</version> - --> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <!-- - <artifactId>jetty-maven-plugin</artifactId> - <version>7.0.0.1beta0</version> - --> - <version>6.1.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - - <!-- testing dependencies --> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.6</version> - </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.0.20070617</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - <!-- - <scope>test</scope> - --> - </dependency> - <dependency> - <groupId>org.openqa.selenium.client-drivers</groupId> - <artifactId>selenium-java-client-driver</artifactId> - <version>1.0-beta-1</version> - <scope>test</scope> - </dependency> - - <!-- public side --> - <dependency> - <groupId>org.jruby.rack</groupId> - <artifactId>jruby-rack</artifactId> - <version>0.9.4</version> - </dependency> - </dependencies> - <!-- - http://gwt-maven.googlecode.com/svn/docs/maven-googlewebtoolkit2-plugin/inde... - --> - <pluginRepositories> - <pluginRepository> - <id>gwt-maven</id> - <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo</url> - </pluginRepository> - <pluginRepository> - <id>Codehaus Snapshots</id> - <url>http://snapshots.repository.codehaus.org/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>false</enabled> <!-- Workaround for MNG-2974, see note below --> - </releases> - </pluginRepository> - </pluginRepositories> - <repositories> - <repository> - <id>Codehaus Snapshots</id> - <url>http://snapshots.repository.codehaus.org/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - <repository> - <id>repository.jboss.org</id> - <name>JBoss Maven Repository</name> - <url>http://repository.jboss.org/maven2</url> - <layout>default</layout> - </repository> - <repository> - <id>dyndns-repo</id> - <url>http://maven.dyndns.org/2</url> - </repository> - <repository> - <id>gwt-maven</id> - <url> - http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/ - </url> - </repository> - <repository> - <id>kune-maven</id> - <url>http://kune.ourproject.org/mavenrepo/</url> - </repository> - <repository> - <id>gwtext</id> - <url>http://www.gwt-ext.com/maven2/</url> - </repository> - <repository> - <id>openqa.org</id> - <name>Openqa Release Repository</name> - <url>http://archiva.openqa.org/repository/releases</url> - <layout>default</layout> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>openqa.org</id> - <name>Openqa Snapshot Repository</name> - <url>http://archiva.openqa.org/repository/snapshots</url> - <layout>default</layout> - <snapshots> - <enabled>true</enabled> - <updatePolicy>daily</updatePolicy> - <checksumPolicy>ignore</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - <repository> - <id>xwiki</id> - <name>XWiki Repository</name> - <url>http://maven.xwiki.org/snapshots</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>daily</updatePolicy> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - </repository> - </repositories> - <issueManagement> - <system>kune issues list at ourproject.org</system> - <url>http://ourproject.org/tracker/?group_id=407</url> - </issueManagement> - <developers> - <developer> - <id>dani</id> - <name>Daniel Gómez Blasco</name> - <email>[email protected]</email> - </developer> - <developer> - <name>Samer Hassan</name> - <email>[email protected]</email> - </developer> - <developer> - <name>Vicente J. Ruiz Jurado</name> - <email>[email protected]</email> - </developer> - </developers> - <scm> - <url>svn://scm.ourproject.org/svnroot/kune/trunk</url> - </scm> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.3</version> - <configuration> - <forkMode>pertest</forkMode> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - <!-- - Uncomment and run mvn with -X -e if we have same compile - problems <compilerArgument>-verbose</compilerArgument> - <fork>true</fork> <verbose>true</verbose> - --> - </configuration> - </plugin> - <plugin> - <groupId>com.totsp.gwt</groupId> - <artifactId>maven-googlewebtoolkit2-plugin</artifactId> - <version>2.0-RC1</version> - <configuration> - <logLevel>INFO</logLevel> - <!-- <style>OBF or PRETTY</style> --> - <style>PRETTY</style> - <!-- - <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> - </compileTargets> - <generatorRootClasses> - <value>org.ourproject.kune.MyBean</value> - </generatorRootClasses> - <generatorDestinationPackage> org.ourproject.kune.app.Kune </generatorDestinationPackage> - <generateGettersAndSetters> true </generateGettersAndSetters> - <generatePropertyChangeSupport> true </generatePropertyChangeSupport> - </configuration> - <executions> - <execution> - <goals> - <!-- <goal>mergewebxml</goal> --> - <!-- <goal>compile</goal> --> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>2.0</version> - <configuration> - <webXml>${project.build.directory}/WEB-INF/web.xml</webXml> - </configuration> - </plugin> - <plugin> - <artifactId>maven-eclipse-plugin</artifactId> - <version>2.3</version> - <configuration> - <downloadSources>true</downloadSources> - <downloadJavadocs>true</downloadJavadocs> - <wtpversion>1.5</wtpversion> - </configuration> - </plugin> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.5</version> - <!-- - <artifactId>jetty-maven-plugin</artifactId> - <version>7.0.0.1beta0</version> - --> - <configuration> - <contextPath>/</contextPath> - <webAppSourceDirectory>war</webAppSourceDirectory> - <reload>manual</reload> - <scanIntervalSeconds>0</scanIntervalSeconds> - </configuration> - </plugin> - <!-- - <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>deb-maven-plugin</artifactId> - <version>1.0-SNAPSHOT</version> <configuration> - <description>kune free/open/libre collaboration - platform</description> <maintainer>Kune Development Team - <[email protected]></maintainer> - <section>web</section> <priority>optional</priority> - <architecture>all</architecture> </configuration> <executions> - <execution> <goals> <goal>deb</goal> </goals> </execution> - </executions> </plugin> - --> - <plugin> - <groupId>org.liquibase</groupId> - <artifactId>liquibase-plugin</artifactId> - <version>1.7.0.0</version> - <executions> - <execution> - <phase>process-resources</phase> - <configuration> - <changeLogFile> - src/main/resources/db/liquibase_changelog.xml </changeLogFile> - <driver>com.mysql.jdbc.Driver</driver> - <url>jdbc:mysql://localhost/kune_dev</url> - <username>kune</username> - <password>db4kune</password> - <verbose>true</verbose> - </configuration> - <!-- - <configuration> <verbose>true</verbose> <propertiesFile> - src/main/resources/db/liquibase.properties - </propertiesFile> </configuration> - --> - <goals> - <goal>update</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> - <executions> - <execution> - <id>core</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <classifier>core</classifier> - <includes> - <include>**/KunePlatform.gwt.xml**</include> - <include>**/i18n/I18nTranslationService.**</include> - <include>**/i18n/I18nTranslationServiceMocked.**</include> - <include>**/TextUtils.**</include> - <include>**/IconLabelEditable.**</include> - <include>**/QuickTipsHelper.**</include> - <include>**/RichText.gwt.xml**</include> - <include>**/BasicDialog.**</include> - <include>**/HorizontalLine.**</include> - <include>**/AbstractLabel.**</include> - <include>**/IconLabel.**</include> - <include> **/EditableIconLabel.** </include> - <include> **/EditableClickListener.** </include> - <include>**/KuneStringUtils.**</include> - <include>**/IconHyperlink*.**</include> - <include>**/LabelWrapper*.**</include> - <include>**/KuneUiUtils.**</include> - <include>**/View.**</include> - <!-- - <include>**/platf/**</include> - <include>**/platf/client/extend/**</include> - <include>**/platf/client/*java</include> - <include>**/platf/client/app/**</include> - <include>**/platf/client/dispatch/**</include> - --> - </includes> - </configuration> - </execution> - <execution> - <id>helloworldmodule</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <classifier>helloworldmodule</classifier> - <includes> - <include>**/HelloWorld*</include> - </includes> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>selenium-maven-plugin</artifactId> - <configuration> - <port>4441</port> - </configuration> - <executions> - <execution> - <phase>pre-integration-test</phase> - <goals> - <goal>start-server</goal> - </goals> - <configuration> - <background>true</background> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>pertest</forkMode> - <!-- - Skip the normal tests, we'll run them in the - integration-test phase - --> - <skip>true</skip> - </configuration> - <executions> - <execution> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - </configuration> - </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>war/WEB-INF/classes</outputDirectory> - <testOutputDirectory>war/WEB-INF/test-classes</testOutputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - <resource> - <directory>src/main/java</directory> - </resource> - </resources> - </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <version>2.4</version> - <configuration> - <linkXref>true</linkXref> - <sourceEncoding>utf-8</sourceEncoding> - <minimumTokens>100</minimumTokens> - <targetJdk>1.5</targetJdk> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name> net.sourceforge.cobertura.datafile </name> - <value> - ${project.reporting.directory}/cobertura/cobertura.ser </value> - </property> - </systemProperties> - <forkMode>pertest</forkMode> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jdepend-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - </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/mvn-eclipse.sh =================================================================== --- trunk/script/mvn-eclipse.sh 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/script/mvn-eclipse.sh 2011-01-29 03:38:12 UTC (rev 1227) @@ -1,5 +1,7 @@ mvn eclipse:eclipse -Dgwt.compiler.skip=true + perl -p -i -e 's/<\/classpath>//g' .classpath +perl -p -i -e 's/\/home\/vjrj\/proyectos\/dev\/kune-dev\///g' .classpath echo -en " <classpathentry kind=\"src\" path=\"target/generated-sources/apt\" including=\"**/*.java\"/>" >> .classpath echo -en " <classpathentry kind=\"con\" path=\"com.google.gwt.eclipse.core.GWT_CONTAINER\"/>\n</classpath>" >> .classpath Modified: trunk/src/main/java/cc/kune/Kune.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/Kune.gwt.xml 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/Kune.gwt.xml 2011-01-29 03:38:12 UTC (rev 1227) @@ -4,11 +4,12 @@ <inherits name="com.google.gwt.user.User" /> <inherits name='com.google.gwt.logging.Logging' /> <inherits name="cc.kune.core.Core" /> + <inherits name="cc.kune.chat.Chat" /> <inherits name="cc.kune.wave.KuneWave" /> <inherits name="com.calclab.suco.Suco" /> <inherits name="org.adamtacy.GWTEffects"></inherits> - <!-- <source path='client' - excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> --> + <!-- <source path='client' excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" + /> --> <!-- <source path='shared'/> --> <!-- <public path="public"/> --> <!-- Logging Configuration --> @@ -31,6 +32,10 @@ <!--http://code.google.com/p/google-web-toolkit/issues/detail?id=42 --> <!-- <set-property name="user.agent" value="gecko1_8" /> --> <set-property name="user.agent" value="safari,gecko1_8" /> + <!-- Debugging =============================================== --> + <!-- for add ensureDebugIds (debugId in UIBinder), remove/comment in production + see UIObject.ensureDebugId()) --> + <inherits name="com.google.gwt.user.Debug" /> <!-- Entrypoint =============================================== --> <entry-point class="cc.kune.core.client.KuneEntryPoint" /> </module> Added: trunk/src/main/java/cc/kune/chat/Chat.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/chat/Chat.gwt.xml (rev 0) +++ trunk/src/main/java/cc/kune/chat/Chat.gwt.xml 2011-01-29 03:38:12 UTC (rev 1227) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.1/distro-source/core/src/gwt-module.dtd"> +<module> + <inherits name="com.google.gwt.user.User" /> + <inherits name="com.calclab.hablar.Hablar" /> + <inherits name='com.calclab.hablar.console.HablarConsole' /> + <inherits name='com.calclab.hablar.login.HablarLogin' /> + <inherits name='com.calclab.hablar.icons.def.HablarDefaultIcons' /> + <inherits name='com.calclab.hablar.icons.ie6gif.HablarIE6GifIcons' /> + <inherits name='com.calclab.hablar.icons.alt.HablarAltIcons' /> + <source path="client" /> +</module> \ No newline at end of file Added: trunk/src/main/java/cc/kune/chat/client/ChatClient.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClient.java (rev 0) +++ trunk/src/main/java/cc/kune/chat/client/ChatClient.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -0,0 +1,37 @@ +package cc.kune.chat.client; + +import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; + +public interface ChatClient { + + void addNewBuddie(String shortName); + + // + // void addOnRosterChanged(Listener0 slot); + + void chat(XmppURI jid); + + // + // ChatConnectionOptions getChatOptions(); + + boolean isBuddie(String localUserName); + + boolean isBuddie(XmppURI jid); + + boolean isLoggedIn(); + + void joinRoom(String roomName, String userAlias); + + void joinRoom(String roomName, String subject, String userAlias); + + void login(String jid, String passwd); + + void logout(); + + void setAvatar(String photoBinary); + + void show(); + + void stop(); + +} Added: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java (rev 0) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -0,0 +1,256 @@ +package cc.kune.chat.client; + +import cc.kune.chat.client.ShowChatDialogEvent.ShowChatDialogHandler; +import cc.kune.chat.client.ToggleShowChatDialogEvent.ToggleShowChatDialogHandler; +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.Action; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.KeyStroke; +import cc.kune.common.client.actions.ui.descrip.IconLabelDescriptor; +import cc.kune.common.client.shortcuts.Keyboard; +import cc.kune.common.client.ui.PopupTopPanel; +import cc.kune.core.client.init.AppStartEvent; +import cc.kune.core.client.resources.icons.IconResources; +import cc.kune.core.client.sitebar.SitebarActionsPresenter; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.UserSignInEvent; +import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; +import cc.kune.core.client.state.UserSignOutEvent; +import cc.kune.core.client.state.UserSignOutEvent.UserSignOutHandler; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.calclab.emite.browser.client.PageAssist; +import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; +import com.calclab.hablar.HablarComplete; +import com.calclab.hablar.HablarConfig; +import com.calclab.hablar.console.client.HablarConsole; +import com.calclab.hablar.core.client.Hablar; +import com.calclab.hablar.core.client.HablarWidget; +import com.calclab.hablar.html.client.HtmlConfig; +import com.calclab.hablar.icons.alt.client.AltIcons; +import com.calclab.hablar.icons.def.client.DefaultIcons; +import com.calclab.hablar.icons.ie6gif.client.IE6GifIcons; +import com.calclab.hablar.login.client.HablarLogin; +import com.calclab.hablar.login.client.LoginConfig; +import com.google.gwt.event.shared.EventBus; +import com.google.gwt.user.client.ui.DialogBox; +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; + +public class ChatClientDefault implements ChatClient { + + public static class ChatClientAction extends AbstractExtendedAction { + + private final EventBus eventBus; + + @Inject + public ChatClientAction(final EventBus eventBus) { + super(); + this.eventBus = eventBus; + } + + @Override + public void actionPerformed(final ActionEvent event) { + // FIXME + eventBus.fireEvent(new ToggleShowChatDialogEvent()); + } + + } + + private PopupTopPanel popup; + private final Session session; + + @Inject + public ChatClientDefault(final EventBus eventBus, final I18nTranslationService i18n, final ChatClientAction action, + final SitebarActionsPresenter siteActions, final IconResources res, final Session session) { + this.session = session; + eventBus.addHandler(AppStartEvent.getType(), new AppStartEvent.AppStartHandler() { + @Override + public void onAppStart(final AppStartEvent event) { + res.css().ensureInjected(); + final IconLabelDescriptor chatIcon = new IconLabelDescriptor(action); + chatIcon.putValue(Action.SMALL_ICON, res.chat()); + chatIcon.putValue(Action.NAME, "Chat"); + chatIcon.setStyles("k-floatright, k-no-backimage, k-btn-sitebar"); + action.putValue(Action.SHORT_DESCRIPTION, i18n.t("Show/hide the chat window")); + action.setShortcut(KeyStroke.getKeyStroke('C', Keyboard.MODIFIER_ALT)); + chatIcon.setVisible(session.isLogged()); + siteActions.addAction(chatIcon); + eventBus.addHandler(UserSignInEvent.getType(), new UserSignInHandler() { + @Override + public void onUserSignIn(final UserSignInEvent event) { + createDialogIfNeeded(); + chatIcon.setVisible(true); + } + }); + eventBus.addHandler(UserSignOutEvent.getType(), new UserSignOutHandler() { + @Override + public void onUserSignOut(final UserSignOutEvent event) { + chatIcon.setVisible(false); + } + }); + eventBus.addHandler(ShowChatDialogEvent.getType(), new ShowChatDialogHandler() { + @Override + public void onShowChatDialog(final ShowChatDialogEvent event) { + showDialog(event.show); + } + }); + eventBus.addHandler(ToggleShowChatDialogEvent.getType(), new ToggleShowChatDialogHandler() { + @Override + public void onToggleShowChatDialog(final ToggleShowChatDialogEvent event) { + toggleShowDialog(); + } + }); + } + }); + } + + @Override + public void addNewBuddie(final String shortName) { + // TODO Auto-generated method stub + + } + + @Override + public void chat(final XmppURI jid) { + // TODO Auto-generated method stub + + } + + private void createDialog(final HablarWidget widget, final HtmlConfig htmlConfig) { + // popup.setSize(htmlConfig.width, htmlConfig.height); + setSize(widget, htmlConfig); + popup.add(widget); + } + + private DialogBox createDialog2(final HablarWidget widget, final HtmlConfig htmlConfig) { + final DialogBox dialog = new DialogBox(); + dialog.setText("Hablar"); + setSize(dialog, htmlConfig); + dialog.show(); + dialog.center(); + return dialog; + } + + private void createDialogIfNeeded() { + if (popup == null) { + popup = new PopupTopPanel(); + initEmite(); + } + } + + private void initEmite() { + final String icons = PageAssist.getMeta("hablar.icons"); + if ("alt".equals(icons)) { + AltIcons.load(); + } else if ("ie6".equals(icons)) { + IE6GifIcons.load(); + } else { + DefaultIcons.load(); + } + + final HablarConfig config = HablarConfig.getFromMeta(); + final HtmlConfig htmlConfig = HtmlConfig.getFromMeta(); + htmlConfig.hasLogger = true; + final HablarWidget widget = new HablarWidget(config.layout, config.tabHeaderSize); + final Hablar hablar = widget.getHablar(); + + HablarComplete.install(hablar, config); + + if (htmlConfig.hasLogger) { + new HablarConsole(hablar); + } + + if (htmlConfig.hasLogin) { + new HablarLogin(hablar, LoginConfig.getFromMeta()); + } + createDialog(widget, htmlConfig); + } + + @Override + public boolean isBuddie(final String localUserName) { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean isBuddie(final XmppURI jid) { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean isLoggedIn() { + // TODO Auto-generated method stub + return false; + } + + @Override + public void joinRoom(final String roomName, final String userAlias) { + // TODO Auto-generated method stub + + } + + @Override + public void joinRoom(final String roomName, final String subject, final String userAlias) { + // TODO Auto-generated method stub + + } + + @Override + public void login(final String jid, final String passwd) { + // TODO Auto-generated method stub + + } + + @Override + public void logout() { + // TODO Auto-generated method stub + + } + + @Override + public void setAvatar(final String photoBinary) { + // TODO Auto-generated method stub + + } + + private void setSize(final Widget widget, final HtmlConfig htmlConfig) { + if (htmlConfig.width != null) { + widget.setWidth(htmlConfig.width); + } + if (htmlConfig.height != null) { + widget.setHeight(htmlConfig.height); + } + widget.setWidth("400px"); + widget.setHeight("400px"); + } + + @Override + public void show() { + // TODO Auto-generated method stub + + } + + private void showDialog(final boolean show) { + if (session.isLogged()) { + createDialogIfNeeded(); + if (show) { + popup.showCentered(); + } else { + popup.hide(); + } + } + } + + @Override + public void stop() { + // TODO Auto-generated method stub + + } + + private void toggleShowDialog() { + showDialog(popup == null ? true : !popup.isShowing()); + } + +} Added: trunk/src/main/java/cc/kune/chat/client/ShowChatDialogEvent.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ShowChatDialogEvent.java (rev 0) +++ trunk/src/main/java/cc/kune/chat/client/ShowChatDialogEvent.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -0,0 +1,81 @@ +package cc.kune.chat.client; + +import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.event.shared.HasHandlers; + +public class ShowChatDialogEvent extends GwtEvent<ShowChatDialogEvent.ShowChatDialogHandler> { + + public interface HasShowChatDialogHandlers extends HasHandlers { + HandlerRegistration addShowChatDialogHandler(ShowChatDialogHandler handler); + } + + public interface ShowChatDialogHandler extends EventHandler { + public void onShowChatDialog(ShowChatDialogEvent event); + } + + private static final Type<ShowChatDialogHandler> TYPE = new Type<ShowChatDialogHandler>(); + + public static void fire(final HasHandlers source, final boolean show) { + source.fireEvent(new ShowChatDialogEvent(show)); + } + + public static Type<ShowChatDialogHandler> getType() { + return TYPE; + } + + boolean show; + + protected ShowChatDialogEvent() { + // Possibly for serialization. + } + + public ShowChatDialogEvent(final boolean show) { + this.show = show; + } + + @Override + protected void dispatch(final ShowChatDialogHandler handler) { + handler.onShowChatDialog(this); + } + + @Override + public boolean equals(final Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final ShowChatDialogEvent other = (ShowChatDialogEvent) obj; + if (show != other.show) { + return false; + } + return true; + } + + @Override + public Type<ShowChatDialogHandler> getAssociatedType() { + return TYPE; + } + + @Override + public int hashCode() { + int hashCode = 23; + hashCode = (hashCode * 37) + Boolean.valueOf(show).hashCode(); + return hashCode; + } + + public boolean isShow() { + return show; + } + + @Override + public String toString() { + return "ShowChatDialogEvent[" + show + "]"; + } +} Property changes on: trunk/src/main/java/cc/kune/chat/client/ShowChatDialogEvent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/chat/client/ToggleShowChatDialogEvent.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ToggleShowChatDialogEvent.java (rev 0) +++ trunk/src/main/java/cc/kune/chat/client/ToggleShowChatDialogEvent.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -0,0 +1,46 @@ +package cc.kune.chat.client; + +import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.event.shared.HasHandlers; + +public class ToggleShowChatDialogEvent extends GwtEvent<ToggleShowChatDialogEvent.ToggleShowChatDialogHandler> { + + public interface HasToggleShowChatDialogHandlers extends HasHandlers { + HandlerRegistration addToggleShowChatDialogHandler(ToggleShowChatDialogHandler handler); + } + + public interface ToggleShowChatDialogHandler extends EventHandler { + public void onToggleShowChatDialog(ToggleShowChatDialogEvent event); + } + + private static final Type<ToggleShowChatDialogHandler> TYPE = new Type<ToggleShowChatDialogHandler>(); + + public static void fire(final HasHandlers source, final boolean show) { + source.fireEvent(new ToggleShowChatDialogEvent()); + } + + public static Type<ToggleShowChatDialogHandler> getType() { + return TYPE; + } + + protected ToggleShowChatDialogEvent() { + // Possibly for serialization. + } + + @Override + protected void dispatch(final ToggleShowChatDialogHandler handler) { + handler.onToggleShowChatDialog(this); + } + + @Override + public Type<ToggleShowChatDialogHandler> getAssociatedType() { + return TYPE; + } + + @Override + public String toString() { + return "ToggleShowChatDialogEvent"; + } +} Property changes on: trunk/src/main/java/cc/kune/chat/client/ToggleShowChatDialogEvent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -24,6 +24,11 @@ } @Override + protected void addStyle(final String style) { + iconLabel.addStyleName(style); + } + + @Override public AbstractGuiItem create(final AbstractGuiActionDescrip descriptor) { super.descriptor = descriptor; iconLabel = new IconLabel(""); Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtGuiProvider.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtGuiProvider.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtGuiProvider.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -1,7 +1,6 @@ package cc.kune.common.client.actions.gxtui; import cc.kune.common.client.actions.gwtui.GwtIconLabelGui; -import cc.kune.common.client.actions.gwtui.GwtToolbarSeparatorGui; import cc.kune.common.client.actions.ui.bind.GuiProvider; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.common.client.actions.ui.descrip.IconLabelDescriptor; @@ -25,7 +24,7 @@ final Provider<GxtMenuGui> gxtMenuGui, final Provider<GxtMenuItemGui> gxtMenuItemGui, final Provider<GxtMenuSeparatorGui> gxtMenuSeparatorGui, final Provider<GxtPushButtonGui> gxtPushButtonGui, final Provider<GxtButtonGui> gxtButtonGui, final Provider<GwtIconLabelGui> gwtIconLabelGui, - final Provider<GxtToolbarGui> gxtToolbarGui, final Provider<GwtToolbarSeparatorGui> gxtToolbarSeparatorGui) { + final Provider<GxtToolbarGui> gxtToolbarGui, final Provider<GxtToolbarSeparatorGui> gxtToolbarSeparatorGui) { guiProvider.register(SubMenuDescriptor.class, gxtSubMenuGui); guiProvider.register(MenuDescriptor.class, gxtMenuGui); Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarGui.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarGui.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -28,16 +28,22 @@ toolbar.add((Component) uiObject); } - public void addFill() { - toolbar.add(new FillToolItem()); + public FillToolItem addFill() { + final FillToolItem item = new FillToolItem(); + toolbar.add(item); + return item; } - public void addSeparator() { - toolbar.add(new SeparatorToolItem()); + public SeparatorToolItem addSeparator() { + final SeparatorToolItem item = new SeparatorToolItem(); + toolbar.add(item); + return item; } - public void addSpacer() { - toolbar.add(new LabelToolItem()); + public LabelToolItem addSpacer() { + final LabelToolItem item = new LabelToolItem(); + toolbar.add(item); + return item; } @Override Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarSeparatorGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarSeparatorGui.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarSeparatorGui.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -6,9 +6,20 @@ import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor; import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor.Type; +import com.extjs.gxt.ui.client.widget.Component; + public class GxtToolbarSeparatorGui extends AbstractChildGuiItem { + Component separator; + @Override + protected void addStyle(final String style) { + if (separator != null) { + separator.addStyleName(style); + } + } + + @Override public AbstractGuiItem create(final AbstractGuiActionDescrip descriptor) { super.create(descriptor); final GxtToolbarGui toolbar = (GxtToolbarGui) parent; @@ -16,13 +27,13 @@ final Type type = ((ToolbarSeparatorDescriptor) descriptor).getSeparatorType(); switch (type) { case fill: - toolbar.addFill(); + separator = toolbar.addFill(); break; case spacer: - toolbar.addSpacer(); + separator = toolbar.addSpacer(); break; case separator: - toolbar.addSeparator(); + separator = toolbar.addSeparator(); break; default: break; Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -6,8 +6,11 @@ import cc.kune.common.client.actions.PropertyChangeListener; import cc.kune.common.client.actions.ui.bind.GuiBinding; import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; +import cc.kune.common.client.errors.NotImplementedException; import cc.kune.common.client.utils.TextUtils; +import cc.kune.core.client.resources.icons.IconConstants; +import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.ui.Composite; public abstract class AbstractGuiItem extends Composite implements GuiBinding { @@ -86,8 +89,12 @@ } private void setIcon(final Object icon) { - if (icon != null) { + if (icon instanceof ImageResource) { + setIconStyle((IconConstants.CSS_SUFFIX + ((ImageResource) icon).getName())); + } else if (icon instanceof String) { setIconStyle((String) icon); + } else if (icon != null) { + throw new NotImplementedException(); } } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/ActionFlowPanel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/ActionFlowPanel.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/ActionFlowPanel.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -23,7 +23,7 @@ @Override protected void insertWidget(final AbstractGuiItem item, final int position) { - int count = bar.getWidgetCount(); + final int count = bar.getWidgetCount(); bar.insert(item, count < position ? count : position); } } Added: trunk/src/main/java/cc/kune/common/client/actions/ui/ActionSimplePanel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/ActionSimplePanel.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/ActionSimplePanel.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -0,0 +1,29 @@ +package cc.kune.common.client.actions.ui; + +import cc.kune.common.client.actions.ui.bind.GuiProvider; + +import com.google.gwt.user.client.ui.HorizontalPanel; +import com.google.inject.Inject; + +public class ActionSimplePanel extends AbstractComposedGuiItem implements ActionExtensibleView { + + private final HorizontalPanel bar; + + @Inject + public ActionSimplePanel(final GuiProvider guiProvider) { + super(guiProvider); + bar = new HorizontalPanel(); + initWidget(bar); + } + + @Override + protected void addWidget(final AbstractGuiItem item) { + bar.add(item); + } + + @Override + protected void insertWidget(final AbstractGuiItem item, final int position) { + final int count = bar.getWidgetCount(); + bar.insert(item, count < position ? count : position); + } +} Property changes on: trunk/src/main/java/cc/kune/common/client/actions/ui/ActionSimplePanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/common/client/ui/AbstractAtBorderPopupPanel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/AbstractAtBorderPopupPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/ui/AbstractAtBorderPopupPanel.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -0,0 +1,67 @@ +package cc.kune.common.client.ui; + +import com.google.gwt.event.logical.shared.ResizeEvent; +import com.google.gwt.event.logical.shared.ResizeHandler; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.ui.PopupPanel; +import com.google.gwt.user.client.ui.UIObject; + +public abstract class AbstractAtBorderPopupPanel extends PopupPanel { + + private boolean showCentered = true; + protected UIObject showNearObject; + + public AbstractAtBorderPopupPanel() { + super(); + init(); + } + + public AbstractAtBorderPopupPanel(final boolean autohide) { + super(autohide); + init(); + } + + public AbstractAtBorderPopupPanel(final boolean autohide, final boolean modal) { + super(autohide, modal); + init(); + } + + public void defaultStyle() { + addStyleName("k-opacity90"); + addStyleName("k-box-10shadow"); + } + + private void init() { + Window.addResizeHandler(new ResizeHandler() { + @Override + public void onResize(final ResizeEvent event) { + if (showCentered) { + setCenterPositionImpl(); + } else { + showRelativeImpl(); + } + } + }); + } + + public void setCenterPosition() { + setCenterPositionImpl(); + } + + protected abstract void setCenterPositionImpl(); + + public void showCentered() { + showCentered = true; + setCenterPositionImpl(); + } + + public void showNear(final UIObject object) { + this.showNearObject = object; + showCentered = false; + showRelativeImpl(); + } + + private void showRelativeImpl() { + showRelativeTo(showNearObject); + } +} Copied: trunk/src/main/java/cc/kune/common/client/ui/PopupBottomPanel.java (from rev 1225, trunk/src/main/java/cc/kune/common/client/ui/PopupPanelBottomCentered.java) =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/PopupBottomPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/ui/PopupBottomPanel.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -0,0 +1,45 @@ +package cc.kune.common.client.ui; + +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.ui.PopupPanel; +import com.google.gwt.user.client.ui.Widget; + +public class PopupBottomPanel extends AbstractAtBorderPopupPanel { + public PopupBottomPanel() { + this(false, false); + } + + public PopupBottomPanel(final boolean autohide) { + this(autohide, false); + } + + public PopupBottomPanel(final boolean autohide, final boolean modal) { + super(autohide, modal); + defaultStyleImpl(); + } + + @Override + public void defaultStyle() { + defaultStyleImpl(); + } + + private void defaultStyleImpl() { + setStyleName("k-popup-bottom-centered"); + super.defaultStyle(); + addStyleName("k-top-10corners"); + } + + @Override + protected void setCenterPositionImpl() { + setPopupPositionAndShow(new PopupPanel.PositionCallback() { + @Override + public void setPosition(final int offsetWidth, final int offsetHeight) { + final Widget widget = getWidget(); + final int x = (Window.getClientWidth() - (widget != null ? getWidget().getOffsetWidth() : 0)) / 2; + final int y = Window.getClientHeight() - (widget != null ? getWidget().getOffsetHeight() : 0); + PopupBottomPanel.this.setPopupPosition(x, y); + } + }); + } + +} Property changes on: trunk/src/main/java/cc/kune/common/client/ui/PopupBottomPanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/src/main/java/cc/kune/common/client/ui/PopupPanelBottomCentered.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/PopupPanelBottomCentered.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/common/client/ui/PopupPanelBottomCentered.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -1,59 +0,0 @@ -package cc.kune.common.client.ui; - -import com.google.gwt.event.logical.shared.ResizeEvent; -import com.google.gwt.event.logical.shared.ResizeHandler; -import com.google.gwt.user.client.Window; -import com.google.gwt.user.client.ui.PopupPanel; -import com.google.gwt.user.client.ui.Widget; - -public class PopupPanelBottomCentered extends PopupPanel { - - public PopupPanelBottomCentered() { - super(); - init(); - } - - public PopupPanelBottomCentered(final boolean autohide) { - super(autohide); - init(); - } - - public PopupPanelBottomCentered(final boolean autohide, final boolean modal) { - super(autohide, modal); - init(); - } - - private void init() { - setStyleName("k-popup-bottom-centered"); - addStyleName("k-opacity90"); - addStyleName("k-box-10shadow"); - addStyleName("k-top-10corners"); - Window.addResizeHandler(new ResizeHandler() { - @Override - public void onResize(final ResizeEvent event) { - setCenterPositionImpl(); - } - }); - } - - public void setCenterPosition() { - setCenterPositionImpl(); - } - - private void setCenterPositionImpl() { - setPopupPositionAndShow(new PopupPanel.PositionCallback() { - @Override - public void setPosition(final int offsetWidth, final int offsetHeight) { - final Widget widget = getWidget(); - final int x = (Window.getClientWidth() - (widget != null ? getWidget().getOffsetWidth() : 0)) / 2; - final int y = Window.getClientHeight() - (widget != null ? getWidget().getOffsetHeight() : 0); - PopupPanelBottomCentered.this.setPopupPosition(x, y); - } - }); - - } - - public void showCentered() { - setCenterPositionImpl(); - } -} Deleted: trunk/src/main/java/cc/kune/common/client/ui/PopupPanelTopCentered.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/PopupPanelTopCentered.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/common/client/ui/PopupPanelTopCentered.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -1,58 +0,0 @@ -package cc.kune.common.client.ui; - -import com.google.gwt.event.logical.shared.ResizeEvent; -import com.google.gwt.event.logical.shared.ResizeHandler; -import com.google.gwt.user.client.Window; -import com.google.gwt.user.client.ui.PopupPanel; - -public class PopupPanelTopCentered extends PopupPanel { - public PopupPanelTopCentered() { - super(); - init(); - } - - public PopupPanelTopCentered(final boolean autohide) { - super(autohide); - init(); - } - - public PopupPanelTopCentered(final boolean autohide, final boolean modal) { - super(autohide, modal); - if (modal) { - super.setGlassEnabled(true); - } - init(); - } - - private void init() { - setStyleName("k-popup-top-centered"); - addStyleName("k-opacity90"); - addStyleName("k-box-10shadow"); - addStyleName("k-bottom-10corners"); - Window.addResizeHandler(new ResizeHandler() { - @Override - public void onResize(final ResizeEvent event) { - setCenterPositionImpl(); - } - }); - } - - public void setCenterPosition() { - setCenterPositionImpl(); - } - - private void setCenterPositionImpl() { - setPopupPositionAndShow(new PopupPanel.PositionCallback() { - @Override - public void setPosition(final int offsetWidth, final int offsetHeight) { - final int x = (Window.getClientWidth() - (getWidget() != null ? getWidget().getOffsetWidth() : 0)) / 2; - final int y = 0; - PopupPanelTopCentered.this.setPopupPosition(x, y); - } - }); - } - - public void showCentered() { - setCenterPositionImpl(); - } -} Copied: trunk/src/main/java/cc/kune/common/client/ui/PopupTopPanel.java (from rev 1226, trunk/src/main/java/cc/kune/common/client/ui/PopupPanelTopCentered.java) =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/PopupTopPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/ui/PopupTopPanel.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -0,0 +1,43 @@ +package cc.kune.common.client.ui; + +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.ui.PopupPanel; + +public class PopupTopPanel extends AbstractAtBorderPopupPanel { + public PopupTopPanel() { + this(false, false); + } + + public PopupTopPanel(final boolean autohide) { + this(autohide, false); + } + + public PopupTopPanel(final boolean autohide, final boolean modal) { + super(autohide, modal); + defaultStyleImpl(); + } + + @Override + public void defaultStyle() { + defaultStyleImpl(); + } + + private void defaultStyleImpl() { + setStyleName("k-popup-top-centered"); + super.defaultStyle(); + addStyleName("k-bottom-10corners"); + } + + @Override + protected void setCenterPositionImpl() { + setPopupPositionAndShow(new PopupPanel.PositionCallback() { + @Override + public void setPosition(final int offsetWidth, final int offsetHeight) { + final int x = (Window.getClientWidth() - (getWidget() != null ? getWidget().getOffsetWidth() : 0)) / 2; + final int y = 0; + PopupTopPanel.this.setPopupPosition(x, y); + } + }); + } + +} Property changes on: trunk/src/main/java/cc/kune/common/client/ui/PopupTopPanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/common/public/kune-common.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-01-29 03:38:12 UTC (rev 1227) @@ -6,11 +6,11 @@ } -.k-floatleft { +.k-floatleft, .k-fl { float: left; } -.k-floatright { +.k-floatright, .k-fr { float: right; } Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -1,5 +1,7 @@ package cc.kune.core.client; +import cc.kune.chat.client.ChatClient; +import cc.kune.chat.client.ChatClientDefault; import cc.kune.common.client.actions.gwtui.GwtGuiProvider; import cc.kune.common.client.actions.gxtui.GxtGuiProvider; import cc.kune.common.client.actions.ui.bind.DefaultGuiProvider; @@ -131,5 +133,7 @@ bind(SitebarSignOutLink.class).in(Singleton.class); bind(BeforeSignOut.class).in(Singleton.class); bind(SiteTokenListeners.class).asEagerSingleton(); + + bind(ChatClient.class).to(ChatClientDefault.class).in(Singleton.class); } } Modified: trunk/src/main/java/cc/kune/core/client/CoreGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinjector.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/core/client/CoreGinjector.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -1,5 +1,6 @@ package cc.kune.core.client; +import cc.kune.chat.client.ChatClient; import cc.kune.common.client.actions.gwtui.GwtGuiProvider; import cc.kune.common.client.actions.gxtui.GxtGuiProvider; import cc.kune.common.client.actions.ui.bind.GuiProvider; @@ -34,6 +35,8 @@ * see the GWTPlatform doc */ + ChatClient getChatClient(); + AsyncProvider<CookiesManager> getCookiesManager(); Provider<CorePresenter> getCorePresenter(); @@ -54,8 +57,6 @@ I18nTranslationService getI18n(); - // PlaceManager getPlaceManager(); - ProxyFailureHandler getProxyFailureHandler(); AsyncProvider<RegisterPresenter> getRegisterPresenter(); Modified: trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -3,7 +3,6 @@ import cc.kune.common.client.noti.NotifyUser; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; -import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.GWT.UncaughtExceptionHandler; @@ -15,6 +14,7 @@ * The Class KuneEntryPoint. */ public class KuneEntryPoint implements EntryPoint { + public final CoreGinjector ginjector = GWT.create(CoreGinjector.class); /* @@ -31,7 +31,6 @@ e.printStackTrace(); } }); - Log.setCurrentLogLevel(Log.LOG_LEVEL_DEBUG); Scheduler.get().scheduleDeferred(new ScheduledCommand() { @Override public void execute() { @@ -58,5 +57,6 @@ ginjector.getSpinerPresenter(); ginjector.getSiteLogoPresenter(); ginjector.getSpacesTabPresenter(); + ginjector.getChatClient(); } } Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -23,6 +23,7 @@ import cc.kune.core.client.cookies.CookiesManager; import cc.kune.core.client.errors.UserAuthException; import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.logs.Log; import cc.kune.core.client.notify.spiner.ProgressHideEvent; import cc.kune.core.client.notify.spiner.ProgressShowEvent; import cc.kune.core.client.resources.CoreMessages; @@ -33,7 +34,6 @@ import cc.kune.core.shared.dto.UserDTO; import cc.kune.core.shared.dto.UserInfoDTO; -import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.logical.shared.CloseEvent; Modified: trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -20,6 +20,7 @@ package cc.kune.core.client.errors; import cc.kune.common.client.noti.NotifyLevel; +import cc.kune.core.client.logs.Log; import cc.kune.core.client.notify.alerts.AlertEvent; import cc.kune.core.client.notify.msgs.UserNotifyEvent; import cc.kune.core.client.notify.spiner.ProgressHideEvent; @@ -28,7 +29,6 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.core.client.GWT; import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException; Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -25,12 +25,12 @@ import cc.kune.common.client.utils.Location; import cc.kune.common.client.utils.TextUtils; import cc.kune.common.client.utils.WindowUtils; +import cc.kune.core.client.logs.Log; import cc.kune.core.client.rpcservices.I18nServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.shared.dto.I18nLanguageDTO; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.allen_sauer.gwt.log.client.Log; import com.calclab.suco.client.events.Listener0; import com.google.gwt.event.shared.EventBus; import com.google.gwt.i18n.client.DateTimeFormat; @@ -192,6 +192,7 @@ */ @Override public String t(final String text) { + assert lexicon != null; final String encodeText = TextUtils.escapeHtmlLight(text); String translation = lexicon.get(encodeText); if (lexicon.containsKey(encodeText)) { Modified: trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -20,13 +20,13 @@ package cc.kune.core.client.init; import cc.kune.common.client.noti.NotifyLevel; +import cc.kune.core.client.logs.Log; import cc.kune.core.client.notify.msgs.UserNotifyEvent; import cc.kune.core.client.notify.spiner.ProgressHideEvent; import cc.kune.core.client.rpcservices.SiteServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.shared.dto.InitDataDTO; -import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.event.shared.EventBus; Added: trunk/src/main/java/cc/kune/core/client/logs/Log.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/logs/Log.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/logs/Log.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -0,0 +1,19 @@ +package cc.kune.core.client.logs; + +import com.google.gwt.core.client.GWT; + +public class Log { + + public static void debug(final String message) { + GWT.log(message); + } + + public static void debug(final String message, final Throwable caught) { + GWT.log(message, caught); + } + + public static void error(final String message) { + debug(message); + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/logs/Log.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierViewImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierViewImpl.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierViewImpl.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -1,6 +1,6 @@ package cc.kune.core.client.notify.msgs; -import cc.kune.common.client.ui.PopupPanelBottomCentered; +import cc.kune.common.client.ui.PopupBottomPanel; import cc.kune.core.client.notify.msgs.UserNotifierPresenter.UserNotifierView; import cc.kune.msgs.client.CloseCallback; import cc.kune.msgs.client.UserMessagesPanel; @@ -13,7 +13,7 @@ public class UserNotifierViewImpl extends PopupViewImpl implements UserNotifierView { private final UserMessagesPresenter msgs; - private final PopupPanelBottomCentered popup; + private final PopupBottomPanel popup; @Inject public UserNotifierViewImpl(EventBus eventBus, UserMessagesPresenter msgs, UserMessagesPanel panel) { @@ -21,7 +21,7 @@ this.msgs = msgs; msgs.init(panel); panel.setWidth("370px"); - popup = new PopupPanelBottomCentered(false, false); + popup = new PopupBottomPanel(false, false); popup.add(panel); popup.show(); } Copied: trunk/src/main/java/cc/kune/core/client/resources/icons/IconBorrarCssResource.java (from rev 1223, trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgCssResource.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/icons/IconBorrarCssResource.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/resources/icons/IconBorrarCssResource.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -0,0 +1,36 @@ +package cc.kune.core.client.resources.icons; + +import com.google.gwt.resources.client.CssResource; + +public interface IconBorrarCssResource extends CssResource { + // + // @ClassName("k-icon-addGreen") + // String kIconAddGreen(); + // + // @ClassName("k-icon-bug") + // String kIconBug(); + // + // @ClassName("k-icon-chat") + // String kIconChat(); + // + // @ClassName("k-icon-groupHome") + // String kIconGroupHome(); + // + // @ClassName("k-icon-info") + // String kIconInfo(); + // + // @ClassName("k-icon-kuneIcon16") + // String kIconKuneIcon16(); + // + // @ClassName("k-icon-language") + // String kIconLanguage(); + // + // @ClassName("k-icon-maximize") + // String kIconMaaximize(); + // + // @ClassName("k-icon-minimize") + // String kIconMinimize(); + // + // @ClassName("k-icon-prefs") + // String kIconPrefs(); +} Copied: trunk/src/main/java/cc/kune/core/client/resources/icons/IconConstants.java (from rev 1223, trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgConstants.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/icons/IconConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/resources/icons/IconConstants.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -0,0 +1,17 @@ +package cc.kune.core.client.resources.icons; + +import com.google.gwt.resources.client.ImageResource; + +public final class IconConstants { + + public static final String CSS_SUFFIX = "k-icon-"; + + public static final String PATH_PREFIX = "images/"; + + public static String toPath(final ImageResource img) { + return PATH_PREFIX + img.getName() + ".png"; + } + + private IconConstants() { + } +} Copied: trunk/src/main/java/cc/kune/core/client/resources/icons/IconResources.java (from rev 1223, trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgResources.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/icons/IconResources.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/resources/icons/IconResources.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -0,0 +1,44 @@ +package cc.kune.core.client.resources.icons; + +import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.resources.client.ImageResource; + +public interface IconResources extends ClientBundle { + + @Source("add-green.png") + ImageResource addGreen(); + + @Source("bug.png") + ImageResource bug(); + + @Source("e-icon.gif") + ImageResource chat(); + + @Source("kicon.css") + // @Strict + IconBorrarCssResource css(); + + @Source("del-green.png") + ImageResource delGreen(); + + @Source("group-home.png") + ImageResource groupHome(); + + @Source("info.png") + ImageResource info(); + + @Source("kune-icon16.png") + ImageResource kuneIcon16(); + + @Source("language.png") + ImageResource language(); + + @Source("arrow_out.png") + ImageResource maximize(); + + @Source("arrow_in.png") + ImageResource minimize(); + + @Source("prefs.png") + ImageResource prefs(); +} Copied: trunk/src/main/java/cc/kune/core/client/resources/icons/add-green.png (from rev 1223, trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/add-green.png) =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/icons/add-green.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/src/main/java/cc/kune/core/client/resources/icons/arrow_in.png (from rev 1223, trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/arrow_in.png) =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/icons/arrow_in.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/src/main/java/cc/kune/core/client/resources/icons/arrow_out.png (from rev 1223, trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/arrow_out.png) =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/icons/arrow_out.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/src/main/java/cc/kune/core/client/resources/icons/bug.png (from rev 1223, trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/bug.png) =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/icons/bug.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/src/main/java/cc/kune/core/client/resources/icons/del-green.png (from rev 1223, trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/del-green.png) =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/icons/del-green.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/icons/e-icon.gif =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/icons/e-icon.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/src/main/java/cc/kune/core/client/resources/icons/group-home.png (from rev 1223, trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/group-home.png) =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/icons/group-home.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/src/main/java/cc/kune/core/client/resources/icons/info.png (from rev 1223, trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/info.png) =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/icons/info.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/src/main/java/cc/kune/core/client/resources/icons/kicon.css (from rev 1223, trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/kimg.css) =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/icons/kicon.css (rev 0) +++ trunk/src/main/java/cc/kune/core/client/resources/icons/kicon.css 2011-01-29 03:38:12 UTC (rev 1227) @@ -0,0 +1,41 @@ +@external k-icon-info,k-icon-language,k-icon-kuneIcon16,k-icon-bug,k-icon-prefs,k-icon-groupHome,k-icon-addGreen,k-icon-maximize,k-icon-minimize,k-*; + +@sprite div .k-icon-info { + gwt-image: "info"; +} + +@sprite div .k-icon-language { + gwt-image: "language"; +} + +@sprite div .k-icon-kuneIcon16 { + gwt-image: "kuneIcon16"; +} + +@sprite div .k-icon-bug { + gwt-image: "bug"; +} + +@sprite div .k-icon-prefs { + gwt-image: "prefs"; +} + +@sprite div .k-icon-groupHome { + gwt-image: "groupHome"; +} + +@sprite div .k-icon-addGreen { + gwt-image: "addGreen"; +} + +@sprite div .k-icon-maximize { + gwt-image: "maximize"; +} + +@sprite div .k-icon-chat { + gwt-image: "chat"; +} + +@sprite div .k-icon-minimize { + gwt-image: "minimize"; +} \ No newline at end of file Copied: trunk/src/main/java/cc/kune/core/client/resources/icons/kune-icon16.png (from rev 1223, trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/kune-icon16.png) =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/icons/kune-icon16.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/src/main/java/cc/kune/core/client/resources/icons/language.png (from rev 1223, trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/language.png) =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/icons/language.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/src/main/java/cc/kune/core/client/resources/icons/prefs.png (from rev 1223, trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/prefs.png) =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/icons/prefs.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -1,6 +1,7 @@ package cc.kune.core.client.sitebar; import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.IsActionExtensible; import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; @@ -8,12 +9,15 @@ import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.actions.ui.descrip.ToolbarDescriptor; +import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor; +import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor.Type; import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.notify.msgs.UserNotifyEvent; import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; +import com.google.inject.Provider; import com.gwtplatform.mvp.client.Presenter; import com.gwtplatform.mvp.client.View; import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; @@ -34,15 +38,16 @@ public static final ToolbarDescriptor TOOLBAR = new ToolbarDescriptor(); private final I18nTranslationService i18n; - private final SitebarNewGroupLink newGroupLink; + private final Provider<SitebarNewGroupLink> newGroupLink; private MenuDescriptor optionsMenu; - private final SitebarSignInLink signInLink; - private final SitebarSignOutLink signOutLink; + private final Provider<SitebarSignInLink> signInLink; + private final Provider<SitebarSignOutLink> signOutLink; @Inject public SitebarActionsPresenter(final EventBus eventBus, final SitebarActionsView view, - final SitebarActionsProxy proxy, final I18nTranslationService i18n, final SitebarNewGroupLink newGroupLink, - final SitebarSignOutLink signOutLink, final SitebarSignInLink signInLink) { + final SitebarActionsProxy proxy, final I18nTranslationService i18n, + final Provider<SitebarNewGroupLink> newGroupLink, final Provider<SitebarSignOutLink> signOutLink, + final Provider<SitebarSignInLink> signInLink) { super(eventBus, view, proxy); this.i18n = i18n; this.newGroupLink = newGroupLink; @@ -72,39 +77,29 @@ public void init() { optionsMenu = new MenuDescriptor(i18n.t("Options")); - - // final IconLabelDescriptor icon = new IconLabelDescriptor("test"); final AbstractExtendedAction action = new AbstractExtendedAction() { - @Override public void actionPerformed(final ActionEvent event) { getEventBus().fireEvent(new UserNotifyEvent("Testing only")); } }; + action.putValue(Action.NAME, "Test"); final MenuItemDescriptor mItem = new MenuItemDescriptor(optionsMenu, action); - optionsMenu.setStyles("k-floatright, k-no-backimage, k-btn-sitebar"); - // action.putValue(Action.NAME, "kk"); - // action.putValue(Action.SHORT_DESCRIPTION, "tooltip"); - // final ButtonDescriptor signIn = new ButtonDescriptor(action); - // final ToolbarSeparatorDescriptor fill = new - // ToolbarSeparatorDescriptor(Type.fill, TOOLBAR); + optionsMenu.setStyles("k-no-backimage, k-btn-sitebar"); + final ToolbarSeparatorDescriptor separator = new ToolbarSeparatorDescriptor(Type.separator, + SitebarActionsPresenter.TOOLBAR); + final ToolbarSeparatorDescriptor spacer = new ToolbarSeparatorDescriptor(Type.spacer, + SitebarActionsPresenter.TOOLBAR); addAction(TOOLBAR); - // addAction(fill); - // addAction(icon); - // addAction(signIn); - // icon.setStyles("k-floatright"); - // signIn.setStyles("k-floatright, k-no-backimage"); + addAction(signInLink.get()); + addAction(signOutLink.get()); + addAction(spacer); + addAction(separator); + addAction(newGroupLink.get()); + addAction(spacer); + addAction(separator); addAction(optionsMenu); addAction(mItem); - // addAction(new ToolbarSeparatorDescriptor(Type.separator, - // SitebarActionsPresenter.TOOLBAR)); - addAction(newGroupLink); - addAction(signInLink); - addAction(signOutLink); - // addAction(new ToolbarSeparatorDescriptor(Type.spacer, - // SitebarActionsPresenter.TOOLBAR)); - // addAction(new ToolbarSeparatorDescriptor(Type.spacer, - // SitebarActionsPresenter.TOOLBAR)); } @ProxyEvent Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsViewImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsViewImpl.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsViewImpl.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -1,6 +1,6 @@ package cc.kune.core.client.sitebar; -import cc.kune.common.client.actions.ui.ActionFlowPanel; +import cc.kune.common.client.actions.ui.ActionSimplePanel; import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.core.client.sitebar.SitebarActionsPresenter.SitebarActionsView; @@ -12,14 +12,15 @@ public class SitebarActionsViewImpl extends ViewImpl implements SitebarActionsView { - private final ActionFlowPanel panel; + private final ActionSimplePanel panel; @Inject - public SitebarActionsViewImpl(final WsArmor armor, final ActionFlowPanel panel) { + public SitebarActionsViewImpl(final WsArmor armor, final ActionSimplePanel panel) { this.panel = panel; panel.addStyleName("k-sitebar"); + panel.addStyleName("k-floatright"); + armor.getSitebar().add(panel); // armor.getDocContainer().add(panel); - armor.getSitebar().add(panel); // panel.setWidth("100%"); } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -33,6 +33,6 @@ @Inject public SitebarNewGroupLink(final SitebarNewGroupAction action) { super(action); - setStyles("k-floatright, k-no-backimage, k-btn-sitebar"); + setStyles("k-no-backimage, k-btn-sitebar"); } } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -42,7 +42,7 @@ @Inject public SitebarSignInLink(final SitebarSignInAction action, final EventBus eventBus, final Session session) { super(action); - setStyles("k-floatright, k-no-backimage, k-btn-sitebar"); + setStyles("k-no-backimage, k-btn-sitebar"); setId(SITE_SIGN_IN); setVisible(!session.isLogged()); eventBus.addHandler(UserSignInEvent.getType(), new UserSignInHandler() { Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -96,7 +96,7 @@ public SitebarSignOutLink(final SitebarSignOutAction action, final EventBus eventBus, final ErrorHandler errorHandler, final Session session) { super(action); - setStyles("k-floatright, k-no-backimage, k-btn-sitebar"); + setStyles("k-no-backimage, k-btn-sitebar"); setId(SITE_SIGN_OUT); setVisible(session.isLogged()); eventBus.addHandler(UserSignInEvent.getType(), new UserSignInHandler() { Modified: trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -1,32 +1,30 @@ package cc.kune.core.client.state; - import cc.kune.core.shared.domain.utils.AccessRights; -import cc.kune.core.shared.dto.StateAbstractDTO; -import com.calclab.suco.client.events.Event2; -import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener2; public class AccessRightsClientManager { - private AccessRights previousRights; - private final Event2<AccessRights, AccessRights> onRightsChanged; + private final AccessRights previousRights; + // private final Event2<AccessRights, AccessRights> onRightsChanged; + public AccessRightsClientManager(final StateManager stateManager) { this.previousRights = null; - this.onRightsChanged = new Event2<AccessRights , AccessRights >("onRightsChanged"); - stateManager.onStateChanged(new Listener<StateAbstractDTO>() { - public void onEvent(final StateAbstractDTO newState) { - final AccessRights rights = newState.getGroupRights(); - if (!rights.equals(previousRights)) { - onRightsChanged.fire(previousRights, rights); - previousRights = rights; - } - } - }); + // this.onRightsChanged = new Event2<AccessRights , AccessRights + // >("onRightsChanged"); + // stateManager.onStateChanged(new Listener<StateAbstractDTO>() { + // public void onEvent(final StateAbstractDTO newState) { + // final AccessRights rights = newState.getGroupRights(); + // if (!rights.equals(previousRights)) { + // onRightsChanged.fire(previousRights, rights); + // previousRights = rights; + // } + // } + // }); } public void onRightsChanged(final Listener2<AccessRights, AccessRights> listener) { - onRightsChanged.add(listener); + // onRightsChanged.add(listener); } } Added: trunk/src/main/java/cc/kune/core/client/state/GroupChangedEvent.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/GroupChangedEvent.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/state/GroupChangedEvent.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -0,0 +1,97 @@ +package cc.kune.core.client.state; + +import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.HandlerRegistration; + +import com.google.gwt.event.shared.HasHandlers; + +public class GroupChangedEvent extends GwtEvent<GroupChangedEvent.GroupChangedHandler> { + + public interface HasGroupChangedHandlers extends HasHandlers { + HandlerRegistration addGroupChangedHandler(GroupChangedHandler handler); + } + + public interface GroupChangedHandler extends EventHandler { + public void onGroupChanged(GroupChangedEvent event); + } + + private static final Type<GroupChangedHandler> TYPE = new Type<GroupChangedHandler>(); + + public static void fire(HasHandlers source, java.lang.String previousGroup, java.lang.String newGroup) { + source.fireEvent(new GroupChangedEvent(previousGroup, newGroup)); + } + + public static Type<GroupChangedHandler> getType() { + return TYPE; + } + + java.lang.String previousGroup; + java.lang.String newGroup; + + public GroupChangedEvent(java.lang.String previousGroup, java.lang.String newGroup) { + this.previousGroup = previousGroup; + this.newGroup = newGroup; + } + + protected GroupChangedEvent() { + // Possibly for serialization. + } + + @Override + public Type<GroupChangedHandler> getAssociatedType() { + return TYPE; + } + + public java.lang.String getPreviousGroup() { + return previousGroup; + } + + public java.lang.String getNewGroup() { + return newGroup; + } + + @Override + protected void dispatch(GroupChangedHandler handler) { + handler.onGroupChanged(this); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + GroupChangedEvent other = (GroupChangedEvent) obj; + if (previousGroup == null) { + if (other.previousGroup != null) + return false; + } else if (!previousGroup.equals(other.previousGroup)) + return false; + if (newGroup == null) { + if (other.newGroup != null) + return false; + } else if (!newGroup.equals(other.newGroup)) + return false; + return true; + } + + @Override + public int hashCode() { + int hashCode = 23; + hashCode = (hashCode * 37) + (previousGroup == null ? 1 : previousGroup.hashCode()); + hashCode = (hashCode * 37) + (newGroup == null ? 1 : newGroup.hashCode()); + return hashCode; + } + + @Override + public String toString() { + return "GroupChangedEvent[" + + previousGroup + + "," + + newGroup + + "]"; + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/state/GroupChangedEvent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -22,7 +22,9 @@ import java.util.Collection; import java.util.List; +import cc.kune.common.client.errors.NotImplementedException; import cc.kune.core.client.cookies.CookiesManager; +import cc.kune.core.client.logs.Log; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.UserServiceAsync; import cc.kune.core.shared.domain.utils.StateToken; @@ -38,9 +40,6 @@ import cc.kune.core.shared.dto.UserInfoDTO; import cc.kune.core.shared.dto.UserSimpleDTO; -import com.allen_sauer.gwt.log.client.Log; -import com.calclab.suco.client.events.Event; -import com.calclab.suco.client.events.Event0; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; import com.google.gwt.core.client.GWT; @@ -49,31 +48,25 @@ import com.google.inject.Provider; public class SessionDefault implements Session { - private String userHash; - private InitDataDTO initData; + private Object[][] countriesArray; + private I18nLanguageDTO currentLanguage; + private StateAbstractDTO currentState; private UserInfoDTO currentUserInfo; + private final EventBus eventBus; + private InitDataDTO initData; private Object[][] languagesArray; - private Object[][] countriesArray; private Object[][] timezonesArray; - private StateAbstractDTO currentState; - private I18nLanguageDTO currentLanguage; - private final Event<InitDataDTO> onInitDataReceived; - private final Event<UserInfoDTO> onUserSignIn; - private final Event0 onUserSignOut; + private String userHash; private final Provider<UserServiceAsync> userServiceProvider; - private final EventBus eventBus; @Inject public SessionDefault(final CookiesManager cookieManager, final Provider<UserServiceAsync> userServiceProvider, - EventBus eventBus) { + final EventBus eventBus) { this.eventBus = eventBus; this.userHash = cookieManager.getCurrentCookie(); this.userHash = userHash == null || userHash.equals("null") ? null : userHash; this.userServiceProvider = userServiceProvider; languagesArray = null; - this.onInitDataReceived = new Event<InitDataDTO>("initDataReceived"); - this.onUserSignIn = new Event<UserInfoDTO>("onUserSignIn"); - this.onUserSignOut = new Event0("onUserSignOut"); } @Override @@ -263,19 +256,50 @@ return !isLogged(); } + private Object[][] mapCountries() { + assert initData != null; + final Object[][] objs = new Object[initData.getCountries().size()][1]; + int i = 0; + for (final I18nCountryDTO country : initData.getCountries()) { + final Object[] obj = new Object[] { country.getCode(), country.getEnglishName() }; + objs[i++] = obj; + } + return objs; + } + + private Object[][] mapLangs() { + assert initData != null; + final Object[][] objs = new Object[initData.getLanguages().size()][1]; + int i = 0; + for (final I18nLanguageSimpleDTO language : initData.getLanguages()) { + final Object[] obj = new Object[] { language.getCode(), language.getEnglishName() }; + objs[i++] = obj; + } + return objs; + } + + private void mapTimezones() { + assert initData != null; + timezonesArray = new Object[initData.getTimezones().length][1]; + for (int i = 0; i < getTimezones().length; i++) { + final Object[] obj = new Object[] { initData.getTimezones()[i] }; + timezonesArray[i] = obj; + } + } + @Override public void onInitDataReceived(final Listener<InitDataDTO> listener) { - onInitDataReceived.add(listener); + throw new NotImplementedException(); } @Override public void onUserSignIn(final Listener<UserInfoDTO> listener) { - onUserSignIn.add(listener); + throw new NotImplementedException(); } @Override public void onUserSignOut(final Listener0 listener) { - onUserSignOut.add(listener); + throw new NotImplementedException(); } @Override @@ -293,52 +317,18 @@ this.currentUserInfo = currentUserInfo; if (currentUserInfo != null) { eventBus.fireEvent(new UserSignInEvent(currentUserInfo)); - onUserSignIn.fire(currentUserInfo); } else { eventBus.fireEvent(new UserSignOutEvent()); - onUserSignOut.fire(); } } @Override public void setInitData(final InitDataDTO initData) { this.initData = initData; - onInitDataReceived.fire(initData); } @Override public void setUserHash(final String userHash) { this.userHash = userHash; } - - private Object[][] mapCountries() { - assert initData != null; - final Object[][] objs = new Object[initData.getCountries().size()][1]; - int i = 0; - for (final I18nCountryDTO country : initData.getCountries()) { - final Object[] obj = new Object[] { country.getCode(), country.getEnglishName() }; - objs[i++] = obj; - } - return objs; - } - - private Object[][] mapLangs() { - assert initData != null; - final Object[][] objs = new Object[initData.getLanguages().size()][1]; - int i = 0; - for (final I18nLanguageSimpleDTO language : initData.getLanguages()) { - final Object[] obj = new Object[] { language.getCode(), language.getEnglishName() }; - objs[i++] = obj; - } - return objs; - } - - private void mapTimezones() { - assert initData != null; - timezonesArray = new Object[initData.getTimezones().length][1]; - for (int i = 0; i < getTimezones().length; i++) { - final Object[] obj = new Object[] { initData.getTimezones()[i] }; - timezonesArray[i] = obj; - } - } } Added: trunk/src/main/java/cc/kune/core/client/state/SocialNetworkChangedEvent.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/SocialNetworkChangedEvent.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/state/SocialNetworkChangedEvent.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -0,0 +1,83 @@ +package cc.kune.core.client.state; + +import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.HandlerRegistration; + +import com.google.gwt.event.shared.HasHandlers; + +public class SocialNetworkChangedEvent extends GwtEvent<SocialNetworkChangedEvent.SocialNetworkChangedHandler> { + + public interface HasSocialNetworkChangedHandlers extends HasHandlers { + HandlerRegistration addSocialNetworkChangedHandler(SocialNetworkChangedHandler handler); + } + + public interface SocialNetworkChangedHandler extends EventHandler { + public void onSocialNetworkChanged(SocialNetworkChangedEvent event); + } + + private static final Type<SocialNetworkChangedHandler> TYPE = new Type<SocialNetworkChangedHandler>(); + + public static void fire(HasHandlers source, cc.kune.core.shared.dto.StateAbstractDTO state) { + source.fireEvent(new SocialNetworkChangedEvent(state)); + } + + public static Type<SocialNetworkChangedHandler> getType() { + return TYPE; + } + + cc.kune.core.shared.dto.StateAbstractDTO state; + + public SocialNetworkChangedEvent(cc.kune.core.shared.dto.StateAbstractDTO state) { + this.state = state; + } + + protected SocialNetworkChangedEvent() { + // Possibly for serialization. + } + + @Override + public Type<SocialNetworkChangedHandler> getAssociatedType() { + return TYPE; + } + + public cc.kune.core.shared.dto.StateAbstractDTO getState() { + return state; + } + + @Override + protected void dispatch(SocialNetworkChangedHandler handler) { + handler.onSocialNetworkChanged(this); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + SocialNetworkChangedEvent other = (SocialNetworkChangedEvent) obj; + if (state == null) { + if (other.state != null) + return false; + } else if (!state.equals(other.state)) + return false; + return true; + } + + @Override + public int hashCode() { + int hashCode = 23; + hashCode = (hashCode * 37) + (state == null ? 1 : state.hashCode()); + return hashCode; + } + + @Override + public String toString() { + return "SocialNetworkChangedEvent[" + + state + + "]"; + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/state/SocialNetworkChangedEvent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/state/StateChangedEvent.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateChangedEvent.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/state/StateChangedEvent.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -0,0 +1,83 @@ +package cc.kune.core.client.state; + +import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.HandlerRegistration; + +import com.google.gwt.event.shared.HasHandlers; + +public class StateChangedEvent extends GwtEvent<StateChangedEvent.StateChangedHandler> { + + public interface HasStateChangedHandlers extends HasHandlers { + HandlerRegistration addStateChangedHandler(StateChangedHandler handler); + } + + public interface StateChangedHandler extends EventHandler { + public void onStateChanged(StateChangedEvent event); + } + + private static final Type<StateChangedHandler> TYPE = new Type<StateChangedHandler>(); + + public static void fire(HasHandlers source, cc.kune.core.shared.dto.StateAbstractDTO state) { + source.fireEvent(new StateChangedEvent(state)); + } + + public static Type<StateChangedHandler> getType() { + return TYPE; + } + + cc.kune.core.shared.dto.StateAbstractDTO state; + + public StateChangedEvent(cc.kune.core.shared.dto.StateAbstractDTO state) { + this.state = state; + } + + protected StateChangedEvent() { + // Possibly for serialization. + } + + @Override + public Type<StateChangedHandler> getAssociatedType() { + return TYPE; + } + + public cc.kune.core.shared.dto.StateAbstractDTO getState() { + return state; + } + + @Override + protected void dispatch(StateChangedHandler handler) { + handler.onStateChanged(this); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + StateChangedEvent other = (StateChangedEvent) obj; + if (state == null) { + if (other.state != null) + return false; + } else if (!state.equals(other.state)) + return false; + return true; + } + + @Override + public int hashCode() { + int hashCode = 23; + hashCode = (hashCode * 37) + (state == null ? 1 : state.hashCode()); + return hashCode; + } + + @Override + public String toString() { + return "StateChangedEvent[" + + state + + "]"; + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/state/StateChangedEvent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -23,15 +23,14 @@ import cc.kune.common.client.actions.BeforeActionCollection; import cc.kune.common.client.actions.BeforeActionListener; +import cc.kune.common.client.errors.NotImplementedException; +import cc.kune.core.client.logs.Log; import cc.kune.core.client.notify.spiner.ProgressHideEvent; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.SocialNetworkDataDTO; import cc.kune.core.shared.dto.StateAbstractDTO; -import com.allen_sauer.gwt.log.client.Log; -import com.calclab.suco.client.events.Event; -import com.calclab.suco.client.events.Event2; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener2; import com.google.gwt.event.logical.shared.ValueChangeEvent; @@ -44,10 +43,6 @@ private final ContentProvider contentProvider; private final EventBus eventBus; private final HistoryWrapper history; - private final Event2<String, String> onGroupChanged; - private final Event<StateAbstractDTO> onSocialNetworkChanged; - private final Event<StateAbstractDTO> onStateChanged; - private final Event2<String, String> onToolChanged; private StateToken previousToken; /** * When a historyChanged is interrupted (for instance because you are @@ -66,10 +61,6 @@ this.history = history; this.previousToken = null; this.resumedToken = null; - this.onStateChanged = new Event<StateAbstractDTO>("onStateChanged"); - this.onGroupChanged = new Event2<String, String>("onGroupChanged"); - this.onToolChanged = new Event2<String, String>("onToolChanged"); - this.onSocialNetworkChanged = new Event<StateAbstractDTO>("onSocialNetworkChanged"); siteTokens = new HashMap<String, HistoryTokenCallback>(); beforeStateChangeCollection = new BeforeActionCollection(); eventBus.addHandler(UserSignInEvent.getType(), new UserSignInEvent.UserSignInHandler() { @@ -110,10 +101,10 @@ final String newToolName = newTokenTool == null ? "" : newTokenTool; if (previousToken == null || previousToolName == null || !previousToolName.equals(newToolName)) { - onToolChanged.fire(previousToolName, newToolName); + ToolChangedEvent.fire(eventBus, previousToolName, newToolName); } if (previousToken == null || !previousGroup.equals(newGroup)) { - onGroupChanged.fire(previousGroup, newGroup); + GroupChangedEvent.fire(eventBus, previousGroup, newGroup); } } @@ -134,7 +125,7 @@ @Override public void onGroupChanged(final Listener2<String, String> listener) { - onGroupChanged.add(listener); + throw new NotImplementedException(); } private void onHistoryChanged(final StateToken newState) { @@ -171,17 +162,17 @@ @Override public void onSocialNetworkChanged(final Listener<StateAbstractDTO> listener) { - onSocialNetworkChanged.add(listener); + throw new NotImplementedException(); } @Override public void onStateChanged(final Listener<StateAbstractDTO> listener) { - onStateChanged.add(listener); + throw new NotImplementedException(); } @Override public void onToolChanged(final Listener2<String, String> listener) { - onToolChanged.add(listener); + throw new NotImplementedException(); } @Override @@ -238,13 +229,13 @@ // with new SN data and we refresh the state // to avoid to reload() again the state state.setSocialNetworkData(socialNet); - onSocialNetworkChanged.fire(state); + SocialNetworkChangedEvent.fire(eventBus, state); } } void setState(final StateAbstractDTO newState) { session.setCurrentState(newState); - onStateChanged.fire(newState); + StateChangedEvent.fire(eventBus, newState); eventBus.fireEvent(new ProgressHideEvent()); checkGroupAndToolChange(newState); previousToken = newState.getStateToken(); Added: trunk/src/main/java/cc/kune/core/client/state/ToolChangedEvent.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/ToolChangedEvent.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/state/ToolChangedEvent.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -0,0 +1,97 @@ +package cc.kune.core.client.state; + +import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.HandlerRegistration; + +import com.google.gwt.event.shared.HasHandlers; + +public class ToolChangedEvent extends GwtEvent<ToolChangedEvent.ToolChangedHandler> { + + public interface HasToolChangedHandlers extends HasHandlers { + HandlerRegistration addToolChangedHandler(ToolChangedHandler handler); + } + + public interface ToolChangedHandler extends EventHandler { + public void onToolChanged(ToolChangedEvent event); + } + + private static final Type<ToolChangedHandler> TYPE = new Type<ToolChangedHandler>(); + + public static void fire(HasHandlers source, java.lang.String previousTool, java.lang.String newTool) { + source.fireEvent(new ToolChangedEvent(previousTool, newTool)); + } + + public static Type<ToolChangedHandler> getType() { + return TYPE; + } + + java.lang.String previousTool; + java.lang.String newTool; + + public ToolChangedEvent(java.lang.String previousTool, java.lang.String newTool) { + this.previousTool = previousTool; + this.newTool = newTool; + } + + protected ToolChangedEvent() { + // Possibly for serialization. + } + + @Override + public Type<ToolChangedHandler> getAssociatedType() { + return TYPE; + } + + public java.lang.String getPreviousTool() { + return previousTool; + } + + public java.lang.String getNewTool() { + return newTool; + } + + @Override + protected void dispatch(ToolChangedHandler handler) { + handler.onToolChanged(this); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ToolChangedEvent other = (ToolChangedEvent) obj; + if (previousTool == null) { + if (other.previousTool != null) + return false; + } else if (!previousTool.equals(other.previousTool)) + return false; + if (newTool == null) { + if (other.newTool != null) + return false; + } else if (!newTool.equals(other.newTool)) + return false; + return true; + } + + @Override + public int hashCode() { + int hashCode = 23; + hashCode = (hashCode * 37) + (previousTool == null ? 1 : previousTool.hashCode()); + hashCode = (hashCode * 37) + (newTool == null ? 1 : newTool.hashCode()); + return hashCode; + } + + @Override + public String toString() { + return "ToolChangedEvent[" + + previousTool + + "," + + newTool + + "]"; + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/state/ToolChangedEvent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicTopDialog.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicTopDialog.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicTopDialog.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -1,6 +1,6 @@ package cc.kune.core.client.ui.dialogs; -import cc.kune.common.client.ui.PopupPanelTopCentered; +import cc.kune.common.client.ui.PopupTopPanel; import com.google.gwt.core.client.GWT; import com.google.gwt.event.logical.shared.HasCloseHandlers; @@ -8,13 +8,13 @@ public class BasicTopDialog extends BasicDialog { - private final PopupPanelTopCentered popup; + private final PopupTopPanel popup; public BasicTopDialog(final String dialogId, final String title, final boolean autohide, final boolean modal, final boolean autoscroll, final int width, final int height, final String icon, final String firstButtonTitle, final String firstButtonId, final String cancelButtonTitle, final String cancelButtonId, final int tabIndexStart) { - popup = new PopupPanelTopCentered(autohide, modal); + popup = new PopupTopPanel(autohide, modal); popup.add(this); popup.ensureDebugId(dialogId); super.getTitleText().setText(title); Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-01-29 03:38:12 UTC (rev 1227) @@ -381,7 +381,7 @@ } .k-sitebar { - margin-top: -30px; + /* margin-top: -30px; */ } .k-link { Modified: trunk/src/main/java/cc/kune/core/public/ws.html =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.html 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/cc/kune/core/public/ws.html 2011-01-29 03:38:12 UTC (rev 1227) @@ -5,90 +5,41 @@ <title>Kune</title> <script type="text/javascript" language="javascript" src="/ws/ws.nocache.js"></script> -</head> +<meta name="emite.httpBase" content="/http-bind" /> +<meta name="emite.host" content="localhost" /> +<meta name="emite.searchHost" content="search.localhost" /> +<!-- <meta name="emite.session" content="login" /> --> +<meta name="emite.user" content="admin@localhost" /> +<meta name="emite.password" content="easyeasy" /> +<meta name="hablar.roomService" content="conference.localhost" /> +<meta name="hablar.login" content="false" /> +<meta name="hablar.roster" content="true" /> +<meta name="hablar.dockRoster" content="left" /> +<meta name="hablar.icons" content="alt" /> +<meta name="hablar.layout" content="tabs" /> +<meta name="hablar.inline" content="vertical_dock_div" /> +<meta name="hablar.width" content="100%" /> +<meta name="hablar.height" content="100%" /> <link rel="shortcut icon" href="favicon.ico" /> <!-- FIXME: make something local --> <script src="//ajax.googleapis.com/ajax/libs/webfont/1/webfont.js"></script> <script> -WebFont.load({ - google: { - families: [ 'Ubuntu' ] - }}); + WebFont.load({ + google : { + families : [ 'Ubuntu' ] + } + }); </script> -<link href='http://fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold,bolditalic' rel='stylesheet' type='text/css'> +<link + href='http://fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold,bolditalic' + rel='stylesheet' type='text/css'> <!-- <link href='http://fonts.googleapis.com/css?family=Inconsolata' rel='stylesheet' type='text/css'> --> <link type="text/css" rel="stylesheet" href="gxt/css/gxt-all.css"> <link type="text/css" rel="stylesheet" href="gxt/css/gxt-gray.css"> <style type="text/css"> -<!-- -#kuneinitialcurtain {--><!-- - position: absolute; --> <!-- - left: 0px; --> <!-- - top: 0px; --> <!-- - width: 100%; --> <!-- - height: 100%; --> <!-- - background-color: #F7EBE3; --> <!-- - z-index: 9999; - --> - <!-- -} - ---> -<!-- ---> -<!-- -#kuneloading {--><!-- - position: absolute; --> <!-- - left: 45%; --> <!-- - top: 40%; --> <!-- - z-index: 20001; --> <!-- - height: auto; --> <!-- - border: solid 2px #ccc; --> <!-- - -moz-border-radius: 10px; --> <!-- - -webkit-border-radius: 10px; --> <!-- - border-radius: 10px; --> <!-- - background-color: white; - --> - <!-- -} - ---> -<!-- ---> -<!-- -#kuneloading a {--><!-- - color: #225588; - --> - <!-- -} - ---> -<!-- ---> -<!-- -#kuneloading .kuneloading-indicator {--><!-- - color: #444; --> <!-- - font: bold 13px tahoma, arial, helvetica; --> <!-- - padding: 5px 5px 10px 5px; --> <!-- - margin: 0; --> <!-- - height: auto; - --> - <!-- -} - ---> -<!-- ---> -<!-- -#kuneloading-msg {--><!-- - font: normal 10px arial, tahoma, sans-serif; - --> - <!-- -} ---> </style> - +</head> <body> <!-- RECOMMENDED if your web app will not function without JavaScript enabled --> <noscript> @@ -97,7 +48,6 @@ Your web browser must have JavaScript enabled in order for this application to display correctly.</div> </noscript> - <iframe id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe> <iframe src="" id="__download" style="width: 0; height: 0; border: 0"></iframe> <!--<div id="kuneinitialcurtain"></div>--> Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -36,7 +36,6 @@ import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import org.ourproject.kune.workspace.client.themes.WsBackManager; import org.ourproject.kune.workspace.client.upload.FileUploader; -import org.ourproject.kune.workspace.client.wave.WaveInsert; import cc.kune.common.client.utils.SchedulerManager; import cc.kune.core.client.errors.ErrorHandler; @@ -50,20 +49,18 @@ public class BlogClientActions extends AbstractFoldableContentActions { public BlogClientActions(final I18nUITranslationService i18n, final ContextNavigator contextNavigator, - final Session session, final StateManager stateManager, - final SchedulerManager deferredCommandWrapper, + final Session session, final StateManager stateManager, final SchedulerManager deferredCommandWrapper, final Provider<ContentServiceAsync> contentServiceProvider, final Provider<GroupServiceAsync> groupServiceProvider, final Provider<FileUploader> fileUploaderProvider, final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, final Provider<FileDownloadUtils> fileDownloadProvider, final EntityHeader entityLogo, final Provider<ContentEditor> textEditorProvider, final ErrorHandler errorHandler, final BlogViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider, - final SitePublicSpaceLink publicLink, final WsBackManager wsBackManager, - final Provider<WaveInsert> waveInsert) { + final SitePublicSpaceLink publicLink, final WsBackManager wsBackManager) { super(session, stateManager, i18n, errorHandler, deferredCommandWrapper, groupServiceProvider, contentServiceProvider, fileUploaderProvider, contextNavigator, contentActionRegistry, contextActionRegistry, fileDownloadProvider, textEditorProvider, contextProvEditorProvider, - documentViewer, entityLogo, publicLink, wsBackManager, waveInsert); + documentViewer, entityLogo, publicLink, wsBackManager); } @Override Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -47,7 +47,6 @@ import org.ourproject.kune.workspace.client.themes.WsThemeManager; import org.ourproject.kune.workspace.client.tool.ToolSelector; import org.ourproject.kune.workspace.client.upload.FileUploader; -import org.ourproject.kune.workspace.client.wave.WaveInsert; import cc.kune.common.client.utils.SchedulerManager; import cc.kune.core.client.errors.ErrorHandler; @@ -83,8 +82,7 @@ p(ContentServiceAsync.class), p(GroupServiceAsync.class), p(FileUploader.class), i(ContentActionRegistry.class), i(ContextActionRegistry.class), p(FileDownloadUtils.class), i(EntityHeader.class), p(ContentEditor.class), i(ErrorHandler.class), i(BlogViewer.class), - p(ContextPropEditor.class), i(SitePublicSpaceLink.class), i(WsBackManager.class), - p(WaveInsert.class)); + p(ContextPropEditor.class), i(SitePublicSpaceLink.class), i(WsBackManager.class)); } }); Modified: trunk/src/main/java/org/ourproject/kune/chat/KuneChat.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/KuneChat.gwt.xml 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/chat/KuneChat.gwt.xml 2011-01-29 03:38:12 UTC (rev 1227) @@ -3,6 +3,6 @@ <inherits name="cc.kune.core.Core" /> <inherits name='org.ourproject.kune.platf.KunePlatform' /> <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> - <inherits name="com.calclab.emiteuimodule.EmiteUIModule" /> +<!-- <inherits name="com.calclab.emiteuimodule.EmiteUIModule" />--> <source path="client" /> </module> Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -19,104 +19,87 @@ \*/ package org.ourproject.kune.chat.client; -import org.ourproject.kune.chat.client.cnt.ChatRoom; -import org.ourproject.kune.chat.client.cnt.ChatRoomPanel; -import org.ourproject.kune.chat.client.cnt.ChatRoomPresenter; -import org.ourproject.kune.chat.client.ctx.ChatContext; -import org.ourproject.kune.chat.client.ctx.ChatContextPresenter; -import org.ourproject.kune.chat.client.ctx.room.AddRoom; -import org.ourproject.kune.chat.client.ctx.room.AddRoomPanel; -import org.ourproject.kune.chat.client.ctx.room.AddRoomPresenter; -import org.ourproject.kune.platf.client.app.ToolGroup; -import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import org.ourproject.kune.workspace.client.themes.WsThemeManager; -import org.ourproject.kune.workspace.client.tool.ToolSelector; -import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.init.AppStarter; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.emiteuimodule.client.EmiteUIDialog; -import com.calclab.suco.client.ioc.decorator.Singleton; -import com.calclab.suco.client.ioc.module.Factory; - public class ChatClientModule extends AbstractExtendedModule { @Override public void onInstall() { + // + // register(ToolGroup.class, new + // Factory<ChatClientActions>(ChatClientActions.class) { + // @Override + // public ChatClientActions create() { + // return new ChatClientActions(i(I18nUITranslationService.class), + // i(Session.class), + // i(ContentActionRegistry.class), i(ContextActionRegistry.class), + // p(ChatEngine.class), + // p(AddRoom.class), p(SchedulerManager.class)); + // } + // }); + // + // register(ToolGroup.class, new + // Factory<ChatClientTool>(ChatClientTool.class) { + // @Override + // public ChatClientTool create() { + // return new ChatClientTool(i(I18nUITranslationService.class), + // i(WorkspaceSkeleton.class), + // i(ToolSelector.class), i(WsThemeManager.class), + // i(ContentCapabilitiesRegistry.class)); + // } + // }); + // + // register(ToolGroup.class, new Factory<ChatContext>(ChatContext.class) + // { + // @Override + // public ChatContext create() { + // final ChatContextPresenter presenter = new + // ChatContextPresenter(i(StateManager.class), + // p(ContextNavigator.class)); + // return presenter; + // } + // }); + // + // register(ToolGroup.class, new Factory<ChatEngine>(ChatEngine.class) { + // @Override + // public ChatEngine create() { + // final ChatEngineDefault chatEngineDefault = new + // ChatEngineDefault(i(I18nUITranslationService.class), + // i(WorkspaceSkeleton.class), i(AppStarter.class), i(Session.class), + // p(EmiteUIDialog.class), + // p(FileDownloadUtils.class), i(GlobalShortcutRegister.class)); + // return chatEngineDefault; + // } + // }); + // + // register(ToolGroup.class, new Factory<ChatRoom>(ChatRoom.class) { + // @Override + // public ChatRoom create() { + // final ChatRoomPresenter presenter = new + // ChatRoomPresenter(i(StateManager.class), i(Session.class), + // i(I18nUITranslationService.class), i(ActionContentToolbar.class), + // i(ContentActionRegistry.class), p(FileDownloadUtils.class), + // p(MediaUtils.class)); + // final ChatRoomPanel panel = new + // ChatRoomPanel(i(WorkspaceSkeleton.class), + // i(I18nTranslationService.class)); + // presenter.init(panel); + // return presenter; + // } + // }); + // + // register(Singleton.class, new Factory<AddRoom>(AddRoom.class) { + // @Override + // public AddRoom create() { + // final AddRoomPresenter presenter = new + // AddRoomPresenter(i(Session.class), p(ContentServiceAsync.class), + // i(StateManager.class)); + // final AddRoomPanel panel = new AddRoomPanel(presenter, + // i(I18nTranslationService.class)); + // presenter.init(panel); + // return presenter; + // } + // }); - register(ToolGroup.class, new Factory<ChatClientActions>(ChatClientActions.class) { - @Override - public ChatClientActions create() { - return new ChatClientActions(i(I18nUITranslationService.class), i(Session.class), - i(ContentActionRegistry.class), i(ContextActionRegistry.class), p(ChatEngine.class), - p(AddRoom.class), p(SchedulerManager.class)); - } - }); - - register(ToolGroup.class, new Factory<ChatClientTool>(ChatClientTool.class) { - @Override - public ChatClientTool create() { - return new ChatClientTool(i(I18nUITranslationService.class), i(WorkspaceSkeleton.class), - i(ToolSelector.class), i(WsThemeManager.class), i(ContentCapabilitiesRegistry.class)); - } - }); - - register(ToolGroup.class, new Factory<ChatContext>(ChatContext.class) { - @Override - public ChatContext create() { - final ChatContextPresenter presenter = new ChatContextPresenter(i(StateManager.class), - p(ContextNavigator.class)); - return presenter; - } - }); - - register(ToolGroup.class, new Factory<ChatEngine>(ChatEngine.class) { - @Override - public ChatEngine create() { - final ChatEngineDefault chatEngineDefault = new ChatEngineDefault(i(I18nUITranslationService.class), - i(WorkspaceSkeleton.class), i(AppStarter.class), i(Session.class), p(EmiteUIDialog.class), - p(FileDownloadUtils.class), i(GlobalShortcutRegister.class)); - return chatEngineDefault; - } - }); - - register(ToolGroup.class, new Factory<ChatRoom>(ChatRoom.class) { - @Override - public ChatRoom create() { - final ChatRoomPresenter presenter = new ChatRoomPresenter(i(StateManager.class), i(Session.class), - i(I18nUITranslationService.class), i(ActionContentToolbar.class), - i(ContentActionRegistry.class), p(FileDownloadUtils.class), p(MediaUtils.class)); - final ChatRoomPanel panel = new ChatRoomPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(panel); - return presenter; - } - }); - - register(Singleton.class, new Factory<AddRoom>(AddRoom.class) { - @Override - public AddRoom create() { - final AddRoomPresenter presenter = new AddRoomPresenter(i(Session.class), p(ContentServiceAsync.class), - i(StateManager.class)); - final AddRoomPanel panel = new AddRoomPanel(presenter, i(I18nTranslationService.class)); - presenter.init(panel); - return presenter; - } - }); - } } Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatConnectionOptions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatConnectionOptions.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatConnectionOptions.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -19,18 +19,17 @@ */ package org.ourproject.kune.chat.client; -import com.calclab.emiteuimodule.client.UserChatOptions; public class ChatConnectionOptions { - public UserChatOptions userOptions; - public final String httpBase; public final String domain; + // public UserChatOptions userOptions; + public final String httpBase; public final String roomHost; public ChatConnectionOptions(final String httpBase, final String domain, final String roomHost) { this.httpBase = httpBase; this.domain = domain; this.roomHost = roomHost; - userOptions = null; + // userOptions = null; } } Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -19,306 +19,368 @@ */ package org.ourproject.kune.chat.client; -import java.util.Collection; -import java.util.Date; - -import org.ourproject.kune.platf.client.actions.AbstractExtendedAction; -import org.ourproject.kune.platf.client.actions.ActionEvent; -import org.ourproject.kune.platf.client.actions.KeyStroke; -import org.ourproject.kune.platf.client.actions.Shortcut; -import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; -import org.ourproject.kune.platf.client.ui.noti.NotifyUser; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - -import cc.kune.common.client.utils.WindowUtils; -import cc.kune.core.client.init.AppStarter; -import cc.kune.core.client.state.Session; -import cc.kune.core.shared.dto.InitDataDTO; -import cc.kune.core.shared.dto.UserInfoDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.allen_sauer.gwt.log.client.Log; import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; -import com.calclab.emite.im.client.roster.RosterItem; -import com.calclab.emite.xep.muc.client.Room; -import com.calclab.emiteuimodule.client.EmiteUIDialog; -import com.calclab.emiteuimodule.client.SubscriptionMode; -import com.calclab.emiteuimodule.client.UserChatOptions; -import com.calclab.emiteuimodule.client.chat.ChatUI; -import com.calclab.emiteuimodule.client.params.AvatarProvider; -import com.calclab.emiteuimodule.client.room.RoomUI; -import com.calclab.emiteuimodule.client.status.OwnPresence.OwnStatus; -import com.calclab.suco.client.events.Event0; -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.core.client.Scheduler; -import com.google.gwt.core.client.Scheduler.ScheduledCommand; -import com.google.gwt.user.client.Window; -import com.gwtext.client.core.EventObject; -import com.gwtext.client.widgets.Button; -import com.gwtext.client.widgets.ToolbarButton; -import com.gwtext.client.widgets.event.ButtonListenerAdapter; class ChatEngineDefault implements ChatEngine { - private ChatConnectionOptions chatOptions; - private final I18nTranslationService i18n; - private final WorkspaceSkeleton wskel; - private ToolbarButton traybarButton; - private final Provider<EmiteUIDialog> emiteUIProvider; - private Collection<RosterItem> roster; - private final Event0 onRosterChanged; - private final KeyStroke shortcut; - private final Provider<FileDownloadUtils> downloadUtils; - public ChatEngineDefault(final I18nTranslationService i18n, final WorkspaceSkeleton wskel, - final AppStarter application, final Session session, final Provider<EmiteUIDialog> emiteUIProvider, - final Provider<FileDownloadUtils> downloadUtils, final GlobalShortcutRegister shortcutRegister) { - this.i18n = i18n; - this.wskel = wskel; - this.emiteUIProvider = emiteUIProvider; - this.downloadUtils = downloadUtils; - this.onRosterChanged = new Event0("onRosterChanged"); - shortcut = Shortcut.getShortcut(false, true, false, false, Character.valueOf('C')); - shortcutRegister.put(shortcut, new AbstractExtendedAction() { - @Override - public void actionPerformed(final ActionEvent event) { - if (isDialogStarted()) { - toggleShow(); - } - - } - }); - session.onInitDataReceived(new Listener<InitDataDTO>() { - @Override - public void onEvent(final InitDataDTO initData) { - checkChatDomain(initData.getChatDomain()); - chatOptions = new ChatConnectionOptions(initData.getChatHttpBase(), initData.getChatDomain(), - initData.getChatRoomHost()); - } - - private void checkChatDomain(final String chatDomain) { - final String httpDomain = WindowUtils.getLocation().getHostName(); - if (!chatDomain.equals(httpDomain)) { - Log.error("Your http domain (" + httpDomain + ") is different from the chat domain (" + chatDomain - + "). This will cause problems with the chat functionality. " - + "Please check kune.properties on the server."); - } - } - }); - session.onUserSignOut(new Listener0() { - @Override - public void onEvent() { - logout(); - } - }); - session.onUserSignIn(new Listener<UserInfoDTO>() { - @Override - public void onEvent(final UserInfoDTO user) { - login(user.getChatName(), user.getChatPassword()); - } - }); - // application.onClosing(new Listener<ClosingEvent>() { - // public void onEvent(final ClosingEvent event) { - // stop(); - // } - // }); - } - @Override public void addNewBuddie(final String shortName) { - emiteUIProvider.get().addBuddie(getLocalUserJid(shortName), shortName, ""); + // TODO Auto-generated method stub + } @Override public void addOnRosterChanged(final Listener0 slot) { - onRosterChanged.add(slot); + // TODO Auto-generated method stub + } @Override public void chat(final XmppURI jid) { - emiteUIProvider.get().chat(jid); + // TODO Auto-generated method stub + } @Override public ChatConnectionOptions getChatOptions() { - return chatOptions; + // TODO Auto-generated method stub + return null; } @Override - public boolean isBuddie(final String shortName) { - return isBuddie(getLocalUserJid(shortName)); + public boolean isBuddie(final String localUserName) { + // TODO Auto-generated method stub + return false; } @Override public boolean isBuddie(final XmppURI jid) { - if (roster != null) { - for (final RosterItem item : roster) { - if (item.getJID().equalsNoResource(jid)) { - return true; - } - } - } + // TODO Auto-generated method stub return false; } - public boolean isDialogStarted() { - return !emiteUIProvider.get().isDialogNotStarted(); - } - @Override public boolean isLoggedIn() { - return emiteUIProvider.get().isLoggedIn(); + // TODO Auto-generated method stub + return false; } @Override public void joinRoom(final String roomName, final String userAlias) { - joinRoom(roomName, null, userAlias); + // TODO Auto-generated method stub + } @Override public void joinRoom(final String roomName, final String subject, final String userAlias) { - if (emiteUIProvider.get().isLoggedIn()) { - final XmppURI roomURI = XmppURI.uri(roomName + "@" + chatOptions.roomHost + "/" - + chatOptions.userOptions.getUserJid().getNode()); - final Room room = (Room) emiteUIProvider.get().joinRoom(roomURI); - if (subject != null) { - Scheduler.get().scheduleDeferred(new ScheduledCommand() { - @Override - public void execute() { - final RoomUI roomUI = (RoomUI) room.getData(ChatUI.class); - if (roomUI != null) { - roomUI.setSubject(subject); - } - } - }); - } - } else { - NotifyUser.showAlertMessage(i18n.t("Error"), i18n.t("To join a chatroom you need to be 'online'")); - } + // TODO Auto-generated method stub + } @Override public void login(final String jid, final String passwd) { - final UserChatOptions userChatOptions = getUserChatOptions(jid, passwd); - // FIXME: Avatar provider - final AvatarProvider avatarProvider = new AvatarProvider() { - @Override - public String getAvatarURL(final XmppURI userURI) { - // if (userURI.getHost().equals(chatOptions.domain)) { - // FIXME - // return downloadUtils.get().getLogoImageUrl(new - // StateToken(userURI.getNode())); - // } else { - // return ""; - // } - return "images/person-def.gif"; - } - }; - final String initialWindowTitle = Window.getTitle(); - chatOptions.userOptions = userChatOptions; - if (emiteUIProvider.get().isDialogNotStarted()) { - emiteUIProvider.get().onRosterChanged(new Listener<Collection<RosterItem>>() { - @Override - public void onEvent(final Collection<RosterItem> rosterChanged) { - roster = rosterChanged; - onRosterChanged.fire(); - } - }); - emiteUIProvider.get().start(userChatOptions, chatOptions.httpBase, chatOptions.domain, - chatOptions.roomHost, avatarProvider, i18n.t("Chat")); - } else { - emiteUIProvider.get().setEnableStatusUI(true); - emiteUIProvider.get().refreshUserInfo(chatOptions.userOptions); - } - emiteUIProvider.get().show(OwnStatus.online); - if (traybarButton == null) { - traybarButton = new ToolbarButton(); - traybarButton.setTooltip(i18n.t("Show/hide the chat window" + shortcut.toString())); - traybarButton.setIcon("images/e-icon.gif"); - traybarButton.addListener(new ButtonListenerAdapter() { - @Override - public void onClick(final Button button, final EventObject e) { - toggleShow(); - } - }); - wskel.getSiteTraybar().addButton(traybarButton); - emiteUIProvider.get().onChatAttended(new Listener<String>() { - @Override - public void onEvent(final String parameter) { - traybarButton.setIcon("images/e-icon.gif"); - } - }); - emiteUIProvider.get().onChatUnattendedWithActivity(new Listener<String>() { - @Override - public void onEvent(final String parameter) { - traybarButton.setIcon("images/e-icon-a.gif"); - } - }); - } - emiteUIProvider.get().hide(); - emiteUIProvider.get().onChatAttended(new Listener<String>() { - @Override - public void onEvent(final String parameter) { - Window.setTitle(initialWindowTitle); - } - }); - emiteUIProvider.get().onChatUnattendedWithActivity(new Listener<String>() { - @Override - public void onEvent(final String chatTitle) { - Window.setTitle("(* " + chatTitle + ") " + initialWindowTitle); - } - }); + // TODO Auto-generated method stub + } @Override public void logout() { - if (!emiteUIProvider.get().isDialogNotStarted()) { - emiteUIProvider.get().setOwnPresence(OwnStatus.offline); - chatOptions.userOptions = getUserChatOptions("[email protected]", ""); - emiteUIProvider.get().refreshUserInfo(chatOptions.userOptions); - emiteUIProvider.get().setEnableStatusUI(false); - } + // TODO Auto-generated method stub + } @Override public void setAvatar(final String photoBinary) { - emiteUIProvider.get().setOwnVCardAvatar(photoBinary); + // TODO Auto-generated method stub + } @Override public void show() { - emiteUIProvider.get().show(); + // TODO Auto-generated method stub + } @Override public void stop() { - if (!emiteUIProvider.get().isDialogNotStarted()) { - emiteUIProvider.get().destroy(); - } - if (emiteUIProvider.get().getSession().isLoggedIn()) { - emiteUIProvider.get().getSession().logout(); - } - } + // TODO Auto-generated method stub - public void toggleShow() { - if (emiteUIProvider.get().isVisible()) { - emiteUIProvider.get().hide(); - } else { - emiteUIProvider.get().show(); - } } - - private XmppURI getLocalUserJid(final String shortName) { - return XmppURI.jid(shortName + "@" + chatOptions.domain); - } - - private UserChatOptions getUserChatOptions(final String jid, final String passwd) { - final String resource = "emiteui-" + new Date().getTime() + "-kune"; // + - // getGwtMetaProperty(GWT_PROPERTY_RELEASE); - // FIXME, get this from user profile - return new UserChatOptions(jid + "@" + chatOptions.domain, passwd, resource, "blue", SubscriptionMode.manual, - true); - } + // private ChatConnectionOptions chatOptions; + // private final I18nTranslationService i18n; + // private final WorkspaceSkeleton wskel; + // private ToolbarButton traybarButton; + // private final Provider<EmiteUIDialog> emiteUIProvider; + // private Collection<RosterItem> roster; + // private final Event0 onRosterChanged; + // private final KeyStroke shortcut; + // private final Provider<FileDownloadUtils> downloadUtils; + // + // public ChatEngineDefault(final I18nTranslationService i18n, final + // WorkspaceSkeleton wskel, + // final AppStarter application, final Session session, final + // Provider<EmiteUIDialog> emiteUIProvider, + // final Provider<FileDownloadUtils> downloadUtils, final + // GlobalShortcutRegister shortcutRegister) { + // this.i18n = i18n; + // this.wskel = wskel; + // this.emiteUIProvider = emiteUIProvider; + // this.downloadUtils = downloadUtils; + // this.onRosterChanged = new Event0("onRosterChanged"); + // shortcut = Shortcut.getShortcut(false, true, false, false, + // Character.valueOf('C')); + // shortcutRegister.put(shortcut, new AbstractExtendedAction() { + // @Override + // public void actionPerformed(final ActionEvent event) { + // if (isDialogStarted()) { + // toggleShow(); + // } + // + // } + // }); + // session.onInitDataReceived(new Listener<InitDataDTO>() { + // @Override + // public void onEvent(final InitDataDTO initData) { + // checkChatDomain(initData.getChatDomain()); + // chatOptions = new ChatConnectionOptions(initData.getChatHttpBase(), + // initData.getChatDomain(), + // initData.getChatRoomHost()); + // } + // + // private void checkChatDomain(final String chatDomain) { + // final String httpDomain = WindowUtils.getLocation().getHostName(); + // if (!chatDomain.equals(httpDomain)) { + // Log.error("Your http domain (" + httpDomain + + // ") is different from the chat domain (" + chatDomain + // + "). This will cause problems with the chat functionality. " + // + "Please check kune.properties on the server."); + // } + // } + // }); + // session.onUserSignOut(new Listener0() { + // @Override + // public void onEvent() { + // logout(); + // } + // }); + // session.onUserSignIn(new Listener<UserInfoDTO>() { + // @Override + // public void onEvent(final UserInfoDTO user) { + // login(user.getChatName(), user.getChatPassword()); + // } + // }); + // // application.onClosing(new Listener<ClosingEvent>() { + // // public void onEvent(final ClosingEvent event) { + // // stop(); + // // } + // // }); + // } + // + // @Override + // public void addNewBuddie(final String shortName) { + // emiteUIProvider.get().addBuddie(getLocalUserJid(shortName), shortName, + // ""); + // } + // + // @Override + // public void addOnRosterChanged(final Listener0 slot) { + // onRosterChanged.add(slot); + // } + // + // @Override + // public void chat(final XmppURI jid) { + // emiteUIProvider.get().chat(jid); + // } + // + // @Override + // public ChatConnectionOptions getChatOptions() { + // return chatOptions; + // } + // + // @Override + // public boolean isBuddie(final String shortName) { + // return isBuddie(getLocalUserJid(shortName)); + // } + // + // @Override + // public boolean isBuddie(final XmppURI jid) { + // if (roster != null) { + // for (final RosterItem item : roster) { + // if (item.getJID().equalsNoResource(jid)) { + // return true; + // } + // } + // } + // return false; + // } + // + // public boolean isDialogStarted() { + // return !emiteUIProvider.get().isDialogNotStarted(); + // } + // + // @Override + // public boolean isLoggedIn() { + // return emiteUIProvider.get().isLoggedIn(); + // } + // + // @Override + // public void joinRoom(final String roomName, final String userAlias) { + // joinRoom(roomName, null, userAlias); + // } + // + // @Override + // public void joinRoom(final String roomName, final String subject, final + // String userAlias) { + // if (emiteUIProvider.get().isLoggedIn()) { + // final XmppURI roomURI = XmppURI.uri(roomName + "@" + chatOptions.roomHost + // + "/" + // + chatOptions.userOptions.getUserJid().getNode()); + // final Room room = (Room) emiteUIProvider.get().joinRoom(roomURI); + // if (subject != null) { + // Scheduler.get().scheduleDeferred(new ScheduledCommand() { + // @Override + // public void execute() { + // final RoomUI roomUI = (RoomUI) room.getData(ChatUI.class); + // if (roomUI != null) { + // roomUI.setSubject(subject); + // } + // } + // }); + // } + // } else { + // NotifyUser.showAlertMessage(i18n.t("Error"), + // i18n.t("To join a chatroom you need to be 'online'")); + // } + // } + // + // @Override + // public void login(final String jid, final String passwd) { + // final UserChatOptions userChatOptions = getUserChatOptions(jid, passwd); + // // FIXME: Avatar provider + // final AvatarProvider avatarProvider = new AvatarProvider() { + // @Override + // public String getAvatarURL(final XmppURI userURI) { + // // if (userURI.getHost().equals(chatOptions.domain)) { + // // FIXME + // // return downloadUtils.get().getLogoImageUrl(new + // // StateToken(userURI.getNode())); + // // } else { + // // return ""; + // // } + // return "images/person-def.gif"; + // } + // }; + // final String initialWindowTitle = Window.getTitle(); + // chatOptions.userOptions = userChatOptions; + // if (emiteUIProvider.get().isDialogNotStarted()) { + // emiteUIProvider.get().onRosterChanged(new + // Listener<Collection<RosterItem>>() { + // @Override + // public void onEvent(final Collection<RosterItem> rosterChanged) { + // roster = rosterChanged; + // onRosterChanged.fire(); + // } + // }); + // emiteUIProvider.get().start(userChatOptions, chatOptions.httpBase, + // chatOptions.domain, + // chatOptions.roomHost, avatarProvider, i18n.t("Chat")); + // } else { + // emiteUIProvider.get().setEnableStatusUI(true); + // emiteUIProvider.get().refreshUserInfo(chatOptions.userOptions); + // } + // emiteUIProvider.get().show(OwnStatus.online); + // if (traybarButton == null) { + // traybarButton = new ToolbarButton(); + // traybarButton.setTooltip(i18n.t("Show/hide the chat window" + + // shortcut.toString())); + // traybarButton.setIcon("images/e-icon.gif"); + // traybarButton.addListener(new ButtonListenerAdapter() { + // @Override + // public void onClick(final Button button, final EventObject e) { + // toggleShow(); + // } + // }); + // wskel.getSiteTraybar().addButton(traybarButton); + // emiteUIProvider.get().onChatAttended(new Listener<String>() { + // @Override + // public void onEvent(final String parameter) { + // traybarButton.setIcon("images/e-icon.gif"); + // } + // }); + // emiteUIProvider.get().onChatUnattendedWithActivity(new Listener<String>() + // { + // @Override + // public void onEvent(final String parameter) { + // traybarButton.setIcon("images/e-icon-a.gif"); + // } + // }); + // } + // emiteUIProvider.get().hide(); + // emiteUIProvider.get().onChatAttended(new Listener<String>() { + // @Override + // public void onEvent(final String parameter) { + // Window.setTitle(initialWindowTitle); + // } + // }); + // emiteUIProvider.get().onChatUnattendedWithActivity(new Listener<String>() + // { + // @Override + // public void onEvent(final String chatTitle) { + // Window.setTitle("(* " + chatTitle + ") " + initialWindowTitle); + // } + // }); + // } + // + // @Override + // public void logout() { + // if (!emiteUIProvider.get().isDialogNotStarted()) { + // emiteUIProvider.get().setOwnPresence(OwnStatus.offline); + // chatOptions.userOptions = getUserChatOptions("[email protected]", ""); + // emiteUIProvider.get().refreshUserInfo(chatOptions.userOptions); + // emiteUIProvider.get().setEnableStatusUI(false); + // } + // } + // + // @Override + // public void setAvatar(final String photoBinary) { + // emiteUIProvider.get().setOwnVCardAvatar(photoBinary); + // } + // + // @Override + // public void show() { + // emiteUIProvider.get().show(); + // } + // + // @Override + // public void stop() { + // if (!emiteUIProvider.get().isDialogNotStarted()) { + // emiteUIProvider.get().destroy(); + // } + // if (emiteUIProvider.get().getSession().isLoggedIn()) { + // emiteUIProvider.get().getSession().logout(); + // } + // } + // + // public void toggleShow() { + // if (emiteUIProvider.get().isVisible()) { + // emiteUIProvider.get().hide(); + // } else { + // emiteUIProvider.get().show(); + // } + // } + // + // private XmppURI getLocalUserJid(final String shortName) { + // return XmppURI.jid(shortName + "@" + chatOptions.domain); + // } + // + // private UserChatOptions getUserChatOptions(final String jid, final String + // passwd) { + // final String resource = "emiteui-" + new Date().getTime() + "-kune"; // + + // // getGwtMetaProperty(GWT_PROPERTY_RELEASE); + // // FIXME, get this from user profile + // return new UserChatOptions(jid + "@" + chatOptions.domain, passwd, + // resource, "blue", SubscriptionMode.manual, + // true); + // } } Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -19,101 +19,98 @@ */ package org.ourproject.kune.chat.client.ctx.room; - -import cc.kune.common.client.utils.TextUtils; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.emiteuimodule.client.dialog.BasicDialogExtended; -import com.calclab.emiteuimodule.client.dialog.BasicDialogListener; -import com.google.gwt.core.client.Scheduler; -import com.google.gwt.core.client.Scheduler.ScheduledCommand; -import com.gwtext.client.core.EventObject; -import com.gwtext.client.widgets.form.Field; -import com.gwtext.client.widgets.form.FormPanel; -import com.gwtext.client.widgets.form.TextField; -import com.gwtext.client.widgets.form.event.FieldListenerAdapter; - public class AddRoomPanel implements AddRoomView { - public static final String CANCEL_ID = "k-ct-arp-cb"; - public static final String ADD_ROOM_ID = "k-ct-arp-ab"; - public static final String ROOM_NAME_ID = "k-ct-arp-rfield"; - private final AddRoomPresenter presenter; - private BasicDialogExtended dialog; - private final I18nTranslationService i18n; - private FormPanel formPanel; - private TextField roomName; - - public AddRoomPanel(final AddRoomPresenter presenter, final I18nTranslationService i18n) { - this.i18n = i18n; - this.presenter = presenter; - } - - public void reset() { - formPanel.getForm().reset(); - } - + @Override public void show() { - if (dialog == null) { - dialog = new BasicDialogExtended(i18n.t("Add a chat room"), false, false, 330, 130, "chat-icon", - i18n.tWithNT("Add", "used in button"), ADD_ROOM_ID, i18n.tWithNT("Cancel", "used in button"), - CANCEL_ID, new BasicDialogListener() { - public void onCancelButtonClick() { - dialog.hide(); - reset(); - } + // TODO Auto-generated method stub - public void onFirstButtonClick() { - doAddRoom(); - } - }); - dialog.setResizable(false); - createForm(); - - // TODO define a UI Extension Point here - } - dialog.show(); - roomName.focus(); } - - protected void doAddRoom() { - roomName.validate(); - if (formPanel.getForm().isValid()) { - Scheduler.get().scheduleDeferred(new ScheduledCommand() { - public void execute() { - presenter.addRoom(roomName.getValueAsString()); - reset(); - } - }); - dialog.hide(); - } - } - - private void createForm() { - formPanel = new FormPanel(); - formPanel.setFrame(true); - formPanel.setAutoScroll(false); - - formPanel.setWidth(333); - formPanel.setLabelWidth(100); - formPanel.setPaddings(10); - - roomName = new TextField(i18n.t("Room Name"), "name", 150); - roomName.setAllowBlank(false); - roomName.setValidationEvent(false); - roomName.setRegex(TextUtils.UNIX_NAME); - roomName.setRegexText(i18n.t("The name must contain only characters, numbers and dashes")); - roomName.setId(ROOM_NAME_ID); - formPanel.add(roomName); - - dialog.add(formPanel); - roomName.addListener(new FieldListenerAdapter() { - @Override - public void onSpecialKey(final Field field, final EventObject e) { - if (e.getKey() == 13) { - doAddRoom(); - } - } - }); - } + // + // public static final String ADD_ROOM_ID = "k-ct-arp-ab"; + // public static final String CANCEL_ID = "k-ct-arp-cb"; + // public static final String ROOM_NAME_ID = "k-ct-arp-rfield"; + // private BasicDialogExtended dialog; + // private FormPanel formPanel; + // private final I18nTranslationService i18n; + // private final AddRoomPresenter presenter; + // private TextField roomName; + // + // public AddRoomPanel(final AddRoomPresenter presenter, final + // I18nTranslationService i18n) { + // this.i18n = i18n; + // this.presenter = presenter; + // } + // + // private void createForm() { + // formPanel = new FormPanel(); + // formPanel.setFrame(true); + // formPanel.setAutoScroll(false); + // + // formPanel.setWidth(333); + // formPanel.setLabelWidth(100); + // formPanel.setPaddings(10); + // + // roomName = new TextField(i18n.t("Room Name"), "name", 150); + // roomName.setAllowBlank(false); + // roomName.setValidationEvent(false); + // roomName.setRegex(TextUtils.UNIX_NAME); + // roomName.setRegexText(i18n.t("The name must contain only characters, numbers and dashes")); + // roomName.setId(ROOM_NAME_ID); + // formPanel.add(roomName); + // + // dialog.add(formPanel); + // roomName.addListener(new FieldListenerAdapter() { + // @Override + // public void onSpecialKey(final Field field, final EventObject e) { + // if (e.getKey() == 13) { + // doAddRoom(); + // } + // } + // }); + // } + // + // protected void doAddRoom() { + // roomName.validate(); + // if (formPanel.getForm().isValid()) { + // Scheduler.get().scheduleDeferred(new ScheduledCommand() { + // @Override + // public void execute() { + // presenter.addRoom(roomName.getValueAsString()); + // reset(); + // } + // }); + // dialog.hide(); + // } + // } + // + // public void reset() { + // formPanel.getForm().reset(); + // } + // + // @Override + // public void show() { + // if (dialog == null) { + // dialog = new BasicDialogExtended(i18n.t("Add a chat room"), false, false, + // 330, 130, "chat-icon", + // i18n.tWithNT("Add", "used in button"), ADD_ROOM_ID, + // i18n.tWithNT("Cancel", "used in button"), + // CANCEL_ID, new BasicDialogListener() { + // public void onCancelButtonClick() { + // dialog.hide(); + // reset(); + // } + // + // public void onFirstButtonClick() { + // doAddRoom(); + // } + // }); + // dialog.setResizable(false); + // createForm(); + // + // // TODO define a UI Extension Point here + // } + // dialog.show(); + // roomName.focus(); + // } } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -23,7 +23,6 @@ import static org.ourproject.kune.docs.client.DocumentClientTool.TYPE_FOLDER; import static org.ourproject.kune.docs.client.DocumentClientTool.TYPE_ROOT; import static org.ourproject.kune.docs.client.DocumentClientTool.TYPE_UPLOADEDFILE; -import static org.ourproject.kune.docs.client.DocumentClientTool.TYPE_WAVE; import org.ourproject.kune.docs.client.cnt.DocumentViewer; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; @@ -37,7 +36,6 @@ import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import org.ourproject.kune.workspace.client.themes.WsBackManager; import org.ourproject.kune.workspace.client.upload.FileUploader; -import org.ourproject.kune.workspace.client.wave.WaveInsert; import cc.kune.common.client.utils.SchedulerManager; import cc.kune.core.client.errors.ErrorHandler; @@ -51,20 +49,18 @@ public class DocumentClientActions extends AbstractFoldableContentActions { public DocumentClientActions(final I18nUITranslationService i18n, final ContextNavigator contextNavigator, - final Session session, final StateManager stateManager, - final SchedulerManager deferredCommandWrapper, + final Session session, final StateManager stateManager, final SchedulerManager deferredCommandWrapper, final Provider<ContentServiceAsync> contentServiceProvider, final Provider<GroupServiceAsync> groupServiceProvider, final Provider<FileUploader> fileUploaderProvider, final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, final Provider<FileDownloadUtils> fileDownloadProvider, final EntityHeader entityLogo, final Provider<ContentEditor> textEditorProvider, final ErrorHandler errorHandler, final DocumentViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider, - final SitePublicSpaceLink publicLink, final WsBackManager wsBackManager, - final Provider<WaveInsert> waveInsert) { + final SitePublicSpaceLink publicLink, final WsBackManager wsBackManager) { super(session, stateManager, i18n, errorHandler, deferredCommandWrapper, groupServiceProvider, contentServiceProvider, fileUploaderProvider, contextNavigator, contentActionRegistry, contextActionRegistry, fileDownloadProvider, textEditorProvider, contextProvEditorProvider, - documentViewer, entityLogo, publicLink, wsBackManager, waveInsert); + documentViewer, entityLogo, publicLink, wsBackManager); } @Override @@ -84,8 +80,6 @@ createNewContentAction(TYPE_DOCUMENT, "images/nav/page_add.png", i18n.t("New document"), parentMenuTitleCtx, Position.ctx, TYPE_ROOT, TYPE_FOLDER); - createWaveAction(TYPE_WAVE, parentMenuTitleCtx, Position.ctx, TYPE_ROOT, TYPE_FOLDER); - createTranslateAction(parentMenuTitle, TYPE_DOCUMENT, TYPE_FOLDER); createContentRenameAction(parentMenuTitle, i18n.t("Rename"), contents); createEditAction(parentMenuTitle, TYPE_DOCUMENT); Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -47,7 +47,6 @@ import org.ourproject.kune.workspace.client.themes.WsThemeManager; import org.ourproject.kune.workspace.client.tool.ToolSelector; import org.ourproject.kune.workspace.client.upload.FileUploader; -import org.ourproject.kune.workspace.client.wave.WaveInsert; import cc.kune.common.client.utils.SchedulerManager; import cc.kune.core.client.errors.ErrorHandler; @@ -83,8 +82,7 @@ p(ContentServiceAsync.class), p(GroupServiceAsync.class), p(FileUploader.class), i(ContentActionRegistry.class), i(ContextActionRegistry.class), p(FileDownloadUtils.class), i(EntityHeader.class), p(ContentEditor.class), i(ErrorHandler.class), i(DocumentViewer.class), - p(ContextPropEditor.class), i(SitePublicSpaceLink.class), i(WsBackManager.class), - p(WaveInsert.class)); + p(ContextPropEditor.class), i(SitePublicSpaceLink.class), i(WsBackManager.class)); } }); Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -35,7 +35,6 @@ import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import org.ourproject.kune.workspace.client.themes.WsBackManager; import org.ourproject.kune.workspace.client.upload.FileUploader; -import org.ourproject.kune.workspace.client.wave.WaveInsert; import cc.kune.common.client.utils.SchedulerManager; import cc.kune.core.client.errors.ErrorHandler; @@ -49,20 +48,18 @@ public class GalleryClientActions extends AbstractFoldableContentActions { public GalleryClientActions(final I18nUITranslationService i18n, final ContextNavigator contextNavigator, - final Session session, final StateManager stateManager, - final SchedulerManager deferredCommandWrapper, + final Session session, final StateManager stateManager, final SchedulerManager deferredCommandWrapper, final Provider<ContentServiceAsync> contentServiceProvider, final Provider<GroupServiceAsync> groupServiceProvider, final Provider<FileUploader> fileUploaderProvider, final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, final Provider<FileDownloadUtils> fileDownloadProvider, final EntityHeader entityLogo, final Provider<ContentEditor> textEditorProvider, final ErrorHandler errorHandler, final GalleryViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider, - final SitePublicSpaceLink publicLink, final WsBackManager wsBackManager, - final Provider<WaveInsert> waveInsert) { + final SitePublicSpaceLink publicLink, final WsBackManager wsBackManager) { super(session, stateManager, i18n, errorHandler, deferredCommandWrapper, groupServiceProvider, contentServiceProvider, fileUploaderProvider, contextNavigator, contentActionRegistry, contextActionRegistry, fileDownloadProvider, textEditorProvider, contextProvEditorProvider, - documentViewer, entityLogo, publicLink, wsBackManager, waveInsert); + documentViewer, entityLogo, publicLink, wsBackManager); } @Override Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -47,7 +47,6 @@ import org.ourproject.kune.workspace.client.themes.WsThemeManager; import org.ourproject.kune.workspace.client.tool.ToolSelector; import org.ourproject.kune.workspace.client.upload.FileUploader; -import org.ourproject.kune.workspace.client.wave.WaveInsert; import cc.kune.common.client.utils.SchedulerManager; import cc.kune.core.client.errors.ErrorHandler; @@ -83,8 +82,7 @@ p(ContentServiceAsync.class), p(GroupServiceAsync.class), p(FileUploader.class), i(ContentActionRegistry.class), i(ContextActionRegistry.class), p(FileDownloadUtils.class), i(EntityHeader.class), p(ContentEditor.class), i(ErrorHandler.class), i(GalleryViewer.class), - p(ContextPropEditor.class), i(SitePublicSpaceLink.class), i(WsBackManager.class), - p(WaveInsert.class)); + p(ContextPropEditor.class), i(SitePublicSpaceLink.class), i(WsBackManager.class)); } }); Modified: trunk/src/main/java/org/ourproject/kune/platf/KunePlatform.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/KunePlatform.gwt.xml 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/platf/KunePlatform.gwt.xml 2011-01-29 03:38:12 UTC (rev 1227) @@ -56,7 +56,7 @@ </replace-with> <inherits name="com.calclab.suco.Suco" /> <inherits name="com.gwtext.GwtExt" /> - <inherits name="com.calclab.emiteuimodule.EmiteUIModule" /> +<!-- <inherits name="com.calclab.emiteuimodule.EmiteUIModule" />--> <inherits name="org.xwiki.gwt.dom.DOM" /> <inherits name="com.calclab.suco.Suco"/> <source path='client' excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java"/> 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 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractGuiItem.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -5,8 +5,9 @@ import org.ourproject.kune.platf.client.actions.Action; import org.ourproject.kune.platf.client.actions.PropertyChangeEvent; import org.ourproject.kune.platf.client.actions.PropertyChangeListener; -import org.ourproject.kune.platf.client.ui.img.ImgConstants; +import cc.kune.core.client.resources.icons.IconConstants; + import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.ui.Composite; @@ -82,7 +83,7 @@ if (icon instanceof CssStyleDescriptor) { setIconStyle(((CssStyleDescriptor) icon).getName()); } else if (icon instanceof ImageResource) { - setIconStyle((ImgConstants.CSS_SUFFIX + ((ImageResource) icon).getName())); + setIconStyle((IconConstants.CSS_SUFFIX + ((ImageResource) icon).getName())); } else if (icon instanceof String) { setIconUrl((String) icon); } 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 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -27,7 +27,6 @@ import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; import org.ourproject.kune.platf.client.ui.QuickTipsHelper; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; -import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette; import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalettePanel; @@ -100,6 +99,7 @@ import cc.kune.common.client.utils.TimerWrapper; import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.state.AccessRightsClientManager; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; @@ -238,10 +238,10 @@ } }); - register(Singleton.class, new Factory<ImgResources>(ImgResources.class) { + register(Singleton.class, new Factory<IconResources>(IconResources.class) { @Override - public ImgResources create() { - final ImgResources instance = GWT.create(ImgResources.class); + public IconResources create() { + final IconResources instance = GWT.create(IconResources.class); instance.css().ensureInjected(); return instance; } 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 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconLabelEditable.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -22,7 +22,6 @@ 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; @@ -49,19 +48,19 @@ */ public class IconLabelEditable extends Composite { - private boolean useDoubleClick; + private ClickHandler clickHandler; + private String clickLabel; private String currentText; - private final AbstractLabel label; private String dblClickLabel; - private String clickLabel; - private Event2<String, String> onEditEvent; + private DoubleClickHandler doubleClickHandler; + // private Event2<String, String> onEditEvent; private TextBox editor; private HorizontalPanel hpanel; - private List<HandlerRegistration> registrations; - private ClickHandler clickHandler; - private DoubleClickHandler doubleClickHandler; + private final AbstractLabel label; private MouseOutHandler mouseOutHandler; private MouseOverHandler mouseOverHandler; + private List<HandlerRegistration> registrations; + private boolean useDoubleClick; public IconLabelEditable() { this(""); @@ -94,6 +93,16 @@ init(text, useDoubleClick); } + private void afterEdit() { + final String text = editor.getText(); + // onEditEvent.fire(currentText, text); + setTextImpl(text); + editor.setVisible(false); + editor.setReadOnly(true); + label.setVisible(true); + label.removeStyleDependentName("high"); + } + public void edit() { showEditor(); editor.setFocus(true); @@ -103,50 +112,8 @@ return label.getText(); } - public void onEdit(final Listener2<String, String> slot) { - onEditEvent.add(slot); - } - - /** - * Sets the text tooltip showed to indicate "click to rename". - * - * @param text - * the new click to rename label - */ - public void setClickToRenameLabel(final String text) { - this.clickLabel = text; - } - - /** - * Sets the text tooltip showed to indicate "double click to rename". - * - * @param text - * the new double click to rename label - */ - public void setDoubleClickToRenameLabel(final String text) { - this.dblClickLabel = text; - } - - public void setEditable(final boolean editable) { - setEditableImpl(editable); - } - - public void setText(final String text) { - setTextImpl(text); - } - - private void afterEdit() { - final String text = editor.getText(); - onEditEvent.fire(currentText, text); - setTextImpl(text); - editor.setVisible(false); - editor.setReadOnly(true); - label.setVisible(true); - label.removeStyleDependentName("high"); - } - private void init(final String text, final boolean useDoubleClick) { - this.onEditEvent = new Event2<String, String>("onLabelEdit"); + // this.onEditEvent = new Event2<String, String>("onLabelEdit"); registrations = new ArrayList<HandlerRegistration>(); dblClickLabel = "Double click to rename"; clickLabel = "Click to rename"; @@ -157,21 +124,25 @@ this.useDoubleClick = useDoubleClick; label.setStylePrimaryName("kune-EditableLabel"); doubleClickHandler = new DoubleClickHandler() { + @Override public void onDoubleClick(final DoubleClickEvent event) { showEditor(); } }; clickHandler = new ClickHandler() { + @Override public void onClick(final ClickEvent event) { showEditor(); } }; mouseOverHandler = new MouseOverHandler() { + @Override public void onMouseOver(final MouseOverEvent event) { label.addStyleDependentName("high"); } }; mouseOutHandler = new MouseOutHandler() { + @Override public void onMouseOut(final MouseOutEvent event) { label.removeStyleDependentName("high"); } @@ -179,6 +150,10 @@ setEditableImpl(false); } + public void onEdit(final Listener2<String, String> slot) { + // onEditEvent.add(slot); + } + private void reset() { label.removeStyleDependentName("noneditable"); label.removeStyleDependentName("editable"); @@ -188,6 +163,30 @@ registrations.clear(); } + /** + * Sets the text tooltip showed to indicate "click to rename". + * + * @param text + * the new click to rename label + */ + public void setClickToRenameLabel(final String text) { + this.clickLabel = text; + } + + /** + * Sets the text tooltip showed to indicate "double click to rename". + * + * @param text + * the new double click to rename label + */ + public void setDoubleClickToRenameLabel(final String text) { + this.dblClickLabel = text; + } + + public void setEditable(final boolean editable) { + setEditableImpl(editable); + } + private void setEditableImpl(final boolean editable) { reset(); if (editable) { @@ -207,6 +206,10 @@ } } + public void setText(final String text) { + setTextImpl(text); + } + private void setTextImpl(final String text) { this.currentText = text; label.setText(text); @@ -220,11 +223,13 @@ editor.setStyleName("k-eil-edit"); hpanel.add(editor); editor.addBlurHandler(new BlurHandler() { + @Override public void onBlur(final BlurEvent event) { afterEdit(); } }); editor.addChangeHandler(new ChangeHandler() { + @Override public void onChange(final ChangeEvent event) { editor.setFocus(false); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridDropConfiguration.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridDropConfiguration.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridDropConfiguration.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -40,22 +40,22 @@ */ package org.ourproject.kune.platf.client.ui.gridmenu; -import com.calclab.suco.client.events.Event; import com.calclab.suco.client.events.Listener; public class GridDropConfiguration { private final String ddGroupId; - private final Event<String> onDrop; + // private final Event<String> onDrop; + public GridDropConfiguration(final String ddGroupId, final Listener<String> listener) { this.ddGroupId = ddGroupId; - this.onDrop = new Event<String>("onDrop"); + // this.onDrop = new Event<String>("onDrop"); this.onDropImpl(listener); } public void fire(final String id) { - onDrop.fire(id); + // onDrop.fire(id); } public String getDdGroupId() { @@ -67,7 +67,7 @@ } private void onDropImpl(final Listener<String> listener) { - onDrop.add(listener); + // onDrop.add(listener); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridMenuPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridMenuPanel.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridMenuPanel.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -24,7 +24,6 @@ import java.util.Map; import com.allen_sauer.gwt.log.client.Log; -import com.calclab.suco.client.events.Event; import com.calclab.suco.client.events.Listener; import com.gwtext.client.core.EventObject; import com.gwtext.client.core.Ext; @@ -60,31 +59,31 @@ import com.gwtext.client.widgets.layout.FitLayout; public class GridMenuPanel<T> extends Panel { + public static final int DEFAULT_INITIAL_WIDTH = 150; + private static final String END_ICON_HTML = "endIconHtmlField"; public static final String GRID_MENU_PANEL_DD = "gridMenuPanelDD"; - public static final int DEFAULT_INITIAL_WIDTH = 150; private static final String GROUP = "groupField"; + private static final String GROUP_ENDICON_HTML = "groupEndIconHtmlField"; + private static final String GROUP_TOOLTIP = "groupTooltipField"; private static final String GROUP_TOOLTIP_TITLE = "groupTooltipTitleField"; - private static final String GROUP_TOOLTIP = "groupTooltipField"; - private static final String GROUP_ENDICON_HTML = "groupEndIconHtmlField"; + private static final String ICON_HTML = "iconHtmlField"; private static final String ID = "idField"; - private static final String ICON_HTML = "iconHtmlField"; private static final String TITLE = "titleField"; private static final String TITLE_HTML = "titleHtmlField"; - private static final String END_ICON_HTML = "endIconHtmlField"; private static final String TOOLTIP = "tooltipField"; private static final String TOOLTIPTITLE = "tooltipTitleField"; + private Toolbar bottomBar; + private ColumnModel columnModel; + private GridPanel grid; + private final boolean grouped; private final Map<String, CustomMenu<T>> menuMap; + private RecordDef recordDef; private final Map<T, Record> recordMap; - private RecordDef recordDef; private GroupingStore store; - private GridPanel grid; - private final boolean grouped; + // private final Event<String> onClick; + // private final Event<String> onDoubleClick; + private Toolbar topBar; private final boolean withCounters; - private final Event<String> onClick; - private final Event<String> onDoubleClick; - private Toolbar topBar; - private Toolbar bottomBar; - private ColumnModel columnModel; private final boolean withEndIcon; public GridMenuPanel(final String emptyText) { @@ -112,8 +111,8 @@ public GridMenuPanel(final String emptyText, final GridDragConfiguration gridDragConfiguration, final GridDropConfiguration gridDropConfiguration, final boolean grouped, final boolean withCounters, final boolean withTopBar, final boolean withBottomBar, final boolean withEndIcon) { - this.onClick = new Event<String>("onClick"); - this.onDoubleClick = new Event<String>("onDoubleClick"); + // this.onClick = new Event<String>("onClick"); + // this.onDoubleClick = new Event<String>("onDoubleClick"); this.grouped = grouped; this.withCounters = withCounters; this.withEndIcon = withEndIcon; @@ -150,10 +149,12 @@ public void addItem(final GridItem<T> gridItem) { final String id = gridItem.getId(); - final Record newRecord = recordDef.createRecord(id, new Object[] { gridItem.getGroup().getName(), - gridItem.getGroup().getTooltipTitle(), gridItem.getGroup().getTooltip(), - gridItem.getGroup().getEndIconHtml(), id, gridItem.getIconHtml(), gridItem.getTitle(), - gridItem.getTitleHtml(), gridItem.getEndIconHtml(), gridItem.getTooltipTitle(), gridItem.getTooltip() }); + final Record newRecord = recordDef.createRecord( + id, + new Object[] { gridItem.getGroup().getName(), gridItem.getGroup().getTooltipTitle(), + gridItem.getGroup().getTooltip(), gridItem.getGroup().getEndIconHtml(), id, + gridItem.getIconHtml(), gridItem.getTitle(), gridItem.getTitleHtml(), + gridItem.getEndIconHtml(), gridItem.getTooltipTitle(), gridItem.getTooltip() }); recordMap.put(gridItem.getItem(), newRecord); store.addSorted(newRecord); menuMap.put(id, gridItem.getMenu()); @@ -173,7 +174,7 @@ if (dragData instanceof GridDragData) { final GridDragData gridDragData = (GridDragData) dragData; final Record[] records = gridDragData.getSelections(); - for (Record record : records) { + for (final Record record : records) { gridDropConfiguration.fire(record.getAsString(ID)); } } @@ -192,97 +193,6 @@ }; } - @Override - public void doLayout(final boolean shallow) { - // Grid rendered problems with shallow false - grid.doLayout(true); - super.doLayout(true); - } - - public void doLayoutIfNeeded() { - if (super.isRendered()) { - grid.doLayout(true); - super.doLayout(true); - } - } - - public Toolbar getBottomBar() { - assert bottomBar != null; - return bottomBar; - } - - public Toolbar getTopBar() { - assert topBar != null; - return topBar; - } - - public void onClick(final Listener<String> listener) { - onClick.add(listener); - } - - public void onDoubleClick(final Listener<String> listener) { - onDoubleClick.add(listener); - } - - @Override - public void removeAll() { - store.removeAll(); - recordMap.clear(); - menuMap.clear(); - } - - public void removeItem(final GridItem<T> gridItem) { - final Record record = recordMap.get(gridItem.getItem()); - if (record == null) { - Log.error("Trying to remove a non existing item: " + gridItem.getId()); - } else { - menuMap.remove(gridItem.getId()); - store.remove(record); - recordMap.remove(gridItem.getItem()); - doLayoutIfNeeded(); - } - } - - @Override - public void setHeight(final int height) { - super.setHeight(height); - doLayoutIfNeeded(); - } - - @Override - public void setWidth(final int width) { - grid.setWidth(width - 27); - // super.setWidth(width); - doLayoutIfNeeded(); - } - - public void sort() { - store.sort(GROUP, SortDir.ASC); - } - - public void updateItem(final GridItem<T> gridItem) { - final String id = gridItem.getId(); - final Record record = recordMap.get(gridItem.getItem()); - if (record != null) { - record.set(GROUP, gridItem.getGroup().getName()); - record.set(GROUP_TOOLTIP_TITLE, gridItem.getGroup().getTooltipTitle()); - record.set(GROUP_TOOLTIP, gridItem.getGroup().getTooltip()); - record.set(GROUP_ENDICON_HTML, gridItem.getGroup().getEndIconHtml()); - record.set(ICON_HTML, gridItem.getIconHtml()); - record.set(TITLE, gridItem.getTitle()); - record.set(TITLE_HTML, gridItem.getTitleHtml()); - record.set(END_ICON_HTML, gridItem.getEndIconHtml()); - record.set(TOOLTIPTITLE, gridItem.getTooltipTitle()); - record.set(TOOLTIP, gridItem.getTooltip()); - store.commitChanges(); - menuMap.put(id, gridItem.getMenu()); - sort(); - doLayoutIfNeeded(); - } else { - Log.error("Trying to update a non existing item: " + id); - } - } - private void configureDragImpl(final GridDragConfiguration gridDragConfiguration) { // TODO: put this in GDConf grid.setEnableDragDrop(true); @@ -303,7 +213,7 @@ if (dragData instanceof GridDragData) { final GridDragData gridDragData = (GridDragData) dragData; final Record[] records = gridDragData.getSelections(); - for (Record record : records) { + for (final Record record : records) { gridDropConfiguration.fire(record.getAsString(ID)); } } @@ -347,26 +257,35 @@ final String commonTootipHtmlRender = "<span ext:qtitle=\"{1}\" ext:qtip=\"{2}\">{0}</span>"; final Renderer iconHtmlRenderer = new Renderer() { + @Override public String render(final Object value, final CellMetadata cellMetadata, final Record record, final int rowIndex, final int colNum, final Store store) { - return Format.format(commonTootipHtmlRender, new String[] { record.getAsString(ICON_HTML), - record.getAsString(TOOLTIPTITLE), record.getAsString(TOOLTIP) }); + return Format.format( + commonTootipHtmlRender, + new String[] { record.getAsString(ICON_HTML), record.getAsString(TOOLTIPTITLE), + record.getAsString(TOOLTIP) }); } }; final Renderer titleHtmlRenderer = new Renderer() { + @Override public String render(final Object value, final CellMetadata cellMetadata, final Record record, final int rowIndex, final int colNum, final Store store) { - return Format.format(commonTootipHtmlRender, new String[] { record.getAsString(TITLE_HTML), - record.getAsString(TOOLTIPTITLE), record.getAsString(TOOLTIP) }); + return Format.format( + commonTootipHtmlRender, + new String[] { record.getAsString(TITLE_HTML), record.getAsString(TOOLTIPTITLE), + record.getAsString(TOOLTIP) }); } }; final Renderer endIconHtmlRenderer = new Renderer() { + @Override public String render(final Object value, final CellMetadata cellMetadata, final Record record, final int rowIndex, final int colNum, final Store store) { - return Format.format(commonTootipHtmlRender, new String[] { record.getAsString(END_ICON_HTML), - record.getAsString(TOOLTIPTITLE), record.getAsString(TOOLTIP) }); + return Format.format( + commonTootipHtmlRender, + new String[] { record.getAsString(END_ICON_HTML), record.getAsString(TOOLTIPTITLE), + record.getAsString(TOOLTIP) }); } }; @@ -397,15 +316,18 @@ grid.setSelectionModel(new RowSelectionModel()); grid.addGridRowListener(new GridRowListener() { + @Override public void onRowClick(final GridPanel grid, final int rowIndex, final EventObject e) { showMenu(rowIndex, e); onClickImpl(rowIndex); } + @Override public void onRowContextMenu(final GridPanel grid, final int rowIndex, final EventObject e) { showMenu(rowIndex, e); } + @Override public void onRowDblClick(final GridPanel grid, final int rowIndex, final EventObject e) { onDoubleClickImpl(rowIndex); } @@ -472,14 +394,105 @@ super.add(grid); } + @Override + public void doLayout(final boolean shallow) { + // Grid rendered problems with shallow false + grid.doLayout(true); + super.doLayout(true); + } + + public void doLayoutIfNeeded() { + if (super.isRendered()) { + grid.doLayout(true); + super.doLayout(true); + } + } + + public Toolbar getBottomBar() { + assert bottomBar != null; + return bottomBar; + } + + public Toolbar getTopBar() { + assert topBar != null; + return topBar; + } + + public void onClick(final Listener<String> listener) { + // onClick.add(listener); + } + private void onClickImpl(final int rowIndex) { final Record record = store.getRecordAt(rowIndex); - onClick.fire(record.getAsString(ID)); + // onClick.fire(record.getAsString(ID)); } + public void onDoubleClick(final Listener<String> listener) { + // onDoubleClick.add(listener); + } + private void onDoubleClickImpl(final int rowIndex) { final Record record = store.getRecordAt(rowIndex); - onDoubleClick.fire(record.getAsString(ID)); + // onDoubleClick.fire(record.getAsString(ID)); } + @Override + public void removeAll() { + store.removeAll(); + recordMap.clear(); + menuMap.clear(); + } + + public void removeItem(final GridItem<T> gridItem) { + final Record record = recordMap.get(gridItem.getItem()); + if (record == null) { + Log.error("Trying to remove a non existing item: " + gridItem.getId()); + } else { + menuMap.remove(gridItem.getId()); + store.remove(record); + recordMap.remove(gridItem.getItem()); + doLayoutIfNeeded(); + } + } + + @Override + public void setHeight(final int height) { + super.setHeight(height); + doLayoutIfNeeded(); + } + + @Override + public void setWidth(final int width) { + grid.setWidth(width - 27); + // super.setWidth(width); + doLayoutIfNeeded(); + } + + public void sort() { + store.sort(GROUP, SortDir.ASC); + } + + public void updateItem(final GridItem<T> gridItem) { + final String id = gridItem.getId(); + final Record record = recordMap.get(gridItem.getItem()); + if (record != null) { + record.set(GROUP, gridItem.getGroup().getName()); + record.set(GROUP_TOOLTIP_TITLE, gridItem.getGroup().getTooltipTitle()); + record.set(GROUP_TOOLTIP, gridItem.getGroup().getTooltip()); + record.set(GROUP_ENDICON_HTML, gridItem.getGroup().getEndIconHtml()); + record.set(ICON_HTML, gridItem.getIconHtml()); + record.set(TITLE, gridItem.getTitle()); + record.set(TITLE_HTML, gridItem.getTitleHtml()); + record.set(END_ICON_HTML, gridItem.getEndIconHtml()); + record.set(TOOLTIPTITLE, gridItem.getTooltipTitle()); + record.set(TOOLTIP, gridItem.getTooltip()); + store.commitChanges(); + menuMap.put(id, gridItem.getMenu()); + sort(); + doLayoutIfNeeded(); + } else { + Log.error("Trying to update a non existing item: " + id); + } + } + } Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/IconCssResource.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/IconCssResource.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/IconCssResource.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -1,7 +0,0 @@ -package org.ourproject.kune.platf.client.ui.img; - -import com.google.gwt.resources.client.CssResource; - -public interface IconCssResource extends CssResource { - String iconSpriteClass(); -} \ No newline at end of file Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgConstants.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgConstants.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgConstants.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -1,17 +0,0 @@ -package org.ourproject.kune.platf.client.ui.img; - -import com.google.gwt.resources.client.ImageResource; - -public final class ImgConstants { - - public static final String CSS_SUFFIX = "k-icon-"; - - public static final String PATH_PREFIX = "images/"; - - public static String toPath(final ImageResource img) { - return PATH_PREFIX + img.getName() + ".png"; - } - - private ImgConstants() { - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgCssResource.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgCssResource.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgCssResource.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -1,33 +0,0 @@ -package org.ourproject.kune.platf.client.ui.img; - -import com.google.gwt.resources.client.CssResource; - -public interface ImgCssResource extends CssResource { - - @ClassName("k-icon-addGreen") - String kIconAddGreen(); - - @ClassName("k-icon-bug") - String kIconBug(); - - @ClassName("k-icon-groupHome") - String kIconGroupHome(); - - @ClassName("k-icon-info") - String kIconInfo(); - - @ClassName("k-icon-kuneIcon16") - String kIconKuneIcon16(); - - @ClassName("k-icon-language") - String kIconLanguage(); - - @ClassName("k-icon-maximize") - String kIconMaximize(); - - @ClassName("k-icon-minimize") - String kIconMinimize(); - - @ClassName("k-icon-prefs") - String kIconPrefs(); -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgResources.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgResources.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgResources.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -1,42 +0,0 @@ -package org.ourproject.kune.platf.client.ui.img; - -import com.google.gwt.resources.client.ClientBundle; -import com.google.gwt.resources.client.CssResource.Strict; -import com.google.gwt.resources.client.ImageResource; - -public interface ImgResources extends ClientBundle { - - @Source("add-green.png") - ImageResource addGreen(); - - @Source("bug.png") - ImageResource bug(); - - @Source("kimg.css") - @Strict - ImgCssResource css(); - - @Source("del-green.png") - ImageResource delGreen(); - - @Source("group-home.png") - ImageResource groupHome(); - - @Source("info.png") - ImageResource info(); - - @Source("kune-icon16.png") - ImageResource kuneIcon16(); - - @Source("language.png") - ImageResource language(); - - @Source("arrow_out.png") - ImageResource maximize(); - - @Source("arrow_in.png") - ImageResource minimize(); - - @Source("prefs.png") - ImageResource prefs(); -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/add-green.png =================================================================== (Binary files differ) Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/arrow_in.png =================================================================== (Binary files differ) Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/arrow_out.png =================================================================== (Binary files differ) Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/bug.png =================================================================== (Binary files differ) Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/del-green.png =================================================================== (Binary files differ) Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/group-home.png =================================================================== (Binary files differ) Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/info.png =================================================================== (Binary files differ) Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/kimg.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/kimg.css 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/kimg.css 2011-01-29 03:38:12 UTC (rev 1227) @@ -1,37 +0,0 @@ -@external k-icon-info,k-icon-language,k-icon-kuneIcon16,k-icon-bug,k-icon-prefs,k-icon-groupHome,k-icon-addGreen,k-icon-maximize,k-icon-minimize; - -@sprite div .k-icon-info { - gwt-image: "info"; -} - -@sprite div .k-icon-language { - gwt-image: "language"; -} - -@sprite div .k-icon-kuneIcon16 { - gwt-image: "kuneIcon16"; -} - -@sprite div .k-icon-bug { - gwt-image: "bug"; -} - -@sprite div .k-icon-prefs { - gwt-image: "prefs"; -} - -@sprite div .k-icon-groupHome { - gwt-image: "groupHome"; -} - -@sprite div .k-icon-addGreen { - gwt-image: "addGreen"; -} - -@sprite div .k-icon-maximize { - gwt-image: "maximize"; -} - -@sprite div .k-icon-minimize { - gwt-image: "minimize"; -} \ No newline at end of file Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/kune-icon16.png =================================================================== (Binary files differ) Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/language.png =================================================================== (Binary files differ) Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/prefs.png =================================================================== (Binary files differ) Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/noti/NotifyUser.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/noti/NotifyUser.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/noti/NotifyUser.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -24,9 +24,6 @@ import cc.kune.core.client.notify.msgs.UserNotifyEvent; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.calclab.suco.client.events.Event; -import com.calclab.suco.client.events.Event0; -import com.calclab.suco.client.events.Event2; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.events.Listener2; @@ -46,31 +43,39 @@ private static I18nTranslationService i18n; private static Images images; - private static final Event2<String, String> ON_ALERT = new Event2<String, String>("onAlert"); - private static final Event<ConfirmationAsk> ON_CONFIRMATION_ASK = new Event<ConfirmationAsk>("onConfirmationAsk"); - private static final Event0 ON_HIDE_PROGRESS = new Event0("onHideProgress"); - private static final Event2<Level, String> ON_NOTIFY = new Event2<Level, String>("onNotify"); + // private static final Event2<String, String> ON_ALERT = new Event2<String, + // String>("onAlert"); + // private static final Event<ConfirmationAsk> ON_CONFIRMATION_ASK = new + // Event<ConfirmationAsk>("onConfirmationAsk"); + // private static final Event0 ON_HIDE_PROGRESS = new + // Event0("onHideProgress"); - private static final Event<String> ON_PROGRESS = new Event<String>("onProgress"); + // private static final Event2<Level, String> ON_NOTIFY = new Event2<Level, + // String>("onNotify"); + // private static final Event<String> ON_PROGRESS = new + // Event<String>("onProgress"); + public static void askConfirmation(final String confirmationTitle, final String confirmationText, final Listener0 onConfirm) { - ON_CONFIRMATION_ASK.fire(new ConfirmationAsk(confirmationTitle, confirmationText, onConfirm, new Listener0() { - @Override - public void onEvent() { - // Do nothing - } - })); + // ON_CONFIRMATION_ASK.fire(new ConfirmationAsk(confirmationTitle, + // confirmationText, onConfirm, new Listener0() { + // @Override + // public void onEvent() { + // // Do nothing + // } + // })); } public static void askConfirmation(final String confirmationTitle, final String confirmationText, final Listener0 onConfirm, final Listener0 onCancel) { - ON_CONFIRMATION_ASK.fire(new ConfirmationAsk(confirmationTitle, confirmationText, onConfirm, onCancel)); + // ON_CONFIRMATION_ASK.fire(new ConfirmationAsk(confirmationTitle, + // confirmationText, onConfirm, onCancel)); } public static void error(final String message) { - ON_NOTIFY.fire(Level.error, message); + // ON_NOTIFY.fire(Level.error, message); } public static String getCls(final Level level) { @@ -102,43 +107,43 @@ } public static void hideProgress() { - ON_HIDE_PROGRESS.fire(); + // ON_HIDE_PROGRESS.fire(); } public static void important(final String message) { - ON_NOTIFY.fire(Level.important, message); + // ON_NOTIFY.fire(Level.important, message); } public static void info(final String message) { - ON_NOTIFY.fire(Level.info, message); + // ON_NOTIFY.fire(Level.info, message); } public static void showAlertMessage(final String title, final String message) { - ON_ALERT.fire(title, message); + // ON_ALERT.fire(title, message); } public static void showProgress(final String text) { - ON_PROGRESS.fire(text); + // ON_PROGRESS.fire(text); } public static void showProgressLoading() { - ON_PROGRESS.fire(i18n.t("Loading")); + // ON_PROGRESS.fire(i18n.t("Loading")); } public static void showProgressProcessing() { - ON_PROGRESS.fire(i18n.t("Processing")); + // ON_PROGRESS.fire(i18n.t("Processing")); } public static void showProgressSaving() { - ON_PROGRESS.fire(i18n.t("Saving")); + // ON_PROGRESS.fire(i18n.t("Saving")); } public static void showProgressStarting() { - ON_PROGRESS.fire(i18n.t("Starting")); + // ON_PROGRESS.fire(i18n.t("Starting")); } public static void veryImportant(final String message) { - ON_NOTIFY.fire(Level.veryImportant, message); + // ON_NOTIFY.fire(Level.veryImportant, message); } private NotifyUser() { @@ -151,23 +156,23 @@ } public void addAlerter(final Listener2<String, String> listener) { - ON_ALERT.add(listener); + // ON_ALERT.add(listener); } public void addConfirmationAsker(final Listener<ConfirmationAsk> listener) { - ON_CONFIRMATION_ASK.add(listener); + // ON_CONFIRMATION_ASK.add(listener); } public void addHideProgressNotifier(final Listener0 listener) { - ON_HIDE_PROGRESS.add(listener); + // ON_HIDE_PROGRESS.add(listener); } public void addNotifier(final Listener2<Level, String> listener) { - ON_NOTIFY.add(listener); + // ON_NOTIFY.add(listener); } public void addProgressNotifier(final Listener<String> listener) { - ON_PROGRESS.add(listener); + // ON_PROGRESS.add(listener); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -28,7 +28,6 @@ import org.ourproject.kune.platf.client.actions.ui.PushButtonDescriptor; import org.ourproject.kune.platf.client.actions.ui.ToolbarSeparatorDescriptor; import org.ourproject.kune.platf.client.actions.ui.ToolbarSeparatorDescriptor.Type; -import org.ourproject.kune.platf.client.ui.img.ImgConstants; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette; import org.ourproject.kune.platf.client.ui.rte.RichTextArea; @@ -43,11 +42,11 @@ import org.ourproject.kune.platf.client.ui.rte.inserttable.InsertTableDialog; import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.resources.icons.IconConstants; import cc.kune.core.client.state.Session; import cc.kune.core.shared.i18n.I18nTranslationService; import com.allen_sauer.gwt.log.client.Log; -import com.calclab.suco.client.events.Event0; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; @@ -720,7 +719,7 @@ private PushButtonDescriptor italic; private MenuDescriptor linkCtxMenu; private final List<MenuDescriptor> menus; - private final Event0 onEdit; + // private final Event0 onEdit; protected ColorWebSafePalette palette; private final Provider<ColorWebSafePalette> paletteProvider; private final Session session; @@ -750,7 +749,7 @@ menus = new ArrayList<MenuDescriptor>(); this.imgResources = imgResources; - this.onEdit = new Event0("onRTEEdit"); + // this.onEdit = new Event0("onRTEEdit"); extendedAddCond = new GuiAddCondition() { @Override public boolean mustBeAdded() { @@ -775,7 +774,7 @@ @Override public void addOnEditListener(final Listener0 listener) { - onEdit.add(listener); + // onEdit.add(listener); } public void adjustSize(final int height) { @@ -1064,9 +1063,9 @@ menus.add(formatMenu = new MenuDescriptor(i18n.t("Format"))); menus.add(linkCtxMenu = new MenuDescriptor(i18n.t("Change Link"))); menus.add(fontMenu = new MenuDescriptor(" ", i18n.t("Font"), - ImgConstants.toPath(imgResources.charfontname()))); + IconConstants.toPath(imgResources.charfontname()))); menus.add(fontSizeMenu = new MenuDescriptor(NO_TEXT, i18n.t("Font size"), - ImgConstants.toPath(imgResources.fontheight()))); + IconConstants.toPath(imgResources.fontheight()))); insertMenu.setAddCondition(extendedAddCond); } @@ -1082,7 +1081,7 @@ } public void fireOnEdit() { - onEdit.fire(); + // onEdit.fire(); } @Override Modified: trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -1,6 +1,5 @@ package org.ourproject.kune.platf.server.init; -import java.util.ArrayList; import java.util.TimeZone; import javax.persistence.NoResultException; @@ -26,28 +25,26 @@ import cc.kune.domain.I18nLanguage; import cc.kune.domain.I18nTranslation; import cc.kune.domain.License; -import cc.kune.domain.Property; import cc.kune.domain.PropertyGroup; import cc.kune.domain.PropertySubgroup; import cc.kune.domain.User; -import com.calclab.emiteuimodule.client.SubscriptionMode; import com.google.inject.Inject; import com.wideplay.warp.persist.TransactionType; import com.wideplay.warp.persist.Transactional; public class DatabaseInitializer { + private final ContentManager contentManager; + private final I18nCountryManager countryManager; + private final GroupManager groupManager; + private final I18nLanguageManager languageManager; private final LicenseManager licenseManager; private final DatabaseProperties properties; - private final GroupManager groupManager; - private final UserManager userManager; - private final I18nLanguageManager languageManager; - private final I18nCountryManager countryManager; - private final I18nTranslationManager translationManager; - private final ContentManager contentManager; private final PropertyManager propertyManager; private final PropertyGroupManager propGroupManager; private final PropertySubgroupManager propSubgroupManager; + private final I18nTranslationManager translationManager; + private final UserManager userManager; @Inject public DatabaseInitializer(final DatabaseProperties properties, final UserManager userManager, @@ -69,36 +66,6 @@ this.propSubgroupManager = propSubgroupManager; } - public void createOthers() { - final I18nLanguage english = new I18nLanguage(Long.valueOf(1819), "en", "ltr", "English", "", "", "en", "eng", - "eng", false, "", "", "", "c == 1 ? 1 : 2", null, "L", "MMM d\\, yyyy"); - final I18nLanguage spanish = new I18nLanguage(Long.valueOf(5889), "es", "ltr", "Spanish", "", "", "es", "spa", - "spa", true, "Español", "", "", "c == 1 ? 1 : 2", null, "L", "dd/MM/yyyy"); - languageManager.persist(english); - languageManager.persist(spanish); - final I18nCountry gb = new I18nCountry(Long.valueOf(75), "GB", "GBP", ".", "£%n", "", ".", "United Kingdom", - "western", ","); - countryManager.persist(gb); - final I18nTranslation test = new I18nTranslation("test", english, "test"); - translationManager.persist(test); - } - - public void initConditional() throws Exception { - try { - groupManager.getSiteDefaultGroup(); - } catch (final NoResultException e) { - initDatabase(); - } - } - - @Transactional(type = TransactionType.READ_WRITE) - public void initDatabase() throws Exception { - createOthers(); - createLicenses(); - createProperties(); - createDefUsersGroup(); - } - private void createDefUsersGroup() throws Exception, UserMustBeLoggedException { final String adminName = properties.getAdminUserName(); final String adminShortName = properties.getAdminShortName(); @@ -199,6 +166,20 @@ licenseManager.persist(license); } + public void createOthers() { + final I18nLanguage english = new I18nLanguage(Long.valueOf(1819), "en", "ltr", "English", "", "", "en", "eng", + "eng", false, "", "", "", "c == 1 ? 1 : 2", null, "L", "MMM d\\, yyyy"); + final I18nLanguage spanish = new I18nLanguage(Long.valueOf(5889), "es", "ltr", "Spanish", "", "", "es", "spa", + "spa", true, "Español", "", "", "c == 1 ? 1 : 2", null, "L", "dd/MM/yyyy"); + languageManager.persist(english); + languageManager.persist(spanish); + final I18nCountry gb = new I18nCountry(Long.valueOf(75), "GB", "GBP", ".", "£%n", "", ".", "United Kingdom", + "western", ","); + countryManager.persist(gb); + final I18nTranslation test = new I18nTranslation("test", english, "test"); + translationManager.persist(test); + } + private void createProperties() { final PropertyGroup groupProps = new PropertyGroup(Group.PROPS_ID); final PropertyGroup userProps = new PropertyGroup(User.PROPS_ID); @@ -207,18 +188,40 @@ final PropertySubgroup userXmppProps = new PropertySubgroup("user-xmpp"); propSubgroupManager.persist(userXmppProps); - final Property colorProp = new Property("xmpp_color", "Choose your color", Property.Type.STRING, true, "blue", - userProps, userXmppProps); - final ArrayList<String> subValues = new ArrayList<String>(); - subValues.add(SubscriptionMode.autoAcceptAll.toString()); - subValues.add(SubscriptionMode.autoRejectAll.toString()); - subValues.add(SubscriptionMode.manual.toString()); - final Property subProp = new Property("xmpp_subcriptionmode", "New buddies options", Property.Type.ENUM, true, - SubscriptionMode.manual.toString(), subValues, userProps, userXmppProps); - final Property unanavProp = new Property("xmpp_unanavailableitemsvisible", "Show unavailable buddies", - Property.Type.BOOL, true, Boolean.toString(true), userProps, userXmppProps); - propertyManager.persist(colorProp); - propertyManager.persist(subProp); - propertyManager.persist(unanavProp); + // final Property colorProp = new Property("xmpp_color", + // "Choose your color", Property.Type.STRING, true, "blue", + // userProps, userXmppProps); + // final ArrayList<String> subValues = new ArrayList<String>(); + // subValues.add(SubscriptionMode.autoAcceptAll.toString()); + // subValues.add(SubscriptionMode.autoRejectAll.toString()); + // subValues.add(SubscriptionMode.manual.toString()); + // final Property subProp = new Property("xmpp_subcriptionmode", + // "New buddies options", Property.Type.ENUM, true, + // SubscriptionMode.manual.toString(), subValues, userProps, + // userXmppProps); + // final Property unanavProp = new + // Property("xmpp_unanavailableitemsvisible", + // "Show unavailable buddies", + // Property.Type.BOOL, true, Boolean.toString(true), userProps, + // userXmppProps); + // propertyManager.persist(colorProp); + // propertyManager.persist(subProp); + // propertyManager.persist(unanavProp); } + + public void initConditional() throws Exception { + try { + groupManager.getSiteDefaultGroup(); + } catch (final NoResultException e) { + initDatabase(); + } + } + + @Transactional(type = TransactionType.READ_WRITE) + public void initDatabase() throws Exception { + createOthers(); + createLicenses(); + createProperties(); + createDefUsersGroup(); + } } Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -36,7 +36,6 @@ import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import org.ourproject.kune.workspace.client.themes.WsBackManager; import org.ourproject.kune.workspace.client.upload.FileUploader; -import org.ourproject.kune.workspace.client.wave.WaveInsert; import cc.kune.common.client.utils.SchedulerManager; import cc.kune.core.client.errors.ErrorHandler; @@ -50,20 +49,18 @@ public class WikiClientActions extends AbstractFoldableContentActions { public WikiClientActions(final I18nUITranslationService i18n, final ContextNavigator contextNavigator, - final Session session, final StateManager stateManager, - final SchedulerManager deferredCommandWrapper, + final Session session, final StateManager stateManager, final SchedulerManager deferredCommandWrapper, final Provider<ContentServiceAsync> contentServiceProvider, final Provider<GroupServiceAsync> groupServiceProvider, final Provider<FileUploader> fileUploaderProvider, final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, final Provider<FileDownloadUtils> fileDownloadProvider, final EntityHeader entityLogo, final Provider<ContentEditor> textEditorProvider, final ErrorHandler errorHandler, final WikiViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider, - final SitePublicSpaceLink publicLink, final WsBackManager wsBackManager, - final Provider<WaveInsert> waveInsert) { + final SitePublicSpaceLink publicLink, final WsBackManager wsBackManager) { super(session, stateManager, i18n, errorHandler, deferredCommandWrapper, groupServiceProvider, contentServiceProvider, fileUploaderProvider, contextNavigator, contentActionRegistry, contextActionRegistry, fileDownloadProvider, textEditorProvider, contextProvEditorProvider, - documentViewer, entityLogo, publicLink, wsBackManager, waveInsert); + documentViewer, entityLogo, publicLink, wsBackManager); } @Override Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -47,7 +47,6 @@ import org.ourproject.kune.workspace.client.themes.WsThemeManager; import org.ourproject.kune.workspace.client.tool.ToolSelector; import org.ourproject.kune.workspace.client.upload.FileUploader; -import org.ourproject.kune.workspace.client.wave.WaveInsert; import cc.kune.common.client.utils.SchedulerManager; import cc.kune.core.client.errors.ErrorHandler; @@ -83,8 +82,7 @@ p(ContentServiceAsync.class), p(GroupServiceAsync.class), p(FileUploader.class), i(ContentActionRegistry.class), i(ContextActionRegistry.class), p(FileDownloadUtils.class), i(EntityHeader.class), p(ContentEditor.class), i(ErrorHandler.class), i(WikiViewer.class), - p(ContextPropEditor.class), i(SitePublicSpaceLink.class), i(WsBackManager.class), - p(WaveInsert.class)); + p(ContextPropEditor.class), i(SitePublicSpaceLink.class), i(WsBackManager.class)); } }); Modified: trunk/src/main/java/org/ourproject/kune/workspace/KuneWorkspace.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/KuneWorkspace.gwt.xml 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/KuneWorkspace.gwt.xml 2011-01-29 03:38:12 UTC (rev 1227) @@ -9,7 +9,7 @@ <script src="js/ext/ext-all.js" /> <inherits name="com.gwtext.GwtExt" /> <inherits name="com.calclab.suco.Suco" /> - <inherits name="com.calclab.emiteuimodule.EmiteUIModule" /> +<!-- <inherits name="com.calclab.emiteuimodule.EmiteUIModule" />--> <inherits name="com.gwtextux.GwtExtUx" /> <inherits name="com.gwtextux.UploadDialog" /> <inherits name="com.gwtextux.ToastWindow" /> Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -43,7 +43,6 @@ import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import org.ourproject.kune.workspace.client.themes.WsBackManager; import org.ourproject.kune.workspace.client.upload.FileUploader; -import org.ourproject.kune.workspace.client.wave.WaveInsert; import cc.kune.common.client.utils.SchedulerManager; import cc.kune.core.client.errors.ErrorHandler; @@ -101,8 +100,6 @@ protected final StateManager stateManager; protected final Provider<ContentEditor> textEditorProvider; - private final Provider<WaveInsert> waveInsert; - private final WsBackManager wsBackManager; public AbstractFoldableContentActions(final Session session, final StateManager stateManager, @@ -113,8 +110,7 @@ final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, final Provider<FileDownloadUtils> fileDownloadProvider, final Provider<ContentEditor> textEditorProvider, final Provider<ContextPropEditor> contextPropEditorProvider, final FoldableContent foldableContent, - final EntityHeader entityLogo, final SitePublicSpaceLink publicLink, final WsBackManager wsBackManager, - final Provider<WaveInsert> waveInsert) { + final EntityHeader entityLogo, final SitePublicSpaceLink publicLink, final WsBackManager wsBackManager) { this.session = session; this.stateManager = stateManager; this.i18n = i18n; @@ -133,7 +129,6 @@ this.entityLogo = entityLogo; this.publicLink = publicLink; this.wsBackManager = wsBackManager; - this.waveInsert = waveInsert; createActions(); session.onInitDataReceived(new Listener<InitDataDTO>() { @Override @@ -621,24 +616,6 @@ return uploadMedia; } - protected ActionToolbarMenuAndItemDescriptor<StateToken> createWaveAction(final String waveFileType, - final String parentMenuTitle, final Position position, final String... registerInTypes) { - final ActionToolbarMenuAndItemDescriptor<StateToken> addWave = new ActionToolbarMenuAndItemDescriptor<StateToken>( - AccessRolDTO.Editor, CONTEXT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken parentToken) { - waveInsert.get().show(parentToken); - } - }); - addWave.setTextDescription(i18n.t("Add Wave")); - addWave.setParentMenuTitle(parentMenuTitle); - addWave.setMustBeAuthenticated(true); - addWave.setParentSubMenuTitle(i18n.t("New")); - // addContent.setIconUrl(iconUrl); - register(addWave, position, registerInTypes); - return addWave; - } - protected void downloadContent(final StateToken token) { fileDownloadProvider.get().downloadFile(token); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ActionsModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ActionsModule.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ActionsModule.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -1,10 +1,10 @@ package org.ourproject.kune.workspace.client; import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.workspace.client.socialnet.ParticipateAction; import org.ourproject.kune.workspace.client.socialnet.UnjoinAction; +import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; import cc.kune.core.client.state.AccessRightsClientManager; import cc.kune.core.client.state.Session; @@ -22,7 +22,7 @@ public ParticipateAction create() { return new ParticipateAction(i(Session.class), p(SocialNetworkServiceAsync.class), i(StateManager.class), i(AccessRightsClientManager.class), i(I18nTranslationService.class), - i(ImgResources.class)); + i(IconResources.class)); } }); @@ -30,7 +30,7 @@ @Override public UnjoinAction create() { return new UnjoinAction(i(Session.class), p(SocialNetworkServiceAsync.class), i(StateManager.class), - i(AccessRightsClientManager.class), i(I18nTranslationService.class), i(ImgResources.class)); + i(AccessRightsClientManager.class), i(I18nTranslationService.class), i(IconResources.class)); } }); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -35,7 +35,6 @@ import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; -import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette; import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtmlDialog; @@ -222,9 +221,6 @@ import org.ourproject.kune.workspace.client.upload.FileUploader; import org.ourproject.kune.workspace.client.upload.FileUploaderDialog; import org.ourproject.kune.workspace.client.upload.FileUploaderPresenter; -import org.ourproject.kune.workspace.client.wave.WaveInsert; -import org.ourproject.kune.workspace.client.wave.WaveInsertPanel; -import org.ourproject.kune.workspace.client.wave.WaveInsertPresenter; import cc.kune.common.client.noti.NotifyLevelImages; import cc.kune.common.client.utils.SchedulerManager; @@ -233,6 +229,7 @@ import cc.kune.core.client.auth.SignIn; import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.rpcservices.ContentService; import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.rpcservices.GroupService; @@ -344,7 +341,7 @@ public SiteUserOptions create() { final SiteUserOptionsPresenter presenter = new SiteUserOptionsPresenter(i(Session.class), i(StateManager.class), p(FileDownloadUtils.class), $(I18nTranslationService.class), - $(ImgResources.class)); + $(IconResources.class)); final SiteUserOptionsPanel panel = new SiteUserOptionsPanel(presenter, i(WorkspaceSkeleton.class), $(GuiBindingsRegister.class)); presenter.init(panel); @@ -379,7 +376,7 @@ @Override public SiteOptions create() { final SiteOptionsPresenter presenter = new SiteOptionsPresenter(i(I18nUITranslationService.class), - i(ImgResources.class)); + i(IconResources.class)); final SiteOptionsPanel panel = new SiteOptionsPanel(i(WorkspaceSkeleton.class), i(I18nUITranslationService.class), i(GuiBindingsRegister.class)); presenter.init(panel); @@ -549,7 +546,7 @@ i(Session.class), p(SocialNetworkServiceAsync.class), p(GroupServiceAsync.class), p(GroupLiveSearcher.class), p(ChatEngine.class), i(GroupActionRegistry.class), i(ActionGroupSummaryToolbar.class), p(FileDownloadUtils.class), - i(AccessRightsClientManager.class), i(ImgResources.class)); + i(AccessRightsClientManager.class), i(IconResources.class)); final GroupMembersSummaryView view = new GroupMembersSummaryPanel(presenter, i(I18nUITranslationService.class), i(WorkspaceSkeleton.class), i( ActionGroupSummaryToolbar.class).getView()); @@ -562,7 +559,7 @@ @Override public AddAsBuddieHeaderButton create() { return new AddAsBuddieHeaderButton(p(ChatEngine.class), i(Session.class), i(StateManager.class), - i(I18nTranslationService.class), i(ImgResources.class), i(EntityHeader.class)); + i(I18nTranslationService.class), i(IconResources.class), i(EntityHeader.class)); } }); @@ -573,7 +570,7 @@ i(Session.class), p(UserServiceAsync.class), i(UserActionRegistry.class), i(I18nTranslationService.class), p(ChatEngine.class), i(ActionBuddiesSummaryToolbar.class), p(FileDownloadUtils.class), i(ImageUtils.class), p(SocialNetworkServiceAsync.class), - i(GroupActionRegistry.class), i(AccessRightsClientManager.class), i(ImgResources.class)); + i(GroupActionRegistry.class), i(AccessRightsClientManager.class), i(IconResources.class)); final BuddiesSummaryPanel panel = new BuddiesSummaryPanel(presenter, i(WorkspaceSkeleton.class), i(I18nTranslationService.class), i(ActionManager.class), i(ActionBuddiesSummaryToolbar.class).getView()); @@ -589,7 +586,7 @@ i(I18nUITranslationService.class), i(StateManager.class), i(ImageUtils.class), i(Session.class), p(SocialNetworkServiceAsync.class), i(GroupActionRegistry.class), i(ActionParticipationToolbar.class), p(FileDownloadUtils.class), - i(AccessRightsClientManager.class), i(ImgResources.class)); + i(AccessRightsClientManager.class), i(IconResources.class)); final ParticipationSummaryView view = new ParticipationSummaryPanel(presenter, i(I18nUITranslationService.class), i(WorkspaceSkeleton.class), i( ActionParticipationToolbar.class).getView()); @@ -626,7 +623,7 @@ @Override public GroupOptions create() { final GroupOptionsPresenter presenter = new GroupOptionsPresenter(i(StateManager.class), - i(I18nTranslationService.class), i(ImgResources.class)); + i(I18nTranslationService.class), i(IconResources.class)); final GroupOptionsPanel panel = new GroupOptionsPanel(presenter, i(EntityHeader.class), i(I18nTranslationService.class), i(NotifyLevelImages.class), i(GroupOptionsCollection.class)); presenter.init(panel); @@ -638,7 +635,7 @@ @Override public UserOptions create() { final UserOptionsPresenter presenter = new UserOptionsPresenter(i(Session.class), - i(StateManager.class), i(I18nTranslationService.class), i(ImgResources.class), + i(StateManager.class), i(I18nTranslationService.class), i(IconResources.class), i(SiteUserOptions.class)); final UserOptionsPanel panel = new UserOptionsPanel(presenter, i(EntityHeader.class), i(I18nTranslationService.class), i(NotifyLevelImages.class), i(UserOptionsCollection.class)); @@ -856,7 +853,7 @@ @Override public SiteOptionsI18nTranslatorAction create() { return new SiteOptionsI18nTranslatorAction(i(SiteOptions.class), i(I18nTranslationService.class), - i(ImgResources.class), p(I18nTranslator.class)); + i(IconResources.class), p(I18nTranslator.class)); } }); @@ -1070,7 +1067,7 @@ @Override public MaxMinWorkspace create() { final MaxMinWorkspacePresenter presenter = new MaxMinWorkspacePresenter( - i(GlobalShortcutRegister.class), i(ImgResources.class), i(I18nTranslationService.class), + i(GlobalShortcutRegister.class), i(IconResources.class), i(I18nTranslationService.class), i(SiteOptions.class)); final MaxMinWorkspacePanel panel = new MaxMinWorkspacePanel(i(WorkspaceSkeleton.class)); presenter.init(panel); @@ -1100,19 +1097,6 @@ return presenter; } }); - - register(Singleton.class, new Factory<WaveInsert>(WaveInsert.class) { - @Override - public WaveInsert create() { - final WaveInsertPresenter presenter = new WaveInsertPresenter(i(Session.class), i(StateManager.class), - i(I18nTranslationService.class), p(ContentServiceAsync.class)); - final WaveInsertPanel panel = new WaveInsertPanel(presenter, i(I18nTranslationService.class), - i(ImgResources.class)); - presenter.init(panel); - return presenter; - } - }); - i(GlobalShortcutRegister.class).enable(); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -8,9 +8,9 @@ import org.ourproject.kune.platf.client.actions.Shortcut; import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; -import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.workspace.client.sitebar.siteoptions.SiteOptions; +import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.resources.client.ImageResource; @@ -45,7 +45,7 @@ private boolean maximized; - private final ImgResources images; + private final IconResources images; private final I18nTranslationService i18n; @@ -56,7 +56,7 @@ private MenuItemDescriptor minimizeButton; private final SiteOptions siteOptions; - public MaxMinWorkspacePresenter(final GlobalShortcutRegister shortcutReg, final ImgResources images, + public MaxMinWorkspacePresenter(final GlobalShortcutRegister shortcutReg, final IconResources images, final I18nTranslationService i18n, final SiteOptions siteOptions) { this.shortcutReg = shortcutReg; this.images = images; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/hello/HelloWorldModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/hello/HelloWorldModule.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/hello/HelloWorldModule.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -33,13 +33,13 @@ import org.ourproject.kune.platf.client.actions.ui.PushButtonDescriptor; import org.ourproject.kune.platf.client.services.AbstractExtendedModule; import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; -import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.editor.ContentEditor; import org.ourproject.kune.workspace.client.hello.HelloWorldModule.HelloWorldPanel.HelloWorldPresenter; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import cc.kune.core.client.i18n.I18nTranslationServiceMocked; +import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.shared.i18n.I18nTranslationService; import com.allen_sauer.gwt.log.client.Log; @@ -83,7 +83,7 @@ private HelloWorldView view; public HelloWorldPresenter(final I18nTranslationService i18n, - final Provider<ContentEditor> contentEditorProv, final ImgResources img) { + final Provider<ContentEditor> contentEditorProv, final IconResources img) { // Or add some actions to the general content editor: createActions(contentEditorProv, img, i18n); } @@ -108,7 +108,7 @@ * @param img * the img */ - private void createActions(final Provider<ContentEditor> contentEditorProv, final ImgResources img, + private void createActions(final Provider<ContentEditor> contentEditorProv, final IconResources img, final I18nTranslationService i18n) { final HelloWorldAction action = new HelloWorldAction(img); @@ -207,7 +207,7 @@ } static class HelloWorldAction extends AbstractAction { - public HelloWorldAction(final ImgResources img) { + public HelloWorldAction(final IconResources img) { super(); super.putValue(Action.NAME, "helloworld"); super.putValue(Action.SHORT_DESCRIPTION, "helloworld tooltip"); @@ -262,7 +262,7 @@ @Override public HelloWorld create() { final HelloWorldPresenter presenter = new HelloWorldPresenter(i(I18nTranslationServiceMocked.class), - p(ContentEditor.class), i(ImgResources.class)); + p(ContentEditor.class), i(IconResources.class)); final HelloWorldPanel panel = new HelloWorldPanel(presenter, i(WorkspaceSkeleton.class), i(I18nTranslationServiceMocked.class)); presenter.init(panel); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -4,9 +4,9 @@ import org.ourproject.kune.platf.client.actions.Action; import org.ourproject.kune.platf.client.actions.ActionEvent; import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; -import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.workspace.client.sitebar.siteoptions.SiteOptions; +import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.ioc.Provider; @@ -15,7 +15,7 @@ private final Provider<I18nTranslator> translator; public SiteOptionsI18nTranslatorAction(final SiteOptions siteOptions, final I18nTranslationService i18n, - final ImgResources img, final Provider<I18nTranslator> translator) { + final IconResources img, final Provider<I18nTranslator> translator) { super(); this.translator = translator; putValue(Action.NAME, i18n.t("Help with the translation")); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -26,7 +26,6 @@ import cc.kune.common.client.utils.TextUtils; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.calclab.suco.client.events.Event0; import com.calclab.suco.client.events.Listener0; import com.gwtext.client.widgets.form.Checkbox; import com.gwtext.client.widgets.form.FieldSet; @@ -36,22 +35,24 @@ public class LicenseWizardFirstForm extends DefaultForm implements LicenseWizardFirstFormView { private static final String POINT = "» "; + public static final String RADIO_ANOTHER_ID = "k-lwff-another"; public static final String RADIO_COPYLEFT_ID = "k-lwff-copyleft"; - public static final String RADIO_ANOTHER_ID = "k-lwff-another"; private static final String RADIO_FIELD_NAME = "k-lwff-radio"; - private final Event0 onCopyLeftLicenseSelected; - private final Event0 onAnotherLicenseSelected; + private final Radio anotherLicenseRadio; + // private final Event0 onCopyLeftLicenseSelected; + // private final Event0 onAnotherLicenseSelected; private final Radio copyleftRadio; - private final Radio anotherLicenseRadio; - public LicenseWizardFirstForm(I18nTranslationService i18n) { - this.onCopyLeftLicenseSelected = new Event0("onCopyLeftLicenseSelected"); - this.onAnotherLicenseSelected = new Event0("onAnotherLicenseSelected"); + public LicenseWizardFirstForm(final I18nTranslationService i18n) { + // this.onCopyLeftLicenseSelected = new + // Event0("onCopyLeftLicenseSelected"); + // this.onAnotherLicenseSelected = new + // Event0("onAnotherLicenseSelected"); super.setFrame(true); super.setPaddings(10); super.setHeight(LicenseWizardView.HEIGHT); - Label intro = new Label(); + final Label intro = new Label(); intro.setHtml(i18n.t("Select a license to share your group contents with other people:") + DefaultFormUtils.brbr()); @@ -64,33 +65,34 @@ RADIO_FIELD_NAME, null, RADIO_ANOTHER_ID); copyleftRadio.addListener(new CheckboxListenerAdapter() { @Override - public void onCheck(Checkbox field, boolean checked) { + public void onCheck(final Checkbox field, final boolean checked) { if (checked) { - onCopyLeftLicenseSelected.fire(); + // onCopyLeftLicenseSelected.fire(); } } }); anotherLicenseRadio.addListener(new CheckboxListenerAdapter() { @Override - public void onCheck(Checkbox field, boolean checked) { + public void onCheck(final Checkbox field, final boolean checked) { if (checked) { - onAnotherLicenseSelected.fire(); + // onAnotherLicenseSelected.fire(); } } }); - FieldSet infoFS = new FieldSet("Info"); + final FieldSet infoFS = new FieldSet("Info"); infoFS.setFrame(false); infoFS.setIconCls("k-info-icon"); infoFS.setCollapsible(false); infoFS.setAutoHeight(true); - Label recommendCopyleft = new Label(); - Label whyALicense = new Label(); - Label youCanChangeTheLicenseLater = new Label(); + final Label recommendCopyleft = new Label(); + final Label whyALicense = new Label(); + final Label youCanChangeTheLicenseLater = new Label(); recommendCopyleft.setHtml(POINT - + i18n.t("We recommend [%s] licenses, specially for practical works", TextUtils.generateHtmlLink( - "http://en.wikipedia.org/wiki/Copyleft", i18n.t("copyleft"))) + DefaultFormUtils.br()); + + i18n.t("We recommend [%s] licenses, specially for practical works", + TextUtils.generateHtmlLink("http://en.wikipedia.org/wiki/Copyleft", i18n.t("copyleft"))) + + DefaultFormUtils.br()); whyALicense.setHtml(POINT + TextUtils.generateHtmlLink("http://mirrors.creativecommons.org/getcreative/", i18n.t("Why do we need a license?")) + DefaultFormUtils.br()); @@ -106,12 +108,14 @@ add(infoFS); } + @Override public void onAnotherLicenseSelected(final Listener0 slot) { - onAnotherLicenseSelected.add(slot); + // onAnotherLicenseSelected.add(slot); } + @Override public void onCopyLeftLicenseSelected(final Listener0 slot) { - onCopyLeftLicenseSelected.add(slot); + // onCopyLeftLicenseSelected.add(slot); } @Override Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFrdForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFrdForm.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFrdForm.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -30,7 +30,6 @@ import cc.kune.core.shared.dto.LicenseDTO; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.calclab.suco.client.events.Event0; import com.calclab.suco.client.events.Listener0; import com.gwtext.client.core.Template; import com.gwtext.client.data.Record; @@ -45,17 +44,17 @@ public static final String OTHER_LICENSES_ID = "k-lwsf-other"; public static final String RADIO_FIELD_NAME = "k-lwsf-radio"; private final ComboBox cb; - private final Event0 onChange; + // private final Event0 onChange; private final Session session; - public LicenseWizardFrdForm(I18nTranslationService i18n, Session session) { + public LicenseWizardFrdForm(final I18nTranslationService i18n, final Session session) { this.session = session; - this.onChange = new Event0("onChange"); + // this.onChange = new Event0("onChange"); setFrame(true); super.setPaddings(10); super.setHeight(LicenseWizardView.HEIGHT); - Label intro = new Label(); + final Label intro = new Label(); intro.setHtml(i18n.t("Select other kind of licenses:") + DefaultFormUtils.brbr()); final Store store = new SimpleStore(new String[] { "shortname", "longname", "url" }, getNonCCLicenses()); @@ -85,20 +84,40 @@ cb.setTitle("Licenses"); cb.addListener(new ComboBoxListenerAdapter() { @Override - public void onSelect(ComboBox comboBox, Record record, int index) { - onChange.fire(); + public void onSelect(final ComboBox comboBox, final Record record, final int index) { + // onChange.fire(); } }); add(intro); add(cb); } + private String[][] getNonCCLicenses() { + final ArrayList<LicenseDTO> licensesNonCCList = new ArrayList<LicenseDTO>(); + final List<LicenseDTO> licenses = session.getLicenses(); + for (final LicenseDTO license : licenses) { + if (!license.isCC()) { + licensesNonCCList.add(license); + } + } + final String[][] licensesArray = new String[licensesNonCCList.size()][3]; + for (int i = 0; i < licensesNonCCList.size(); i++) { + final LicenseDTO license = licensesNonCCList.get(i); + licensesArray[i][0] = license.getShortName(); + licensesArray[i][1] = license.getLongName(); + licensesArray[i][2] = license.getImageUrl(); + } + return licensesArray; + } + + @Override public String getSelectedLicense() { return cb.getValueAsString(); } + @Override public void onChange(final Listener0 slot) { - onChange.add(slot); + // onChange.add(slot); } @Override @@ -106,25 +125,9 @@ super.reset(); } - public void setFlags(boolean isCopyleft, boolean isAppropiateForCulturalWorks, boolean isNonComercial) { + @Override + public void setFlags(final boolean isCopyleft, final boolean isAppropiateForCulturalWorks, + final boolean isNonComercial) { // TODO Auto-generated method stub } - - private String[][] getNonCCLicenses() { - ArrayList<LicenseDTO> licensesNonCCList = new ArrayList<LicenseDTO>(); - List<LicenseDTO> licenses = session.getLicenses(); - for (LicenseDTO license : licenses) { - if (!license.isCC()) { - licensesNonCCList.add(license); - } - } - String[][] licensesArray = new String[licensesNonCCList.size()][3]; - for (int i = 0; i < licensesNonCCList.size(); i++) { - LicenseDTO license = licensesNonCCList.get(i); - licensesArray[i][0] = license.getShortName(); - licensesArray[i][1] = license.getLongName(); - licensesArray[i][2] = license.getImageUrl(); - } - return licensesArray; - } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardTrdForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardTrdForm.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardTrdForm.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -26,7 +26,6 @@ import cc.kune.core.shared.i18n.I18nTranslationService; -import com.calclab.suco.client.events.Event0; import com.calclab.suco.client.events.Listener0; import com.gwtext.client.widgets.PaddedPanel; import com.gwtext.client.widgets.form.Checkbox; @@ -37,35 +36,35 @@ import com.gwtext.client.widgets.form.event.CheckboxListenerAdapter; public class LicenseWizardTrdForm extends DefaultForm implements LicenseWizardTrdFormView { + public static final String RADIO_COMMERCIAL_FIELD_NAME = "k-lwtf-comm-radio"; + public static final String RADIO_MODIF_FIELD_NAME = "k-lwtf-mod-radio"; + public static final String RADIO_NOT_COMM_ID = "k-lwtf-not-perm-comm"; + public static final String RADIO_NOT_PERMIT_MOD_ID = "k-lwtf-not-mod"; public static final String RADIO_PERMIT_COMMERCIAL_ID = "k-lwtf-perm-comm"; - public static final String RADIO_NOT_COMM_ID = "k-lwtf-not-perm-comm"; - public static final String RADIO_COMMERCIAL_FIELD_NAME = "k-lwtf-comm-radio"; public static final String RADIO_PERMIT_MOD_ID = "k-lwtf-mod-perm"; public static final String RADIO_PERMIT_MOD_SA_ID = "k-lwtf-mod-perm-sa"; - public static final String RADIO_NOT_PERMIT_MOD_ID = "k-lwtf-not-mod"; - public static final String RADIO_MODIF_FIELD_NAME = "k-lwtf-mod-radio"; + private final LicenseWizardFlags info; + private Radio notPermitComercialLicenseRadio; + // private final Event0 onChange; + private Radio notPermitModRadio; private Radio permitComercialRadio; private Radio permitModRadio; private Radio permitModSaRadio; - private final LicenseWizardFlags info; - private Radio notPermitModRadio; - private Radio notPermitComercialLicenseRadio; - private final Event0 onChange; - public LicenseWizardTrdForm(Images images, I18nTranslationService i18n) { + public LicenseWizardTrdForm(final Images images, final I18nTranslationService i18n) { super.setFrame(true); super.setHeight(LicenseWizardView.HEIGHT); super.setPaddings(10); - this.onChange = new Event0("onChange"); + // this.onChange = new Event0("onChange"); - Label intro = new Label(); + final Label intro = new Label(); intro.setHtml(i18n.t("With a Creative Commons license, you keep your copyright but allow people to copy and distribute your work provided they give you credit — and only on the conditions you specify here. What do you want to do?") + DefaultFormUtils.brbr()); - Label commercialQuestion = new Label(); + final Label commercialQuestion = new Label(); commercialQuestion.setHtml(i18n.t("Allow any uses of your work, including commercial?") + DefaultFormUtils.br()); - Label modificationsQuestion = new Label(); + final Label modificationsQuestion = new Label(); modificationsQuestion.setHtml(i18n.t("Allow modifications of your work?") + DefaultFormUtils.br()); final FieldSet commercialfieldSet = new FieldSet(i18n.t("Allow any uses of your work, including commercial?")); @@ -88,52 +87,25 @@ add(new PaddedPanel(info, 0, 0, 0, 0)); } - public boolean isAllowComercial() { - return permitComercialRadio.getValue(); - } - - public boolean isAllowModif() { - return permitModRadio.getValue(); - } - - public boolean isAllowModifShareAlike() { - return permitModSaRadio.getValue(); - } - - public void onChange(final Listener0 slot) { - onChange.add(slot); - } - - @Override - public void reset() { - super.reset(); - permitComercialRadio.setChecked(true); - permitModSaRadio.setChecked(true); - } - - public void setFlags(boolean isCopyleft, boolean isAppropiateForCulturalWorks, boolean isNonComercial) { - info.setVisible(isCopyleft, isAppropiateForCulturalWorks, isNonComercial); - } - private void createRadioListeners() { - Radio[] radios = { permitModRadio, permitModSaRadio, notPermitModRadio, permitComercialRadio, + final Radio[] radios = { permitModRadio, permitModSaRadio, notPermitModRadio, permitComercialRadio, notPermitComercialLicenseRadio }; - for (Radio radio : radios) { + for (final Radio radio : radios) { radio.addListener(new CheckboxListenerAdapter() { @Override - public void onChange(Field field, Object newVal, Object oldVal) { - onChange.fire(); + public void onChange(final Field field, final Object newVal, final Object oldVal) { + // onChange.fire(); } @Override - public void onCheck(Checkbox field, boolean checked) { - onChange.fire(); + public void onCheck(final Checkbox field, final boolean checked) { + // onChange.fire(); } }); } } - private void createRadios(I18nTranslationService i18n, final FieldSet commercialfieldSet, + private void createRadios(final I18nTranslationService i18n, final FieldSet commercialfieldSet, final FieldSet modificationsfieldSet) { permitComercialRadio = DefaultFormUtils.createRadio( commercialfieldSet, @@ -166,4 +138,37 @@ i18n.t("The licensor permits others to copy, distribute, display and perform only unaltered copies of the work — not derivative works based on it"), RADIO_NOT_PERMIT_MOD_ID); } + + @Override + public boolean isAllowComercial() { + return permitComercialRadio.getValue(); + } + + @Override + public boolean isAllowModif() { + return permitModRadio.getValue(); + } + + @Override + public boolean isAllowModifShareAlike() { + return permitModSaRadio.getValue(); + } + + @Override + public void onChange(final Listener0 slot) { + // onChange.add(slot); + } + + @Override + public void reset() { + super.reset(); + permitComercialRadio.setChecked(true); + permitModSaRadio.setChecked(true); + } + + @Override + public void setFlags(final boolean isCopyleft, final boolean isAppropiateForCulturalWorks, + final boolean isNonComercial) { + info.setVisible(isCopyleft, isAppropiateForCulturalWorks, isNonComercial); + } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPresenter.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPresenter.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -24,9 +24,9 @@ import org.ourproject.kune.platf.client.actions.ActionEvent; import org.ourproject.kune.platf.client.actions.ui.ButtonDescriptor; import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; -import org.ourproject.kune.platf.client.ui.img.ImgConstants; -import org.ourproject.kune.platf.client.ui.img.ImgResources; +import cc.kune.core.client.resources.icons.IconConstants; +import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -37,11 +37,11 @@ public static final String GROUP_OPTIONS_ICON = "k-eop-icon"; private GroupOptionsView view; private final I18nTranslationService i18n; - private final ImgResources img; + private final IconResources img; private ButtonDescriptor prefsItem; public GroupOptionsPresenter(final StateManager stateManager, final I18nTranslationService i18n, - final ImgResources img) { + final IconResources img) { this.i18n = i18n; this.img = img; stateManager.onStateChanged(new Listener<StateAbstractDTO>() { @@ -69,7 +69,7 @@ } }; groupPrefsAction.putValue(Action.NAME, i18n.t("Group options")); - groupPrefsAction.putValue(Action.SMALL_ICON, ImgConstants.toPath(img.prefs())); + groupPrefsAction.putValue(Action.SMALL_ICON, IconConstants.toPath(img.prefs())); prefsItem = new ButtonDescriptor(groupPrefsAction); prefsItem.setId(GROUP_OPTIONS_ICON); prefsItem.setVisible(false); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -24,9 +24,9 @@ import org.ourproject.kune.platf.client.actions.ActionEvent; import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; -import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.workspace.client.sitebar.siteusermenu.SiteUserOptions; +import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -36,14 +36,14 @@ public class UserOptionsPresenter extends AbstractTabbedDialogPresenter implements UserOptions { private UserOptionsView view; - private final ImgResources img; + private final IconResources img; private final I18nTranslationService i18n; private final SiteUserOptions userOptions; private final Session session; private final StateManager stateManager; public UserOptionsPresenter(final Session session, final StateManager stateManager, - final I18nTranslationService i18n, final ImgResources img, final SiteUserOptions userOptions) { + final I18nTranslationService i18n, final IconResources img, final SiteUserOptions userOptions) { this.session = session; this.stateManager = stateManager; this.i18n = i18n; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPresenter.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPresenter.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -29,8 +29,8 @@ import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; import org.ourproject.kune.platf.client.actions.ui.MenuSeparatorDescriptor; import org.ourproject.kune.platf.client.ui.KuneWindowUtils; -import org.ourproject.kune.platf.client.ui.img.ImgResources; +import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.shared.i18n.I18nTranslationService; public class SiteOptionsPresenter extends AbstractActionExtensiblePresenter implements SiteOptions { @@ -38,9 +38,9 @@ private SiteOptionsView view; private final MenuDescriptor menuDescriptor; private final I18nTranslationService i18n; - private final ImgResources img; + private final IconResources img; - public SiteOptionsPresenter(final I18nTranslationService i18n, final ImgResources img) { + public SiteOptionsPresenter(final I18nTranslationService i18n, final IconResources img) { super(); this.i18n = i18n; this.img = img; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -31,9 +31,9 @@ import org.ourproject.kune.platf.client.actions.ui.MenuDescriptor; import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; -import org.ourproject.kune.platf.client.ui.img.ImgResources; import cc.kune.core.client.resources.CoreMessages; +import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.GroupDTO; @@ -52,13 +52,13 @@ private final Provider<FileDownloadUtils> downloadProvider; private MenuDescriptor menuDescriptor; private final I18nTranslationService i18n; - private final ImgResources img; + private final IconResources img; private MenuDescriptor partiMenu;; public SiteUserOptionsPresenter(final Session session, final StateManager stateManager, final Provider<FileDownloadUtils> downloadProvider, final I18nTranslationService i18n, - final ImgResources img) { + final IconResources img) { super(); this.session = session; this.stateManager = stateManager; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -31,10 +31,10 @@ import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; import org.ourproject.kune.platf.client.services.ImageUtils; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; -import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.socialnet.toolbar.ActionBuddiesSummaryToolbar; +import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; import cc.kune.core.client.rpcservices.UserServiceAsync; @@ -73,7 +73,7 @@ final ActionBuddiesSummaryToolbar toolbar, final Provider<FileDownloadUtils> fileDownUtilsProvider, final ImageUtils imageUtils, final Provider<SocialNetworkServiceAsync> snServiceAsync, final GroupActionRegistry groupActionRegistry, final AccessRightsClientManager accessRightManager, - final ImgResources img) { + final IconResources img) { super(i18n, stateManager, accessRightManager, session, snServiceAsync, groupActionRegistry, fileDownUtilsProvider, img); this.stateManager = stateManager; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -33,7 +33,6 @@ import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.GroupDTO; -import com.calclab.emiteuimodule.client.users.UserGridPanel; import com.calclab.suco.client.events.Listener; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; @@ -47,9 +46,9 @@ // private static final int MAX_HEIGHT = 110; private final GridMenuPanel<GroupDTO> gridMenuPanel; private final I18nUITranslationService i18n; + private final Label noMembersPublic; private final GroupMembersSummaryPresenter presenter; private final AbstractToolbar toolbar; - private final Label noMembersPublic; public GroupMembersSummaryPanel(final GroupMembersSummaryPresenter presenter, final I18nUITranslationService i18n, final WorkspaceSkeleton ws, final ActionToolbarView<StateToken> actionToolbarView) { @@ -57,12 +56,13 @@ this.presenter = presenter; this.i18n = i18n; - final GridDragConfiguration dragConf = new GridDragConfiguration(UserGridPanel.USER_GROUP_DD, + final GridDragConfiguration dragConf = new GridDragConfiguration("kk", i18n.t("Drop into the chat area to start a chat.") + "<br/>" + i18n.t("Drop into a room to invite the user to join the chat room")); gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This is an orphaned project, if you are interested " + "please request to join to work on it"), dragConf, true, true, false, true, false); final Listener<String> go = new Listener<String>() { + @Override public void onEvent(final String groupShortName) { presenter.onDoubleClick(groupShortName); } @@ -91,6 +91,7 @@ }); } + @Override public void addItem(final GridItem<GroupDTO> gridItem) { gridMenuPanel.setVisible(true); gridMenuPanel.addItem(gridItem); @@ -105,13 +106,16 @@ doLayoutIfNeeded(); } + @Override public void confirmAddCollab(final String groupShortName, final String groupLongName) { final String groupName = groupLongName + " (" + groupShortName + ")"; MessageBox.confirm(i18n.t("Confirm member joining"), i18n.t("Add [%s] as a member?", groupName), new MessageBox.ConfirmCallback() { + @Override public void execute(final String btnID) { if (btnID.equals("yes")) { Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override public void execute() { presenter.addCollab(groupShortName); } @@ -126,6 +130,7 @@ // gridMenuPanel.setDraggable(draggable); } + @Override public void showMembersNotVisible() { noMembersPublic.setVisible(true); gridMenuPanel.setVisible(false); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -31,12 +31,12 @@ import org.ourproject.kune.platf.client.ui.MenuItem; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.gridmenu.GridGroup; -import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.search.GroupLiveSearcher; import org.ourproject.kune.workspace.client.socialnet.toolbar.ActionGroupSummaryToolbar; import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; @@ -84,7 +84,7 @@ final Provider<GroupLiveSearcher> liveSearcherProvider, final Provider<ChatEngine> chatEngineProvider, final GroupActionRegistry groupActionRegistry, final ActionGroupSummaryToolbar toolbar, final Provider<FileDownloadUtils> downloadProvider, final AccessRightsClientManager accessRightsManager, - final ImgResources img) { + final IconResources img) { super(i18n, stateManager, accessRightsManager, session, snServiceProvider, groupActionRegistry, downloadProvider, img); this.i18n = i18n; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipateAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipateAction.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipateAction.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -1,9 +1,9 @@ package org.ourproject.kune.workspace.client.socialnet; import org.ourproject.kune.platf.client.actions.ActionEvent; -import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; +import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; import cc.kune.core.client.state.AccessRightsClientManager; @@ -20,7 +20,7 @@ public ParticipateAction(final Session session, final Provider<SocialNetworkServiceAsync> snServiceProvider, final StateManager stateManager, final AccessRightsClientManager rightsManager, - final I18nTranslationService i18n, final ImgResources imgResources) { + final I18nTranslationService i18n, final IconResources imgResources) { super(session, stateManager, rightsManager, i18n, AccessRolDTO.Viewer, i18n.t("Participate"), i18n.t("Request to participate in this group"), imgResources.addGreen()); this.snServiceProvider = snServiceProvider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -24,10 +24,10 @@ import org.ourproject.kune.platf.client.services.ImageUtils; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.gridmenu.GridGroup; -import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.workspace.client.socialnet.toolbar.ActionParticipationToolbar; import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; import cc.kune.core.client.state.AccessRightsClientManager; import cc.kune.core.client.state.Session; @@ -52,7 +52,7 @@ final Provider<SocialNetworkServiceAsync> snServiceProvider, final GroupActionRegistry groupActionRegistry, final ActionParticipationToolbar actionParticipationToolbar, final Provider<FileDownloadUtils> downloadProvider, final AccessRightsClientManager accessRightsManager, - final ImgResources img) { + final IconResources img) { super(i18n, stateManager, accessRightsManager, session, snServiceProvider, groupActionRegistry, downloadProvider, img); adminCategory = new GridGroup("admin in:", " ", i18n.tWithNT("Administrate these groups", Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -32,9 +32,9 @@ import org.ourproject.kune.platf.client.ui.gridmenu.CustomMenu; import org.ourproject.kune.platf.client.ui.gridmenu.GridGroup; import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; -import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; +import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; import cc.kune.core.client.state.AccessRightsClientManager; @@ -75,14 +75,14 @@ protected ActionToolbarButtonDescriptor<StateToken> participate; private final Provider<FileDownloadUtils> downloadProvider; private final AccessRightsClientManager rightsManager; - private final ImgResources imgResources; + private final IconResources imgResources; private MenuDescriptor menuOptions; public SocialNetworkPresenter(final I18nTranslationService i18n, final StateManager stateManager, final AccessRightsClientManager rightsManager, final Session session, final Provider<SocialNetworkServiceAsync> snServiceProvider, final GroupActionRegistry groupActionRegistry, - final Provider<FileDownloadUtils> downloadProvider, final ImgResources imgResources) { + final Provider<FileDownloadUtils> downloadProvider, final IconResources imgResources) { this.i18n = i18n; this.stateManager = stateManager; this.rightsManager = rightsManager; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UnjoinAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UnjoinAction.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UnjoinAction.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -1,9 +1,9 @@ package org.ourproject.kune.workspace.client.socialnet; import org.ourproject.kune.platf.client.actions.ActionEvent; -import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; +import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; import cc.kune.core.client.state.AccessRightsClientManager; @@ -23,7 +23,7 @@ public UnjoinAction(final Session session, final Provider<SocialNetworkServiceAsync> snServiceProvider, final StateManager stateManager, final AccessRightsClientManager rightsManager, - final I18nTranslationService i18n, final ImgResources imgResources) { + final I18nTranslationService i18n, final IconResources imgResources) { super(session, stateManager, rightsManager, i18n, AccessRolDTO.Editor, i18n.t("Leave this group"), i18n.t("Do not participate anymore in this group"), imgResources.delGreen()); this.snServiceProvider = snServiceProvider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddieHeaderButton.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddieHeaderButton.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddieHeaderButton.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -8,11 +8,11 @@ import org.ourproject.kune.platf.client.actions.PropertyChangeEvent; import org.ourproject.kune.platf.client.actions.PropertyChangeListener; import org.ourproject.kune.platf.client.actions.ui.ButtonDescriptor; -import org.ourproject.kune.platf.client.ui.img.ImgConstants; -import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; +import cc.kune.core.client.resources.icons.IconConstants; +import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.StateAbstractDTO; @@ -29,7 +29,7 @@ private final Session session; public AddAsBuddieAction(final Provider<ChatEngine> chatEngine, final Session session, - final StateManager stateManager, final I18nTranslationService i18n, final ImgResources img) { + final StateManager stateManager, final I18nTranslationService i18n, final IconResources img) { super(); this.chatEngine = chatEngine; this.session = session; @@ -44,7 +44,7 @@ } }); putValue(Action.NAME, i18n.t("Add as a buddie")); - putValue(Action.SMALL_ICON, ImgConstants.toPath(img.addGreen())); + putValue(Action.SMALL_ICON, IconConstants.toPath(img.addGreen())); } public void actionPerformed(final ActionEvent event) { @@ -67,7 +67,7 @@ } public AddAsBuddieHeaderButton(final Provider<ChatEngine> chatEngine, final Session session, - final StateManager stateManager, final I18nTranslationService i18n, final ImgResources img, + final StateManager stateManager, final I18nTranslationService i18n, final IconResources img, final EntityHeader entityHeader) { final AddAsBuddieAction buddieAction = new AddAsBuddieAction(chatEngine, session, stateManager, i18n, img); final ButtonDescriptor button = new ButtonDescriptor(buddieAction); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -5,8 +5,6 @@ import cc.kune.core.shared.domain.utils.StateToken; -import com.calclab.suco.client.events.Event; -import com.calclab.suco.client.events.Event0; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; import com.google.gwt.user.client.DOM; @@ -17,34 +15,39 @@ private static final StateToken NO_TOKEN = new StateToken("none.none.0.0"); private final FileDownloadUtils downloadUtils; private StateToken lastToken; - private final Event0 onBackClear; - private final Event<StateToken> onSetBackImage; + // private final Event0 onBackClear; + // private final Event<StateToken> onSetBackImage; + public WsBackManagerImpl(final FileDownloadUtils downloadUtils) { this.downloadUtils = downloadUtils; lastToken = NO_TOKEN; - this.onBackClear = new Event0("onBackClear"); - this.onSetBackImage = new Event<StateToken>("onSetBackImage"); + // this.onBackClear = new Event0("onBackClear"); + // this.onSetBackImage = new Event<StateToken>("onSetBackImage"); } + @Override public void addBackClear(final Listener0 listener) { - onBackClear.add(listener); + // onBackClear.add(listener); } + @Override public void addSetBackImage(final Listener<StateToken> listener) { - onSetBackImage.add(listener); + // onSetBackImage.add(listener); } + @Override public void clearBackImage() { - onBackClear.fire(); + // onBackClear.fire(); if (!lastToken.equals(NO_TOKEN)) { DOM.setStyleAttribute(RootPanel.getBodyElement(), CSS.A.BACKGROUND, "transparent"); lastToken = NO_TOKEN; } } + @Override public void setBackImage(final StateToken token) { - onSetBackImage.fire(token); + // onSetBackImage.fire(token); if (!token.equals(lastToken)) { final String bodyProp = "#FFFFFF url('" + downloadUtils.getImageUrl(token) + "') fixed no-repeat top left"; DOM.setStyleAttribute(RootPanel.getBodyElement(), CSS.A.BACKGROUND, bodyProp); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeManager.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeManager.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -30,18 +30,16 @@ import cc.kune.core.shared.dto.InitDataDTO; import cc.kune.core.shared.dto.StateAbstractDTO; -import com.calclab.suco.client.events.Event2; -import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener2; import com.calclab.suco.client.ioc.Provider; public class WsThemeManager { + private WsTheme defTheme; + // private final Event2<WsTheme, WsTheme> onThemeChanged; + private final Provider<GroupServiceAsync> groupServiceProvider; private WsTheme previousTheme; - private final Event2<WsTheme, WsTheme> onThemeChanged; - private final Provider<GroupServiceAsync> groupServiceProvider; private final Session session; - private WsTheme defTheme; private final WsBackManager wsBackManager; public WsThemeManager(final Session session, final Provider<GroupServiceAsync> groupServiceProvider, @@ -49,28 +47,29 @@ this.session = session; this.groupServiceProvider = groupServiceProvider; this.wsBackManager = wsBackManager; - this.onThemeChanged = new Event2<WsTheme, WsTheme>("onThemeChanged"); - session.onInitDataReceived(new Listener<InitDataDTO>() { - public void onEvent(final InitDataDTO initData) { - setDefTheme(initData); - setTheme(defTheme); - } - }); - stateManager.onStateChanged(new Listener<StateAbstractDTO>() { - public void onEvent(final StateAbstractDTO state) { - setState(state); - } - }); + // this.onThemeChanged = new Event2<WsTheme, WsTheme>("onThemeChanged"); + // session.onInitDataReceived(new Listener<InitDataDTO>() { + // public void onEvent(final InitDataDTO initData) { + // setDefTheme(initData); + // setTheme(defTheme); + // } + // }); + // stateManager.onStateChanged(new Listener<StateAbstractDTO>() { + // public void onEvent(final StateAbstractDTO state) { + // setState(state); + // } + // }); } public void addOnThemeChanged(final Listener2<WsTheme, WsTheme> listener) { - onThemeChanged.add(listener); + // onThemeChanged.add(listener); } public void changeTheme(final StateToken token, final WsTheme newTheme) { NotifyUser.showProgressProcessing(); groupServiceProvider.get().changeGroupWsTheme(session.getUserHash(), token, newTheme.getName(), new AsyncCallbackSimple<Void>() { + @Override public void onSuccess(final Void result) { if (session.getCurrentState().getStateToken().getGroup().equals(token.getGroup())) { setTheme(newTheme); @@ -84,6 +83,7 @@ NotifyUser.showProgressProcessing(); groupServiceProvider.get().changeGroupWsTheme(session.getUserHash(), session.getCurrentState().getStateToken(), newTheme.getName(), new AsyncCallbackSimple<Void>() { + @Override public void onSuccess(final Void result) { setTheme(newTheme); NotifyUser.hideProgress(); @@ -107,7 +107,7 @@ private void setTheme(final WsTheme newTheme) { if (previousTheme == null || !previousTheme.equals(newTheme)) { - onThemeChanged.fire(previousTheme, newTheme); + // onThemeChanged.fire(previousTheme, newTheme); } previousTheme = newTheme; } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeSelectorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeSelectorPresenter.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeSelectorPresenter.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -13,7 +13,6 @@ import cc.kune.core.shared.dto.InitDataDTO; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.calclab.suco.client.events.Event; import com.calclab.suco.client.events.Listener; public class WsThemeSelectorPresenter implements WsThemeSelector { @@ -29,48 +28,38 @@ putValue(SMALL_ICON, CssStyleDescriptor.create("k-wstheme-icon-" + theme)); } + @Override public void actionPerformed(final ActionEvent event) { - themeSelected.fire(new WsTheme(theme)); + // themeSelected.fire(new WsTheme(theme)); menu.setText(i18n.t(theme)); } } - private final Event<WsTheme> themeSelected; - private final Event<String> selectItemInUI; + // private final Event<WsTheme> themeSelected; + // private final Event<String> selectItemInUI; private final I18nTranslationService i18n; private MenuDescriptor menu; + private final Session session; private ActionExtensibleView view; - private final Session session; public WsThemeSelectorPresenter(final Session session, final I18nTranslationService i18n) { this.session = session; this.i18n = i18n; - this.themeSelected = new Event<WsTheme>("themeSelected"); - this.selectItemInUI = new Event<String>("selectItemInUI"); + // this.themeSelected = new Event<WsTheme>("themeSelected"); + // this.selectItemInUI = new Event<String>("selectItemInUI"); } + @Override public void addThemeSelected(final Listener<WsTheme> listener) { - themeSelected.add(listener); + // themeSelected.add(listener); } - public View getView() { - return view; - } - - public void init(final ActionExtensibleView view) { - this.view = view; - createActions(); - } - - public void select(final String theme) { - selectItemInUI.fire(theme); - } - private void createActions() { createMenu(); final InitDataDTO initData = session.getInitData(); if (initData == null) { session.onInitDataReceived(new Listener<InitDataDTO>() { + @Override public void onEvent(final InitDataDTO initData) { setThemes(initData); } @@ -88,17 +77,32 @@ private void createTheme(final String theme) { final ThemeAction action = new ThemeAction(theme); final MenuItemDescriptor themeItem = new MenuItemDescriptor(menu, action); - selectItemInUI.add(new Listener<String>() { - public void onEvent(final String themeToSelect) { - if (theme.equals(themeToSelect)) { - menu.setText(i18n.t(theme)); - // themeItem.setChecked(true); - } - } - }); + // selectItemInUI.add(new Listener<String>() { + // public void onEvent(final String themeToSelect) { + // if (theme.equals(themeToSelect)) { + // menu.setText(i18n.t(theme)); + // // themeItem.setChecked(true); + // } + // } + // }); view.addAction(themeItem); } + @Override + public View getView() { + return view; + } + + public void init(final ActionExtensibleView view) { + this.view = view; + createActions(); + } + + @Override + public void select(final String theme) { + // selectItemInUI.fire(theme); + } + private void setThemes(final InitDataDTO initData) { view.addAction(menu); for (final String theme : initData.getWsThemes()) { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -29,39 +29,40 @@ import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.calclab.suco.client.events.Event2; import com.calclab.suco.client.events.Listener2; import com.calclab.suco.client.ioc.Provider; import com.google.gwt.user.client.rpc.AsyncCallback; public class RenameAction { + private final Provider<ContentServiceAsync> contentService; private final I18nTranslationService i18n; - private final Provider<ContentServiceAsync> contentService; private final Session session; - private final Event2<StateToken, String> onSuccess; - private final Event2<StateToken, String> onFail; + // private final Event2<StateToken, String> onSuccess; + // private final Event2<StateToken, String> onFail; + public RenameAction(final I18nTranslationService i18n, final Session session, final Provider<ContentServiceAsync> contentService) { this.i18n = i18n; this.session = session; this.contentService = contentService; - this.onSuccess = new Event2<StateToken, String>("onRenameSuccess"); - this.onFail = new Event2<StateToken, String>("onRenamaFail"); + // this.onSuccess = new Event2<StateToken, String>("onRenameSuccess"); + // this.onFail = new Event2<StateToken, String>("onRenamaFail"); } public void onFail(final Listener2<StateToken, String> slot) { - onFail.add(slot); + // onFail.add(slot); } public void onSuccess(final Listener2<StateToken, String> slot) { - onSuccess.add(slot); + // onSuccess.add(slot); } public void rename(final StateToken token, final String oldName, final String newName) { if (!newName.equals(oldName)) { NotifyUser.showProgress(i18n.t("Renaming")); final AsyncCallback<StateAbstractDTO> asyncCallback = new AsyncCallback<StateAbstractDTO>() { + @Override public void onFailure(final Throwable caught) { NotifyUser.hideProgress(); if (caught instanceof NameInUseException) { @@ -73,13 +74,14 @@ } else { NotifyUser.error(i18n.t("Error renaming")); } - onFail.fire(token, oldName); + // onFail.fire(token, oldName); } + @Override public void onSuccess(final StateAbstractDTO state) { NotifyUser.hideProgress(); session.setCurrentState(state); - onSuccess.fire(token, state.getTitle()); + // onSuccess.fire(token, state.getTitle()); } }; if (token.isComplete()) { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderPresenter.java 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderPresenter.java 2011-01-29 03:38:12 UTC (rev 1227) @@ -24,24 +24,24 @@ import cc.kune.core.client.state.Session; import cc.kune.core.shared.domain.utils.StateToken; -import com.calclab.suco.client.events.Event; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; public class FileUploaderPresenter implements FileUploader { + private StateToken currentUploadStateToken; + // private final Event<StateToken> onUploadComplete; + private final Session session; private FileUploaderView view; - private final Session session; - private StateToken currentUploadStateToken; - private final Event<StateToken> onUploadComplete; public FileUploaderPresenter(final Session session) { this.session = session; - this.onUploadComplete = new Event<StateToken>("onUploadComplete"); + // this.onUploadComplete = new Event<StateToken>("onUploadComplete"); } + @Override public void addOnUploadCompleteListener(final Listener<StateToken> slot) { - onUploadComplete.add(slot); + // onUploadComplete.add(slot); } public boolean checkFolderChange() { @@ -61,10 +61,12 @@ } } + @Override public boolean hasUploadingFiles() { return view.hasUploadingFiles(); } + @Override public void hide() { view.hide(); } @@ -72,6 +74,7 @@ public void init(final FileUploaderView view) { this.view = view; session.onUserSignOut(new Listener0() { + @Override public void onEvent() { view.destroy(); } @@ -79,24 +82,27 @@ } public void onUploadComplete() { - onUploadComplete.fire(currentUploadStateToken); + // onUploadComplete.fire(currentUploadStateToken); } + @Override public void resetPermittedExtensions() { view.resetPermittedExtensions(); } + private boolean sameContainer() { + final StateToken currentStateToken = session.getCurrentStateToken(); + currentUploadStateToken = currentUploadStateToken == null ? currentStateToken : currentUploadStateToken; + return currentUploadStateToken.equals(currentStateToken); + } + + @Override public void setPermittedExtensions(final String extensions) { view.setPermittedExtensions(extensions); } + @Override public void show() { view.show(); } - - private boolean sameContainer() { - final StateToken currentStateToken = session.getCurrentStateToken(); - currentUploadStateToken = currentUploadStateToken == null ? currentStateToken : currentUploadStateToken; - return currentUploadStateToken.equals(currentStateToken); - } } Modified: trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/src/main/webapp/WEB-INF/web.xml 2011-01-28 01:41:24 UTC (rev 1226) +++ trunk/src/main/webapp/WEB-INF/web.xml 2011-01-29 03:38:12 UTC (rev 1227) @@ -15,43 +15,43 @@ <welcome-file>ws.html</welcome-file> </welcome-file-list> <!-- Note: this gives problems depending on the version of jetty or tomcat --> -<!-- <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>--> + <!-- <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> @@ -66,25 +66,41 @@ <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>Proxy</servlet-name> - <servlet-class>de.spieleck.servlets.ProxyServlet</servlet-class> + <servlet-name>HttpBind</servlet-name> + <servlet-class>org.eclipse.jetty.servlets.ProxyServlet$Transparent</servlet-class> <init-param> - <param-name>remotePath</param-name> - <param-value>/http-bind/</param-value> + <param-name>ProxyTo</param-name> + <param-value>http://localhost:5280/http-bind/</param-value> </init-param> <init-param> - <param-name>remoteServer</param-name> - <param-value>localhost</param-value> + <param-name>Prefix</param-name> + <param-value>/</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-name>HttpBind</servlet-name> + <url-pattern>/http-bind</url-pattern> </servlet-mapping> <servlet> <servlet-name>WiabSocketIO</servlet-name>