Author: vjrj Date: 2008-06-11 22:19:21 +0200 (Wed, 11 Jun 2008) New Revision: 779 Modified: trunk/pom.xml trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientNewModule.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineXmpp.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientNewModule.java trunk/src/main/java/org/ourproject/kune/platf/client/PlatformClientModule.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/GotoAction.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/GotoContainerAction.java trunk/src/main/java/org/ourproject/kune/platf/client/services/Kune.java trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java Log: modular update, gwt-ext 2.0.4 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2008-06-11 19:30:30 UTC (rev 778) +++ trunk/pom.xml 2008-06-11 20:19:21 UTC (rev 779) @@ -49,7 +49,7 @@ <dependency> <groupId>com.gwtext</groupId> <artifactId>gwtext</artifactId> - <version>2.0.4-beta2</version> + <version>2.0.4</version> </dependency> <dependency> <groupId>com.allen_sauer.gwt.log.gwt-log</groupId> @@ -278,8 +278,8 @@ <version>0.2.8</version> </dependency> <dependency> - <groupId>com.calclab.emite</groupId> - <artifactId>emitemodular</artifactId> + <groupId>com.calclab</groupId> + <artifactId>suco</artifactId> <version>0.2.8</version> </dependency> </dependencies> Modified: trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml 2008-06-11 19:30:30 UTC (rev 778) +++ trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml 2008-06-11 20:19:21 UTC (rev 779) @@ -3,16 +3,20 @@ <inherits name='com.google.gwt.user.User' /> <inherits name="org.cafesip.gwtcomp.GWTComponents" /> - <!-- gxt --> + <!-- gxt <inherits name='com.extjs.gxt.ui.GXT' /> <stylesheet src="css/ext-all.css" /> <stylesheet src="css/xtheme-gray.css" /> + --> <!-- gwt-ext --> <inherits name='com.gwtext.GwtExt' /> <script src="js/ext/adapter/ext/ext-base.js" /> <script src="js/ext/ext-all.js" /> + + <inherits name="com.calclab.suco.Suco" /> + <inherits name='org.ourproject.kune.platf.Kune-Platform' /> <inherits name='org.ourproject.kune.docs.Kune-Docs' /> <inherits name='org.ourproject.kune.chat.Kune-Chat' /> Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientNewModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientNewModule.java 2008-06-11 19:30:30 UTC (rev 778) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientNewModule.java 2008-06-11 20:19:21 UTC (rev 779) @@ -6,11 +6,11 @@ import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; import com.calclab.emiteuimodule.client.EmiteUIDialog; -import com.calclab.modular.client.container.Container; -import com.calclab.modular.client.container.Provider; -import com.calclab.modular.client.modules.Module; -import com.calclab.modular.client.modules.ModuleBuilder; -import com.calclab.modular.client.scopes.SingletonScope; +import com.calclab.suco.client.container.Container; +import com.calclab.suco.client.container.Provider; +import com.calclab.suco.client.modules.Module; +import com.calclab.suco.client.modules.ModuleBuilder; +import com.calclab.suco.client.scopes.SingletonScope; public class ChatClientNewModule implements Module { public static ChatClientTool getChatClientTool(final Container components) { @@ -29,12 +29,12 @@ } }, SingletonScope.class); - KunePlatform platform = builder.getInstance(KunePlatform.class); - ChatClientTool chatClientTool = getChatClientTool(builder); + final KunePlatform platform = builder.getInstance(KunePlatform.class); + final ChatClientTool chatClientTool = getChatClientTool(builder); platform.addTool(chatClientTool); - Session session = builder.getInstance(Session.class); - StateManager stateManager = builder.getInstance(StateManager.class); + final Session session = builder.getInstance(Session.class); + final StateManager stateManager = builder.getInstance(StateManager.class); platform.install(new ChatClientModule(session, stateManager, chatClientTool)); } } Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineXmpp.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineXmpp.java 2008-06-11 19:30:30 UTC (rev 778) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineXmpp.java 2008-06-11 20:19:21 UTC (rev 779) @@ -29,7 +29,7 @@ import com.calclab.emiteuimodule.client.UserChatOptions; import com.calclab.emiteuimodule.client.params.AvatarProvider; import com.calclab.emiteuimodule.client.status.OwnPresence.OwnStatus; -import com.calclab.modular.client.signal.Slot; +import com.calclab.suco.client.signal.Slot; import com.google.gwt.user.client.Window; class ChatEngineXmpp implements ChatEngine { @@ -49,8 +49,8 @@ } public void joinRoom(final String roomName, final String userAlias) { - XmppURI roomURI = XmppURI.uri(roomName + "@" + chatOptions.roomHost + "/" - + XmppURI.jid(chatOptions.userOptions.getUserJid())); + final XmppURI roomURI = XmppURI.uri(roomName + "@" + chatOptions.roomHost + "/" + + chatOptions.userOptions.getUserJid().getNode()); emiteDialog.joinRoom(roomURI); } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientNewModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientNewModule.java 2008-06-11 19:30:30 UTC (rev 778) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientNewModule.java 2008-06-11 20:19:21 UTC (rev 779) @@ -7,11 +7,11 @@ import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; -import com.calclab.modular.client.container.Container; -import com.calclab.modular.client.container.Provider; -import com.calclab.modular.client.modules.Module; -import com.calclab.modular.client.modules.ModuleBuilder; -import com.calclab.modular.client.scopes.SingletonScope; +import com.calclab.suco.client.container.Container; +import com.calclab.suco.client.container.Provider; +import com.calclab.suco.client.modules.Module; +import com.calclab.suco.client.modules.ModuleBuilder; +import com.calclab.suco.client.scopes.SingletonScope; public class DocumentClientNewModule implements Module { public static DocumentClientTool getDocumentClientTool(final Container components) { @@ -31,19 +31,19 @@ builder.registerProvider(DocumentClientTool.class, new Provider<DocumentClientTool>() { public DocumentClientTool get() { - DocumentFactory factory = builder.getInstance(DocumentFactory.class); + final DocumentFactory factory = builder.getInstance(DocumentFactory.class); return new DocumentClientTool(factory, builder.getInstance(I18nUITranslationService.class)); } }, SingletonScope.class); - KunePlatform platform = builder.getInstance(KunePlatform.class); - DocumentClientTool docClientTool = getDocumentClientTool(builder); + final KunePlatform platform = builder.getInstance(KunePlatform.class); + final DocumentClientTool docClientTool = getDocumentClientTool(builder); platform.addTool(docClientTool); - Session session = builder.getInstance(Session.class); - StateManager stateManager = builder.getInstance(StateManager.class); - Application application = builder.getInstance(Application.class); - I18nUITranslationService i18n = builder.getInstance(I18nUITranslationService.class); + final Session session = builder.getInstance(Session.class); + final StateManager stateManager = builder.getInstance(StateManager.class); + final Application application = builder.getInstance(Application.class); + final I18nUITranslationService i18n = builder.getInstance(I18nUITranslationService.class); platform.install(new DocsClientModule(session, stateManager, application.getWorkspace(), i18n)); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/PlatformClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/PlatformClientModule.java 2008-06-11 19:30:30 UTC (rev 778) +++ trunk/src/main/java/org/ourproject/kune/platf/client/PlatformClientModule.java 2008-06-11 20:19:21 UTC (rev 779) @@ -27,7 +27,7 @@ import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.state.StateManager; -import com.calclab.modular.client.container.Provider; +import com.calclab.suco.client.container.Provider; public class PlatformClientModule implements ClientModule { private final Provider<StateManager> stateManager; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/GotoAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/GotoAction.java 2008-06-11 19:30:30 UTC (rev 778) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/GotoAction.java 2008-06-11 20:19:21 UTC (rev 779) @@ -23,7 +23,7 @@ import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.state.StateManager; -import com.calclab.modular.client.container.Provider; +import com.calclab.suco.client.container.Provider; public class GotoAction implements Action<String> { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/GotoContainerAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/GotoContainerAction.java 2008-06-11 19:30:30 UTC (rev 778) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/GotoContainerAction.java 2008-06-11 20:19:21 UTC (rev 779) @@ -24,7 +24,7 @@ import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.state.StateManager; -import com.calclab.modular.client.container.Provider; +import com.calclab.suco.client.container.Provider; public class GotoContainerAction implements Action<Long> { @@ -41,7 +41,7 @@ } private void onGoto(final Long folderId) { - StateToken newStateToken = session.getCurrentState().getStateToken(); + final StateToken newStateToken = session.getCurrentState().getStateToken(); newStateToken.setDocument(null); newStateToken.setFolder(folderId.toString()); stateManager.get().setState(newStateToken); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/Kune.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/Kune.java 2008-06-11 19:30:30 UTC (rev 778) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/Kune.java 2008-06-11 20:19:21 UTC (rev 779) @@ -28,10 +28,10 @@ import org.ourproject.kune.workspace.client.workspace.Workspace; import com.calclab.emiteuimodule.client.EmiteUIDialog; -import com.calclab.modular.client.container.Container; -import com.calclab.modular.client.container.DelegatedContainer; -import com.calclab.modular.client.modules.Module; -import com.calclab.modular.client.modules.ModuleBuilder; +import com.calclab.suco.client.container.Container; +import com.calclab.suco.client.container.DelegatedContainer; +import com.calclab.suco.client.modules.Module; +import com.calclab.suco.client.modules.ModuleBuilder; public class Kune extends DelegatedContainer { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2008-06-11 19:30:30 UTC (rev 778) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2008-06-11 20:19:21 UTC (rev 779) @@ -18,10 +18,10 @@ import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; import org.ourproject.kune.workspace.client.sitebar.Site; -import com.calclab.modular.client.container.Provider; -import com.calclab.modular.client.modules.Module; -import com.calclab.modular.client.modules.ModuleBuilder; -import com.calclab.modular.client.scopes.SingletonScope; +import com.calclab.suco.client.container.Provider; +import com.calclab.suco.client.modules.Module; +import com.calclab.suco.client.modules.ModuleBuilder; +import com.calclab.suco.client.scopes.SingletonScope; import com.google.gwt.user.client.Cookies; import com.google.gwt.user.client.History; @@ -47,7 +47,7 @@ builder.registerProvider(I18nUITranslationService.class, new Provider<I18nUITranslationService>() { public I18nUITranslationService get() { - I18nUITranslationService translationService = new I18nUITranslationService(); + final I18nUITranslationService translationService = new I18nUITranslationService(); translationService.setCurrentLanguage(initialLang.getCode()); translationService.setLexicon(lexicon); return translationService; @@ -89,8 +89,9 @@ builder.registerProvider(Application.class, new Provider<Application>() { public Application get() { - Session session = builder.getInstance(Session.class); - ExtensibleWidgetsManager extensionPointManager = builder.getInstance(ExtensibleWidgetsManager.class); + final Session session = builder.getInstance(Session.class); + final ExtensibleWidgetsManager extensionPointManager = builder + .getInstance(ExtensibleWidgetsManager.class); return new ApplicationDefault(session, extensionPointManager, builder .getInstance(I18nUITranslationService.class), builder.getInstance(ColorTheme.class), builder .getInstance(KuneErrorHandler.class)); @@ -99,11 +100,11 @@ builder.registerProvider(StateManager.class, new Provider<StateManager>() { public StateManager get() { - Session session = builder.getInstance(Session.class); - ContentProviderImpl provider = new ContentProviderImpl(ContentService.App.getInstance()); + final Session session = builder.getInstance(Session.class); + final ContentProviderImpl provider = new ContentProviderImpl(ContentService.App.getInstance()); final HistoryWrapper historyWrapper = new HistoryWrapperImpl(); - Application application = builder.getInstance(Application.class); - StateManagerDefault stateManager = new StateManagerDefault(provider, application, session, + final Application application = builder.getInstance(Application.class); + final StateManagerDefault stateManager = new StateManagerDefault(provider, application, session, historyWrapper); History.addHistoryListener(stateManager); return stateManager;