kune-commits

Download

[email protected]

1587 discussions

27 Dec '11

Author: vjrj_ Date: 2011-12-27 02:32:05 +0100 (Tue, 27 Dec 2011) New Revision: 1648 Added: trunk/src/main/java/cc/kune/core/server/notifier/ trunk/src/main/java/cc/kune/core/server/notifier/NotifyService.java trunk/src/main/java/cc/kune/core/server/notifier/NotifyServiceDefault.java trunk/src/main/java/cc/kune/core/server/notifier/NotifyType.java trunk/src/main/java/cc/kune/core/server/notifier/UserOnlineSimpleManager.java trunk/src/main/java/cc/kune/core/server/notifier/UsersOnline.java trunk/src/main/java/cc/kune/core/server/scheduler/ trunk/src/main/java/cc/kune/core/server/scheduler/AbstractJob.java trunk/src/main/java/cc/kune/core/server/scheduler/CronServerTasksManager.java trunk/src/main/java/cc/kune/core/server/scheduler/DailyJob.java trunk/src/main/java/cc/kune/core/server/scheduler/HourlyJob.java trunk/src/main/java/cc/kune/core/server/testhelper/ trunk/src/main/java/cc/kune/core/server/testhelper/ctx/ trunk/src/main/java/cc/kune/core/shared/domain/dto/ trunk/src/main/java/cc/kune/core/shared/domain/dto/EmailNotificationFrequency.java trunk/src/main/java/cc/kune/wave/server/WaveEmailNotifier.java trunk/src/test/java/cc/kune/core/server/mail/ trunk/src/test/java/cc/kune/core/server/mail/MailServiceDefaultTest.java Removed: trunk/src/test/java/cc/kune/core/server/testhelper/ Modified: trunk/.classpath trunk/TODO trunk/pom.xml trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/PushButtonDescriptor.java trunk/src/main/java/cc/kune/core/server/KuneRackModule.java trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java trunk/src/main/java/cc/kune/core/server/UserSessionManager.java trunk/src/main/java/cc/kune/core/server/mail/MailService.java trunk/src/main/java/cc/kune/core/server/mail/MailServiceDefault.java trunk/src/main/java/cc/kune/core/server/properties/KuneBasicProperties.java trunk/src/main/java/cc/kune/core/server/rack/RackServletFilter.java trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java trunk/src/main/java/cc/kune/core/shared/dto/UserDTO.java trunk/src/main/java/cc/kune/domain/User.java trunk/src/main/java/cc/kune/events/client/actions/EventAddMenuItem.java trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java trunk/src/main/java/cc/kune/wave/server/KuneAgent.java trunk/src/main/java/cc/kune/wave/server/KuneWaveService.java trunk/src/main/java/cc/kune/wave/server/KuneWaveServiceDefault.java trunk/src/main/java/cc/kune/wave/server/ParticipantUtils.java trunk/src/main/resources/kune.properties Log: NEW - # 164: NotificationManager in server side http://kune.ourproject.org/issues/ticket/164 Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2011-12-21 23:32:22 UTC (rev 1647) +++ trunk/.classpath 2011-12-27 01:32:05 UTC (rev 1648) @@ -124,6 +124,7 @@ <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-msg/0.3.8/proto-msg-0.3.8.jar"/> + <classpathentry kind="var" path="M2_REPO/org/quartz-scheduler/quartz/2.1.0/quartz-2.1.0.jar" sourcepath="M2_REPO/org/quartz-scheduler/quartz/2.1.0/quartz-2.1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/w3c/css/sac/1.3/sac-1.3.jar" sourcepath="M2_REPO/org/w3c/css/sac/1.3/sac-1.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-android-driver/2.12.0/selenium-android-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-android-driver/2.12.0/selenium-android-driver-2.12.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-api/2.12.0/selenium-api-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-api/2.12.0/selenium-api-2.12.0-sources.jar"/> Modified: trunk/TODO =================================================================== --- trunk/TODO 2011-12-21 23:32:22 UTC (rev 1647) +++ trunk/TODO 2011-12-27 01:32:05 UTC (rev 1648) @@ -12,6 +12,13 @@ nick == assigned to * SHORT-TERM (URGENT) +** Emil notifications for new waves +Email Notifications +How often do you want to receive notifications? + almost immediately + at most hourly + at most daily + I don't need email notifications ** group.inexistentTool nasty error ** calendar support *** gwt-cal + http://ical4j.sourceforge.net/introduction.html Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-21 23:32:22 UTC (rev 1647) +++ trunk/pom.xml 2011-12-27 01:32:05 UTC (rev 1648) @@ -694,6 +694,11 @@ <artifactId>mail</artifactId> <version>1.4.4</version> </dependency> + <dependency> + <groupId>org.quartz-scheduler</groupId> + <artifactId>quartz</artifactId> + <version>2.1.0</version> + </dependency>  <dependency> <groupId>com.bradrydzewski</groupId> Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/PushButtonDescriptor.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/PushButtonDescriptor.java 2011-12-21 23:32:22 UTC (rev 1647) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/PushButtonDescriptor.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -20,34 +20,40 @@ package cc.kune.common.client.actions.ui.descrip; import cc.kune.common.client.actions.AbstractAction; +import cc.kune.common.client.actions.Action; public class PushButtonDescriptor extends ButtonDescriptor { - public static final String PUSHED = "pushed"; + public static final String PUSHED = "pushed"; - public PushButtonDescriptor(final AbstractAction action) { - super(action); - setPushedImpl(false); - } + public PushButtonDescriptor(final AbstractAction action) { + super(action); + setPushedImpl(false); + } - public PushButtonDescriptor(final PushButtonDescriptor button) { - this(button.getAction()); - } + public PushButtonDescriptor(final PushButtonDescriptor button) { + this(button.getAction()); + } - @Override - public Class<?> getType() { - return PushButtonDescriptor.class; - } + public PushButtonDescriptor(final String text, final AbstractAction action) { + this(action); + putValue(Action.NAME, text); + } - public boolean isPushed() { - return (Boolean) getValue(PUSHED); - } + @Override + public Class<?> getType() { + return PushButtonDescriptor.class; + } - public void setPushed(final boolean pushed) { - setPushedImpl(pushed); - } + public boolean isPushed() { + return (Boolean) getValue(PUSHED); + } - private void setPushedImpl(final boolean pushed) { - putValue(PUSHED, pushed); - } + public void setPushed(final boolean pushed) { + setPushedImpl(pushed); + } + + private void setPushedImpl(final boolean pushed) { + putValue(PUSHED, pushed); + } } Modified: trunk/src/main/java/cc/kune/core/server/KuneRackModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2011-12-21 23:32:22 UTC (rev 1647) +++ trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -115,7 +115,6 @@ install(FinderRegistry.init(jpaPersistModule)); bindInterceptor(Matchers.annotatedWith(LogThis.class), new NotInObject(), new LoggerMethodInterceptor()); - // bindConstant().annotatedWith(PropertiesFileName.class).to(kuneConfig); if (sessionScope != null) { bindScope(SessionScoped.class, sessionScope); } Modified: trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java 2011-12-21 23:32:22 UTC (rev 1647) +++ trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -86,6 +86,9 @@ import cc.kune.core.server.manager.impl.UserManagerDefault; import cc.kune.core.server.mapper.DozerMapper; import cc.kune.core.server.mapper.Mapper; +import cc.kune.core.server.notifier.NotifyService; +import cc.kune.core.server.notifier.NotifyServiceDefault; +import cc.kune.core.server.notifier.UsersOnline; import cc.kune.core.server.rpc.ContentRPC; import cc.kune.core.server.rpc.GroupRPC; import cc.kune.core.server.rpc.I18nRPC; @@ -93,6 +96,7 @@ import cc.kune.core.server.rpc.SocialNetworkRPC; import cc.kune.core.server.rpc.StatsRPC; import cc.kune.core.server.rpc.UserRPC; +import cc.kune.core.server.scheduler.CronServerTasksManager; import cc.kune.core.server.state.StateService; import cc.kune.core.server.state.StateServiceDefault; import cc.kune.core.server.stats.StatsService; @@ -109,7 +113,9 @@ import cc.kune.wave.server.KuneWaveService; import cc.kune.wave.server.KuneWaveServiceDefault; import cc.kune.wave.server.ParticipantUtils; +import cc.kune.wave.server.WaveEmailNotifier; +import com.google.inject.Singleton; import com.google.inject.matcher.Matchers; public class PlatformServerModule extends AbstractExtendedModule { @@ -186,7 +192,11 @@ bind(EntityLogoUploadManager.class); bind(EntityLogoDownloadManager.class); bind(ParticipantUtils.class); + bind(UsersOnline.class).to(UserSessionManager.class).in(Singleton.class); requestStaticInjection(AccessRightsUtils.class); + bind(CronServerTasksManager.class).in(Singleton.class); + bind(NotifyService.class).to(NotifyServiceDefault.class).in(Singleton.class); + bind(WaveEmailNotifier.class).in(Singleton.class); bindInterceptor(Matchers.any(), Matchers.annotatedWith(Authenticated.class), outermostCall(new AuthenticatedMethodInterceptor())); bindInterceptor(Matchers.any(), Matchers.annotatedWith(Authorizated.class), Modified: trunk/src/main/java/cc/kune/core/server/UserSessionManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/UserSessionManager.java 2011-12-21 23:32:22 UTC (rev 1647) +++ trunk/src/main/java/cc/kune/core/server/UserSessionManager.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -19,7 +19,11 @@ */ package cc.kune.core.server; +import java.util.HashSet; +import java.util.Set; + import cc.kune.core.server.manager.UserManager; +import cc.kune.core.server.notifier.UsersOnline; import cc.kune.domain.User; import com.google.inject.Inject; @@ -27,8 +31,9 @@ import com.google.inject.Singleton; @Singleton -public class UserSessionManager { +public class UserSessionManager implements UsersOnline { + private final Set<String> logins; private final UserManager manager; private final Provider<UserSession> userSessionProv; @@ -36,12 +41,25 @@ public UserSessionManager(final UserManager manager, final Provider<UserSession> userSessionProv) { this.manager = manager; this.userSessionProv = userSessionProv; + // For now the implementation of this can be very inaccurate (if we + // login/logout several times with different clients) and not scalable + // (stored in a MAP). Possible fix, to use jabber status + // More info: + // http://stackoverflow.com/questions/4592961/how-can-i-check-which-all-users-… + // + // Best way maybe it's accessing openfire db: + // http://www.mastertheboss.com/jboss-howto/45-jboss-persistence/110-jboss-per… + logins = new HashSet<String>(); } public String getHash() { return getUserSession().getHash(); } + private String getUserLoggedShortName() { + return getUser().getShortName(); + } + public User getUser() { return manager.find(getUserSession().getUserId()); } @@ -50,6 +68,11 @@ return userSessionProv.get(); } + @Override + public boolean isLogged(final String shortname) { + return logins.contains(shortname); + } + public boolean isUserLoggedIn() { return getUserSession().getUserId() != null; } @@ -61,10 +84,20 @@ public void login(final Long userId, final String newUserHash) { getUserSession().setUserId(userId); getUserSession().setHash(newUserHash); + updateLoggedUser(); } public void logout() { + if (isUserLoggedIn()) { + logins.remove(getUserLoggedShortName()); + } getUserSession().setUserId(null); getUserSession().setHash(null); } + + public void updateLoggedUser() { + if (isUserLoggedIn()) { + logins.add(getUserLoggedShortName()); + } + } } Modified: trunk/src/main/java/cc/kune/core/server/mail/MailService.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/mail/MailService.java 2011-12-21 23:32:22 UTC (rev 1647) +++ trunk/src/main/java/cc/kune/core/server/mail/MailService.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -30,10 +30,10 @@ * the email subject * @param body * the body of the email in html format - * @param to - * the recipient + * @param tos + * the recipients */ - void sendHtml(FormatedString subject, FormatedString body, String to); + void sendHtml(FormatedString subject, FormatedString body, String... tos); /** * Sends html email @@ -47,7 +47,7 @@ * @param tos * the recipients */ - void sendHtml(FormatedString subject, FormatedString body, String from, String... tos); + void sendHtml(String from, FormatedString subject, FormatedString body, String... tos); /** * @@ -57,10 +57,10 @@ * the email subject * @param body * the body of the email in text format - * @param to - * the recipient + * @param tos + * the recipients */ - void sendPlain(FormatedString subject, FormatedString body, String to); + void sendPlain(FormatedString subject, FormatedString body, String... tos); /** * Sends plain email @@ -74,6 +74,6 @@ * @param tos * the recipients */ - void sendPlain(FormatedString subject, FormatedString body, String from, String... tos); + void sendPlain(String from, FormatedString subject, FormatedString body, String... tos); } Modified: trunk/src/main/java/cc/kune/core/server/mail/MailServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/mail/MailServiceDefault.java 2011-12-21 23:32:22 UTC (rev 1647) +++ trunk/src/main/java/cc/kune/core/server/mail/MailServiceDefault.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -32,26 +32,55 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.server.LogThis; import cc.kune.core.server.properties.KuneProperties; +import com.google.common.base.Preconditions; import com.google.inject.Inject; import com.google.inject.Singleton; @Singleton +@LogThis public class MailServiceDefault implements MailService { public static class FormatedString { + public static FormatedString build(final String plainMsg) { + return new FormatedString(plainMsg); + } - private final String string; + public static FormatedString build(final String template, final Object... args) { + return new FormatedString(template, args); + } + private final Object[] args; + private String template; + + public FormatedString(final String plainMsg) { + template = plainMsg; + args = null; + } + public FormatedString(final String template, final Object... args) { - string = String.format(template, args); + this.template = template; + this.args = args; } public String getString() { - return string; + Preconditions.checkNotNull(template, "Template of FormatedString cannot be null"); + return args == null ? template : String.format(template, args); } + + public String getTemplate() { + return template; + } + + /* + * Used to translate the template to the user language (when you don't know + * already the language of the user) + */ + public void setTemplate(final String template) { + this.template = template; + } } Log log = LogFactory.getLog(MailServiceDefault.class); @@ -68,8 +97,8 @@ props.put("mail.smtp.host", smtpServer); } - private void send(final FormatedString subject, final FormatedString body, final boolean isHtml, - final String from, final String... tos) { + private void send(final String from, final FormatedString subject, final FormatedString body, + final boolean isHtml, final String... tos) { if (smtpSkip) { return; } @@ -79,47 +108,50 @@ // Define message final MimeMessage message = new MimeMessage(session); - try { - message.setFrom(new InternetAddress(from)); - for (final String to : tos) { + for (final String to : tos) { + try { + message.setFrom(new InternetAddress(from)); message.addRecipient(Message.RecipientType.TO, new InternetAddress(to)); + final String formatedSubject = subject.getString(); + message.setSubject(formatedSubject); + final String formatedBody = body.getString(); + if (isHtml) { + message.setContent(formatedBody, "text/html"); + } else { + message.setText(formatedBody); + } + // Send message + Transport.send(message); + } catch (final AddressException e) { + } catch (final MessagingException e) { + final String error = String.format( + "Error sendind an email to %s, with subject: %s, and body: %s", from, subject, to); + log.error(error, e); + // Better not to throw exceptions because users emails can be wrong... + // throw new DefaultException(error, e); } - final String formatedSubject = subject.getString(); - message.setSubject(formatedSubject); - final String formatedBody = body.getString(); - if (isHtml) { - message.setContent(formatedBody, "text/html"); - } else { - message.setText(formatedBody); - } - // Send message - Transport.send(message); - } catch (final AddressException e) { - } catch (final MessagingException e) { - log.error("Error sending the email", e); - throw new DefaultException("Error sending an email"); } } @Override - public void sendHtml(final FormatedString subject, final FormatedString body, final String to) { - send(subject, body, true, smtpDefaultFrom, to); + public void sendHtml(final FormatedString subject, final FormatedString body, final String... tos) { + send(smtpDefaultFrom, subject, body, true, tos); } @Override - public void sendHtml(final FormatedString subject, final FormatedString body, final String from, + public void sendHtml(final String from, final FormatedString subject, final FormatedString body, final String... tos) { - send(subject, body, true, from, tos); + send(from, subject, body, true, tos); } @Override - public void sendPlain(final FormatedString subject, final FormatedString body, final String to) { - send(subject, body, false, smtpDefaultFrom, to); + public void sendPlain(final FormatedString subject, final FormatedString body, final String... tos) { + send(smtpDefaultFrom, subject, body, false, tos); } @Override - public void sendPlain(final FormatedString subject, final FormatedString body, final String from, + public void sendPlain(final String from, final FormatedString subject, final FormatedString body, final String... tos) { - send(subject, body, false, from, tos); + send(from, subject, body, false, tos); } } Added: trunk/src/main/java/cc/kune/core/server/notifier/NotifyService.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/notifier/NotifyService.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/notifier/NotifyService.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -0,0 +1,45 @@ +package cc.kune.core.server.notifier; + +import cc.kune.core.server.mail.MailServiceDefault.FormatedString; + +/** + * The Interface NotifyService. + */ +public interface NotifyService { + + /** + * Send a message to the recipients (also translate the subject/body using the + * user language) + * + * @param notifyType + * the notify type (email, etc) + * @param subject + * the subject of the message (not translated) + * @param body + * the body of the message (not translated) but with %s + * {@link String.format} args + * @param isHtml + * if the body is html + * @param recipients + * the recipients shortnames (without domain) + */ + void send(NotifyType notifyType, FormatedString subject, FormatedString body, boolean isHtml, + String... recipients); + + /** + * Send a message to the recipients (also translate the subject/body using the + * user language) + * + * @param notifyType + * the notify type (email, etc) + * @param subject + * the subject of the message + * @param body + * the body of the message (no translated) but with some %s + * {@link String.format} args + * @param recipients + * the recipients shortnames (without domain) + */ + void send(NotifyType notifyType, FormatedString subject, FormatedString body, String... recipients); + +} Added: trunk/src/main/java/cc/kune/core/server/notifier/NotifyServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/notifier/NotifyServiceDefault.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/notifier/NotifyServiceDefault.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -0,0 +1,89 @@ +package cc.kune.core.server.notifier; + +import javax.persistence.NoResultException; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import cc.kune.core.server.mail.MailService; +import cc.kune.core.server.mail.MailServiceDefault.FormatedString; +import cc.kune.core.server.manager.I18nTranslationManager; +import cc.kune.core.server.manager.UserManager; +import cc.kune.core.server.xmpp.XmppManager; +import cc.kune.domain.User; +import cc.kune.wave.server.KuneWaveService; + +import com.google.inject.Inject; +import com.google.inject.Singleton; + +@Singleton +public class NotifyServiceDefault implements NotifyService { + public static final Log LOG = LogFactory.getLog(NotifyServiceDefault.class); + private final I18nTranslationManager i18n; + private final MailService mailService; + private final UserManager userManager; + private final KuneWaveService waveService; + private final XmppManager xmppManager; + + @Inject + public NotifyServiceDefault(final MailService mailService, final KuneWaveService waveService, + final XmppManager xmppManager, final UserManager userManager, final I18nTranslationManager i18n) { + this.mailService = mailService; + this.waveService = waveService; + this.xmppManager = xmppManager; + this.userManager = userManager; + this.i18n = i18n; + } + + @Override + public void send(final NotifyType notifyType, final FormatedString subject, final FormatedString body, + final boolean isHtml, final String... recipients) { + for (final String recipient : recipients) { + User user; + try { + user = userManager.findByShortname(recipient); + } catch (final NoResultException e) { + LOG.info(String.format("The recipient %s is not a local user, don't notify", recipient)); + continue; + } + // Translate per recipient language + final String subjectTranslation = i18n.getTranslation(user.getLanguage().getCode(), + subject.getTemplate(), ""); + if (subjectTranslation != null) { + subject.setTemplate(subjectTranslation); + } + final String bodyTranslation = i18n.getTranslation(user.getLanguage().getCode(), + body.getTemplate(), ""); + if (bodyTranslation != null) { + body.setTemplate(bodyTranslation); + } + switch (notifyType) { + case chat: + xmppManager.sendMessage(recipient, + String.format("%s%s", subject.getString(), body.getString())); + break; + case email: + final String email = user.getEmail(); + if (isHtml) { + mailService.sendHtml(subject, body, email); + } else { + mailService.sendPlain(subject, body, email); + } + break; + case wave: + if (isHtml) { + LOG.error("Wave html messages not supported yet"); + } + waveService.createWave(subject.getString(), body.getString(), recipient); + break; + } + } + } + + @Override + public void send(final NotifyType notifyType, final FormatedString subject, final FormatedString body, + final String... dests) { + send(notifyType, subject, body, false, dests); + } + +} Added: trunk/src/main/java/cc/kune/core/server/notifier/NotifyType.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/notifier/NotifyType.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/notifier/NotifyType.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -0,0 +1,9 @@ +package cc.kune.core.server.notifier; + +/** + * Type of notifications for users + * + */ +public enum NotifyType { + chat, email, wave +} Added: trunk/src/main/java/cc/kune/core/server/notifier/UserOnlineSimpleManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/notifier/UserOnlineSimpleManager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/notifier/UserOnlineSimpleManager.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -0,0 +1,5 @@ +package cc.kune.core.server.notifier; + +public class UserOnlineSimpleManager { + +} Added: trunk/src/main/java/cc/kune/core/server/notifier/UsersOnline.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/notifier/UsersOnline.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/notifier/UsersOnline.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -0,0 +1,16 @@ +package cc.kune.core.server.notifier; + +public interface UsersOnline { + + /** + * For now the implementation of this can be very inaccurate (if we + * login/logout several times with different clients) and not scalable (stored + * in a MAP). Possible fix, to use jabber status + * + * @param shortname + * of the user + * @return true if is logged + */ + boolean isLogged(String shortname); + +} Modified: trunk/src/main/java/cc/kune/core/server/properties/KuneBasicProperties.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/properties/KuneBasicProperties.java 2011-12-21 23:32:22 UTC (rev 1647) +++ trunk/src/main/java/cc/kune/core/server/properties/KuneBasicProperties.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -62,10 +62,25 @@ return properties.get(KuneProperties.SITE_SHORTNAME); } + /** + * Gets the site common name (can be something like "this foo site" not + * necessary a domain) + * + * @return the site common name + */ public String getSiteCommonName() { return properties.get(KuneProperties.SITE_COMMON_NAME); } + /** + * Gets the site domain (something like example.org) + * + * @return the site domain + */ + public String getSiteDomain() { + return properties.get(KuneProperties.SITE_DOMAIN); + } + public String getWelcomewave() { return properties.get(KuneProperties.WELCOME_WAVE); } Modified: trunk/src/main/java/cc/kune/core/server/rack/RackServletFilter.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rack/RackServletFilter.java 2011-12-21 23:32:22 UTC (rev 1647) +++ trunk/src/main/java/cc/kune/core/server/rack/RackServletFilter.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -32,11 +32,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.quartz.SchedulerException; import org.waveprotocol.box.server.rpc.ServerRpcProvider; import cc.kune.core.server.ServerException; import cc.kune.core.server.rack.dock.Dock; import cc.kune.core.server.rack.dock.RequestMatcher; +import cc.kune.core.server.scheduler.CronServerTasksManager; +import cc.kune.wave.server.WaveEmailNotifier; import com.google.inject.Injector; @@ -137,14 +140,18 @@ final RackBuilder builder = new RackBuilder(); module.configure(builder); rack = builder.getRack(); - // final WaveStarter waveStarter = new WaveStarter(); - // final Injector waveChildInjector = waveStarter.runMain(); injector = (Injector) filterConfig.getServletContext().getAttribute(INJECTOR_PARENT_ATTRIBUTE); final Injector kuneChildInjector = installInjector(filterConfig, rack, injector); startContainerListeners(rack.getListeners(), kuneChildInjector); docks = rack.getDocks(); excludes = rack.getExcludes(); initFilters(filterConfig); + kuneChildInjector.getInstance(WaveEmailNotifier.class); + try { + kuneChildInjector.getInstance(CronServerTasksManager.class).start(); + } catch (final SchedulerException e) { + LOG.error("Error starting cron scheduler", e); + } LOG.debug("INITIALIZATION DONE!"); } Modified: trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java 2011-12-21 23:32:22 UTC (rev 1647) +++ trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -162,16 +162,14 @@ @Transactional public void logout(final String userHash) throws DefaultException { userSessionManager.logout(); - // FIXME final SessionService sessionService = - // sessionServiceProvider.get(); - // FIXME sessionService.getNewSession(); } @Override @Authenticated(mandatory = false) @Transactional public void onlyCheckSession(final String userHash) throws DefaultException { - // Do nothing @Authenticated checks user session + // Do almost nothing @Authenticated checks user session + userSessionManager.updateLoggedUser(); } @Override @@ -179,6 +177,7 @@ @Transactional public UserInfoDTO reloadUserInfo(final String userHash) throws DefaultException { final User user = userSessionManager.getUser(); + userSessionManager.updateLoggedUser(); return loadUserInfo(user); } @@ -205,6 +204,7 @@ throw new AccessViolationException(); } final User userUpdated = userManager.update(id, user, lang); + userSessionManager.updateLoggedUser(); return contentRPC.getContent(userHash, userUpdated.getUserGroup().getStateToken()); } } Added: trunk/src/main/java/cc/kune/core/server/scheduler/AbstractJob.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/scheduler/AbstractJob.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/scheduler/AbstractJob.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -0,0 +1,26 @@ +package cc.kune.core.server.scheduler; + +import static org.quartz.CronScheduleBuilder.cronSchedule; +import static org.quartz.JobBuilder.newJob; +import static org.quartz.TriggerBuilder.newTrigger; + +import java.text.ParseException; + +import org.quartz.CronTrigger; +import org.quartz.Job; +import org.quartz.JobDetail; +import org.quartz.SchedulerException; + +public abstract class AbstractJob implements Job { + private static final String DEF_GROUP = "groupdef"; + + public AbstractJob(final CronServerTasksManager manager, final String cronExpression) + throws ParseException, SchedulerException { + final JobDetail job = newJob(HourlyJob.class).withIdentity("hourlyjob1", DEF_GROUP).build(); + + final CronTrigger trigger = newTrigger().withIdentity("hourlytrigger1", DEF_GROUP).withSchedule( + cronSchedule(cronExpression)).build(); + + manager.scheduleJob(job, trigger); + } +} Added: trunk/src/main/java/cc/kune/core/server/scheduler/CronServerTasksManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/scheduler/CronServerTasksManager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/scheduler/CronServerTasksManager.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -0,0 +1,34 @@ +package cc.kune.core.server.scheduler; + +import java.util.Date; + +import org.quartz.CronTrigger; +import org.quartz.JobDetail; +import org.quartz.Scheduler; +import org.quartz.SchedulerException; +import org.quartz.impl.StdSchedulerFactory; + +import com.google.inject.Inject; +import com.google.inject.Singleton; + +@Singleton +public class CronServerTasksManager { + private final Scheduler sched; + + @Inject + public CronServerTasksManager(final StdSchedulerFactory sf) throws SchedulerException { + sched = sf.getScheduler(); + } + + public Date scheduleJob(final JobDetail job, final CronTrigger trigger) throws SchedulerException { + return sched.scheduleJob(job, trigger); + } + + public void start() throws SchedulerException { + sched.start(); + } + + public void stop() throws SchedulerException { + sched.shutdown(true); + } +} Added: trunk/src/main/java/cc/kune/core/server/scheduler/DailyJob.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/scheduler/DailyJob.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/scheduler/DailyJob.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -0,0 +1,13 @@ +package cc.kune.core.server.scheduler; + +import java.text.ParseException; + +import org.quartz.SchedulerException; + +public abstract class DailyJob extends AbstractJob { + + public DailyJob(final CronServerTasksManager manager) throws ParseException, SchedulerException { + super(manager, "0 0 * * * ?"); + } + +} Added: trunk/src/main/java/cc/kune/core/server/scheduler/HourlyJob.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/scheduler/HourlyJob.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/scheduler/HourlyJob.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -0,0 +1,13 @@ +package cc.kune.core.server.scheduler; + +import java.text.ParseException; + +import org.quartz.SchedulerException; + +public abstract class HourlyJob extends AbstractJob { + + public HourlyJob(final CronServerTasksManager manager) throws ParseException, SchedulerException { + super(manager, "0 * * * * ?"); + } + +} Copied: trunk/src/main/java/cc/kune/core/server/testhelper/ctx (from rev 1647, trunk/src/test/java/cc/kune/core/server/testhelper/ctx) Added: trunk/src/main/java/cc/kune/core/shared/domain/dto/EmailNotificationFrequency.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/domain/dto/EmailNotificationFrequency.java (rev 0) +++ trunk/src/main/java/cc/kune/core/shared/domain/dto/EmailNotificationFrequency.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -0,0 +1,29 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.core.shared.domain.dto; + +import com.google.gwt.user.client.rpc.IsSerializable; + +public enum EmailNotificationFrequency implements IsSerializable { + daily, // at most daily, + hourly, // at most hourly + immediately, // almost immediately + no // I don't need email notifications +} Modified: trunk/src/main/java/cc/kune/core/shared/dto/UserDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/UserDTO.java 2011-12-21 23:32:22 UTC (rev 1647) +++ trunk/src/main/java/cc/kune/core/shared/dto/UserDTO.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -19,142 +19,153 @@ */ package cc.kune.core.shared.dto; +import cc.kune.core.shared.domain.dto.EmailNotificationFrequency; + import com.google.gwt.user.client.rpc.IsSerializable; public class UserDTO implements IsSerializable { - private Long id; - private String name; - private String shortName; - private I18nLanguageDTO language; - private I18nCountryDTO country; - private TimeZoneDTO timezone; - private String password; - private String email; - private String avatar; - private boolean publishRoster; - private SubscriptionMode subscriptionMode; - private String chatColor; + private String avatar; + private String chatColor; + private I18nCountryDTO country; + private String email; + private EmailNotificationFrequency emailNotifFreq; + private Long id; + private I18nLanguageDTO language; + private String name; + private String password; + private boolean publishRoster; + private String shortName; + private SubscriptionMode subscriptionMode; + private TimeZoneDTO timezone; - public UserDTO() { - this(null, null, null, null, null, null, null, null, true, null, null); - } + public UserDTO() { + this(null, null, null, null, null, null, null, null, true, null, null); + } - public UserDTO(final String shortName, final String name, final String password, final String email, - final I18nLanguageDTO language, final I18nCountryDTO country, final TimeZoneDTO timezone, - final String avatar, final boolean publishRoster, final SubscriptionMode subscriptionMode, - final String chatColor) { - this.name = name; - this.shortName = shortName; - this.password = password; - this.email = email; - this.language = language; - this.country = country; - this.timezone = timezone; - this.avatar = avatar; - this.publishRoster = publishRoster; - this.subscriptionMode = subscriptionMode; - this.chatColor = chatColor; - } + public UserDTO(final String shortName, final String name, final String password, final String email, + final I18nLanguageDTO language, final I18nCountryDTO country, final TimeZoneDTO timezone, + final String avatar, final boolean publishRoster, final SubscriptionMode subscriptionMode, + final String chatColor) { + this.name = name; + this.shortName = shortName; + this.password = password; + this.email = email; + this.language = language; + this.country = country; + this.timezone = timezone; + this.avatar = avatar; + this.publishRoster = publishRoster; + this.subscriptionMode = subscriptionMode; + this.chatColor = chatColor; + } - public String getAvatar() { - return avatar; - } + public String getAvatar() { + return avatar; + } - public String getChatColor() { - return chatColor; - } + public String getChatColor() { + return chatColor; + } - public I18nCountryDTO getCountry() { - return country; - } + public I18nCountryDTO getCountry() { + return country; + } - public String getEmail() { - return email; - } + public String getEmail() { + return email; + } - public Long getId() { - return id; - } + public EmailNotificationFrequency getEmailNotifFreq() { + return emailNotifFreq; + } - public I18nLanguageDTO getLanguage() { - return language; - } + public Long getId() { + return id; + } - public String getName() { - return name; - } + public I18nLanguageDTO getLanguage() { + return language; + } - public String getPassword() { - return password; - } + public String getName() { + return name; + } - public String getShortName() { - return shortName; - } + public String getPassword() { + return password; + } - public SubscriptionMode getSubscriptionMode() { - return subscriptionMode; - } + public String getShortName() { + return shortName; + } - public TimeZoneDTO getTimezone() { - return timezone; - } + public SubscriptionMode getSubscriptionMode() { + return subscriptionMode; + } - public boolean isPublishRoster() { - return publishRoster; - } + public TimeZoneDTO getTimezone() { + return timezone; + } - public void setAvatar(final String avatar) { - this.avatar = avatar; - } + public boolean isPublishRoster() { + return publishRoster; + } - public void setChatColor(final String chatColor) { - this.chatColor = chatColor; - } + public void setAvatar(final String avatar) { + this.avatar = avatar; + } - public void setCountry(final I18nCountryDTO country) { - this.country = country; - } + public void setChatColor(final String chatColor) { + this.chatColor = chatColor; + } - public void setEmail(final String email) { - this.email = email; - } + public void setCountry(final I18nCountryDTO country) { + this.country = country; + } - public void setId(final Long id) { - this.id = id; - } + public void setEmail(final String email) { + this.email = email; + } - public void setLanguage(final I18nLanguageDTO language) { - this.language = language; - } + public void setEmailNotifFreq(final EmailNotificationFrequency emailNotifFreq) { + this.emailNotifFreq = emailNotifFreq; + } - public void setName(final String name) { - this.name = name; - } + public void setId(final Long id) { + this.id = id; + } - public void setPassword(final String password) { - this.password = password; - } + public void setLanguage(final I18nLanguageDTO language) { + this.language = language; + } - public void setPublishRoster(final boolean publishRoster) { - this.publishRoster = publishRoster; - } + public void setName(final String name) { + this.name = name; + } - public void setShortName(final String shortName) { - this.shortName = shortName; - } + public void setPassword(final String password) { + this.password = password; + } - public void setSubscriptionMode(final SubscriptionMode subscriptionMode) { - this.subscriptionMode = subscriptionMode; - } + public void setPublishRoster(final boolean publishRoster) { + this.publishRoster = publishRoster; + } - public void setTimezone(final TimeZoneDTO timezone) { - this.timezone = timezone; - } + public void setShortName(final String shortName) { + this.shortName = shortName; + } - @Override - public String toString() { - return "UserDTO[" + shortName + "]"; - } + public void setSubscriptionMode(final SubscriptionMode subscriptionMode) { + this.subscriptionMode = subscriptionMode; + } + public void setTimezone(final TimeZoneDTO timezone) { + this.timezone = timezone; + } + + @Override + public String toString() { + return "UserDTO[" + shortName + "]"; + } + } Modified: trunk/src/main/java/cc/kune/domain/User.java =================================================================== --- trunk/src/main/java/cc/kune/domain/User.java 2011-12-21 23:32:22 UTC (rev 1647) +++ trunk/src/main/java/cc/kune/domain/User.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -46,6 +46,7 @@ import org.hibernate.validator.Pattern; import cc.kune.core.shared.domain.UserSNetVisibility; +import cc.kune.core.shared.domain.dto.EmailNotificationFrequency; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.utils.HasId; @@ -54,6 +55,8 @@ @Table(name = "kusers") public class User implements HasId { + private static final EmailNotificationFrequency DEF_EMAIL_FREQ = EmailNotificationFrequency.immediately; + // public static final String PROPS_ID = "userprops"; // see: http://docs.codehaus.org/display/PICO/Good+Citizen: // Never expect or return null @@ -80,14 +83,17 @@ @Length(min = 1) private String email; + @Enumerated(EnumType.STRING) + private EmailNotificationFrequency emailNotifFreq; + + // @OneToOne(cascade = CascadeType.REMOVE) + // private final CustomProperties customProperties; + @Id @DocumentId @GeneratedValue private Long id; - // @OneToOne(cascade = CascadeType.REMOVE) - // private final CustomProperties customProperties; - @ManyToOne @NotNull private I18nLanguage language; @@ -146,6 +152,7 @@ sNetVisibility = UserSNetVisibility.anyone; this.createdOn = System.currentTimeMillis(); this.lastLogin = null; + emailNotifFreq = DEF_EMAIL_FREQ; // this.properties = properties; } @@ -204,6 +211,10 @@ // return customProperties; // } + public EmailNotificationFrequency getEmailNotifFreq() { + return emailNotifFreq == null ? DEF_EMAIL_FREQ : emailNotifFreq; + } + public boolean getHasLogo() { return hasLogo(); } @@ -229,14 +240,14 @@ return password; } + // public Properties getProperties() { + // return properties; + // } + public byte[] getSalt() { return salt; } - // public Properties getProperties() { - // return properties; - // } - public String getShortName() { return shortName; } @@ -283,6 +294,10 @@ this.email = email; } + public void setEmailNotifFreq(final EmailNotificationFrequency emailNotifFreq) { + this.emailNotifFreq = emailNotifFreq; + } + @Override public void setId(final Long id) { this.id = id; Modified: trunk/src/main/java/cc/kune/events/client/actions/EventAddMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/EventAddMenuItem.java 2011-12-21 23:32:22 UTC (rev 1647) +++ trunk/src/main/java/cc/kune/events/client/actions/EventAddMenuItem.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -28,7 +28,7 @@ super(AccessRolDTO.Editor, true); this.i18n = i18n; this.calendar = calendar; - withText(i18n.t("Add a appointment")).withIcon(res.calendarAdd()); + withText(i18n.t("Add an appointment")).withIcon(res.calendarAdd()); } @Override Modified: trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java 2011-12-21 23:32:22 UTC (rev 1647) +++ trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -139,6 +139,7 @@ event.setCancelled(!editable); // event.setCancelled(true); NotifyUser.info("updated handler"); + hideMenu(); } }); getView().addOpenHandler(new OpenHandler<Appointment>() { @@ -194,7 +195,7 @@ getView().goToday(); } - private void hide() { + private void hideMenu() { onOverMenu.get().hide(); } Modified: trunk/src/main/java/cc/kune/wave/server/KuneAgent.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/KuneAgent.java 2011-12-21 23:32:22 UTC (rev 1647) +++ trunk/src/main/java/cc/kune/wave/server/KuneAgent.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -81,6 +81,12 @@ } @Override + public WaveRef createWave(final String title, final String message, final String... participantsArray) { + // TODO Auto-generated method stub + return null; + } + + @Override public WaveRef createWave(final String title, final String message, final String waveIdToCopy, final URL gadgetUrl, final ParticipantId... participantsArray) { // TODO Auto-generated method stub Modified: trunk/src/main/java/cc/kune/wave/server/KuneWaveService.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/KuneWaveService.java 2011-12-21 23:32:22 UTC (rev 1647) +++ trunk/src/main/java/cc/kune/wave/server/KuneWaveService.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -41,6 +41,8 @@ WaveRef createWave(String title, String message, ParticipantId... participantsArray); + WaveRef createWave(String title, String message, String... participantsArray); + WaveRef createWave(String title, String message, String waveIdToCopy, URL gadgetUrl, ParticipantId... participantsArray); Modified: trunk/src/main/java/cc/kune/wave/server/KuneWaveServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/KuneWaveServiceDefault.java 2011-12-21 23:32:22 UTC (rev 1647) +++ trunk/src/main/java/cc/kune/wave/server/KuneWaveServiceDefault.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -221,6 +221,11 @@ } @Override + public WaveRef createWave(final String title, final String message, final String... participantsArray) { + return createWave(title, message, participantUtils.listFrom(participantsArray)); + } + + @Override public WaveRef createWave(@Nonnull final String title, final String message, final String waveIdToCopy, final URL gadgetUrl, @Nonnull final ParticipantId... participantsArray) { String newWaveId = null; Modified: trunk/src/main/java/cc/kune/wave/server/ParticipantUtils.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/ParticipantUtils.java 2011-12-21 23:32:22 UTC (rev 1647) +++ trunk/src/main/java/cc/kune/wave/server/ParticipantUtils.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -37,6 +37,7 @@ @Singleton public class ParticipantUtils { + private String atDomain; private final String domain; private final ParticipantId superAdmin; @@ -47,10 +48,26 @@ superAdmin = ofImpl(databaseProperties.getAdminShortName()); } + public String getAddressName(final String address) { + return address.contains(ParticipantId.DOMAIN_PREFIX) ? address.split(ParticipantId.DOMAIN_PREFIX)[0] + : address; + } + + private String getAtDomain() { + if (atDomain == null) { + atDomain = ParticipantId.DOMAIN_PREFIX + domain; + } + return atDomain; + } + public ParticipantId getSuperAdmin() { return superAdmin; } + public boolean isLocal(final String address) { + return address.contains(getAtDomain()); + } + public ParticipantId[] listFrom(final Set<Group> list) { final ParticipantId[] array = new ParticipantId[list.size()]; final Iterator<Group> iterator = list.iterator(); @@ -60,6 +77,14 @@ return array; } + public ParticipantId[] listFrom(final String... list) { + final ParticipantId[] array = new ParticipantId[list.length]; + for (int i = 0; i < list.length; i++) { + array[i] = of(list[i]); + } + return array; + } + public ParticipantId of(final String username) { return ofImpl(username); } @@ -69,7 +94,7 @@ if (username.contains(ParticipantId.DOMAIN_PREFIX)) { return ParticipantId.of(username); } else { - return ParticipantId.of(username + ParticipantId.DOMAIN_PREFIX + domain); + return ParticipantId.of(username + getAtDomain()); } } catch (final InvalidParticipantAddress e) { throw new DefaultException("Error getting Wave participant Id"); Added: trunk/src/main/java/cc/kune/wave/server/WaveEmailNotifier.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/WaveEmailNotifier.java (rev 0) +++ trunk/src/main/java/cc/kune/wave/server/WaveEmailNotifier.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -0,0 +1,75 @@ +package cc.kune.wave.server; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.waveprotocol.box.common.DeltaSequence; +import org.waveprotocol.box.server.waveserver.WaveBus; +import org.waveprotocol.box.server.waveserver.WaveBus.Subscriber; +import org.waveprotocol.wave.model.id.IdUtil; +import org.waveprotocol.wave.model.id.WaveletId; +import org.waveprotocol.wave.model.id.WaveletName; +import org.waveprotocol.wave.model.operation.wave.AddParticipant; +import org.waveprotocol.wave.model.operation.wave.TransformedWaveletDelta; +import org.waveprotocol.wave.model.operation.wave.WaveletBlipOperation; +import org.waveprotocol.wave.model.operation.wave.WaveletOperation; +import org.waveprotocol.wave.model.version.HashedVersion; +import org.waveprotocol.wave.model.wave.ParticipantId; +import org.waveprotocol.wave.model.wave.data.ReadableWaveletData; +import org.waveprotocol.wave.model.waveref.WaveRef; + +import cc.kune.core.server.LogThis; +import cc.kune.core.server.mail.MailServiceDefault.FormatedString; +import cc.kune.core.server.notifier.NotifyService; +import cc.kune.core.server.notifier.NotifyType; +import cc.kune.core.server.notifier.UsersOnline; +import cc.kune.core.server.properties.KuneBasicProperties; + +import com.google.inject.Inject; + +@LogThis +public class WaveEmailNotifier { + public static final Log LOG = LogFactory.getLog(WaveEmailNotifier.class); + + @Inject + public WaveEmailNotifier(final WaveBus waveBus, final NotifyService notifyService, + final UsersOnline usersOnline, final KuneBasicProperties basicProperties, + final ParticipantUtils partUtils) { + waveBus.subscribe(new Subscriber() { + @Override + public void waveletCommitted(final WaveletName waveletName, final HashedVersion version) { + } + + @Override + public void waveletUpdate(final ReadableWaveletData wavelet, final DeltaSequence deltas) { + final WaveletId waveletId = wavelet.getWaveletId(); + if (IdUtil.isUserDataWavelet(waveletId)) { + return; + } + for (final TransformedWaveletDelta delta : deltas) { + for (final WaveletOperation op : delta) { + if (op instanceof AddParticipant) { + final ParticipantId user = ((AddParticipant) op).getParticipantId(); + final String url = KuneWaveUtils.getUrl(WaveRef.of(wavelet.getWaveId(), waveletId)); + final FormatedString body = FormatedString.build( + // FIXME when SSL/ssl support + "Hi there, You have a new message in %s. <a href=\"http://%s/#%s\">Read more</a>. ", + basicProperties.getSiteCommonName(), basicProperties.getSiteDomain(), url); + final String address = user.getAddress(); + if (partUtils.isLocal(address)) { + final String userName = partUtils.getAddressName(address); + if (!usersOnline.isLogged(userName)) { + notifyService.send(NotifyType.email, FormatedString.build("You have a new message"), + body, true, userName); + notifyService.send(NotifyType.chat, FormatedString.build("New message"), body, true, + userName); + } + } + } else if (op instanceof WaveletBlipOperation) { + + } + } + } + } + }); + } +} Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2011-12-21 23:32:22 UTC (rev 1647) +++ trunk/src/main/resources/kune.properties 2011-12-27 01:32:05 UTC (rev 1648) @@ -27,7 +27,7 @@ kune.site.smtp.host = localhost kune.site.smtp.defaultfrom = noreply@localhost # If we should avoid the use of smtp (use only for avoid emails during development) -kune.site.smtp.skip = true +kune.site.smtp.skip = false ### Database Added: trunk/src/test/java/cc/kune/core/server/mail/MailServiceDefaultTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/mail/MailServiceDefaultTest.java (rev 0) +++ trunk/src/test/java/cc/kune/core/server/mail/MailServiceDefaultTest.java 2011-12-27 01:32:05 UTC (rev 1648) @@ -0,0 +1,43 @@ +package cc.kune.core.server.mail; + +import static org.junit.Assert.assertEquals; + +import org.junit.Before; +import org.junit.Test; + +import cc.kune.core.server.mail.MailServiceDefault.FormatedString; +import cc.kune.core.server.properties.KunePropertiesDefault; + +public class MailServiceDefaultTest { + + private MailServiceDefault service; + + @Test(expected = NullPointerException.class) + public void basicException() { + assertEquals(null, FormatedString.build(null).getString()); + } + + @Test(expected = NullPointerException.class) + public void basicExceptionWithArgs() { + assertEquals(null, FormatedString.build(null).getString()); + assertEquals(null, FormatedString.build(null, "arg").getString()); + } + + @Test + public void basicFormat() { + assertEquals("basic", FormatedString.build("basic").getString()); + assertEquals("basic arg", FormatedString.build("basic %s", "arg").getString()); + assertEquals("basic %s", FormatedString.build("basic %s", null).getString()); + } + + @Before + public void before() { + service = new MailServiceDefault(new KunePropertiesDefault("kune.properties")); + } + + @Test + public void simpleTest() { + service.sendPlain(FormatedString.build("Some test subject"), FormatedString.build("Some body"), + "vjrj@localhost"); + } +}

1 0

r1647 - in trunk: script src/main/java/cc/kune/events/client/actions src/main/java/cc/kune/events/client/viewer
by Vicente J. Ruiz Jurado 21 Dec '11

21 Dec '11

Author: vjrj_ Date: 2011-12-22 00:32:22 +0100 (Thu, 22 Dec 2011) New Revision: 1647 Added: trunk/script/make-release-tar.sh trunk/src/main/java/cc/kune/events/client/actions/EventAddMenuItem.java trunk/src/main/java/cc/kune/events/client/actions/EventEditMenuItem.java trunk/src/main/java/cc/kune/events/client/actions/EventRemoveMenuItem.java Removed: trunk/src/main/java/cc/kune/events/client/viewer/EventAddMenuItem.java trunk/src/main/java/cc/kune/events/client/viewer/EventEditMenuItem.java trunk/src/main/java/cc/kune/events/client/viewer/EventRemoveMenuItem.java Modified: trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPanel.java trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java Log: Calendar GUI updated Added: trunk/script/make-release-tar.sh =================================================================== --- trunk/script/make-release-tar.sh (rev 0) +++ trunk/script/make-release-tar.sh 2011-12-21 23:32:22 UTC (rev 1647) @@ -0,0 +1,6 @@ +# mkdir temp temp/etc tmp/bin +target/../ws/ bin/server.sh +wget 'http://ourproject.org/plugins/scmsvn/viewcvs.php/*checkout*/trunk/src/main/…' -O jaas.config +wget 'http://ourproject.org/plugins/scmsvn/viewcvs.php/*checkout*/trunk/src/main/…' -O kune.properties +wget 'http://ourproject.org/plugins/scmsvn/viewcvs.php/*checkout*/trunk/src/main/…' -O wave-server.properties +tar Copied: trunk/src/main/java/cc/kune/events/client/actions/EventAddMenuItem.java (from rev 1646, trunk/src/main/java/cc/kune/events/client/viewer/EventAddMenuItem.java) =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/EventAddMenuItem.java (rev 0) +++ trunk/src/main/java/cc/kune/events/client/actions/EventAddMenuItem.java 2011-12-21 23:32:22 UTC (rev 1647) @@ -0,0 +1,74 @@ +package cc.kune.events.client.actions; + +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.client.ui.dialogs.PromptTopDialog; +import cc.kune.common.client.ui.dialogs.PromptTopDialog.Builder; +import cc.kune.common.shared.i18n.I18nTranslationService; +import cc.kune.core.client.actions.RolAction; +import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.shared.dto.AccessRolDTO; +import cc.kune.events.client.viewer.CalendarViewer; + +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class EventAddMenuItem extends MenuItemDescriptor { + public static class EventAddAction extends RolAction { + private final Provider<CalendarViewer> calendar; + private PromptTopDialog dialog; + private final I18nTranslationService i18n; + + @Inject + public EventAddAction(final NavResources res, final I18nTranslationService i18n, + final Provider<CalendarViewer> calendar) { + super(AccessRolDTO.Editor, true); + this.i18n = i18n; + this.calendar = calendar; + withText(i18n.t("Add a appointment")).withIcon(res.calendarAdd()); + } + + @Override + public void actionPerformed(final ActionEvent event) { + if (dialog == null) { + final Builder builder = new PromptTopDialog.Builder(CREATE_APP_ID, + i18n.t("Description of the appointment"), true, true, i18n.getDirection()); + builder.firstButtonTitle(i18n.t("Add")).firstButtonId(CREATE_APP_ADD_ID); + builder.sndButtonTitle(i18n.t("Cancel")).sndButtonId(CREATE_APP_CANCEL_ID); + dialog = builder.build(); + dialog.getFirstBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + if (dialog.isValid()) { + calendar.get().addAppointment(dialog.getTextFieldValue(), calendar.get().getOnOverDate()); + NotifyUser.info("Appointment added but not yet saved (this is under development)"); + dialog.hide(); + } + } + }); + dialog.getSecondBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + dialog.hide(); + } + }); + } + dialog.clearTextFieldValue(); + dialog.showCentered(); + dialog.focusOnTextBox(); + } + } + + public static final String CREATE_APP_ADD_ID = "event-add-menu-item-add-btn"; + public static final String CREATE_APP_CANCEL_ID = "event-add-menu-item-add-btn"; + public static final String CREATE_APP_ID = "event-add-menu-item-form"; + + @Inject + public EventAddMenuItem(final EventAddAction action, final CalendarOnOverMenu cal) { + super(action); + setParent(cal.get()); + } +} Copied: trunk/src/main/java/cc/kune/events/client/actions/EventEditMenuItem.java (from rev 1646, trunk/src/main/java/cc/kune/events/client/viewer/EventEditMenuItem.java) =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/EventEditMenuItem.java (rev 0) +++ trunk/src/main/java/cc/kune/events/client/actions/EventEditMenuItem.java 2011-12-21 23:32:22 UTC (rev 1647) @@ -0,0 +1,53 @@ +package cc.kune.events.client.actions; + +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.client.ui.dialogs.PromptTopDialog; +import cc.kune.common.client.utils.TextUtils; +import cc.kune.common.shared.i18n.I18nTranslationService; +import cc.kune.core.client.actions.RolAction; +import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.shared.dto.AccessRolDTO; +import cc.kune.events.client.viewer.CalendarStateChangeEvent; +import cc.kune.events.client.viewer.CalendarViewer; + +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class EventEditMenuItem extends MenuItemDescriptor { + public static class EventEditAction extends RolAction { + private final Provider<CalendarViewer> calendar; + private PromptTopDialog dialog; + private final I18nTranslationService i18n; + + @Inject + public EventEditAction(final NavResources res, final I18nTranslationService i18n, + final Provider<CalendarViewer> calendar, final EventBus eventBus) { + super(AccessRolDTO.Administrator, true); + this.i18n = i18n; + this.calendar = calendar; + withText(i18n.t("Edit the appointment")).withIcon(res.go()); + eventBus.addHandler(CalendarStateChangeEvent.getType(), + new CalendarStateChangeEvent.CalendarStateChangeHandler() { + @Override + public void onCalendarStateChange(final CalendarStateChangeEvent event) { + // if the calendar is not selecting a appointment don't show this + setEnabled(!calendar.get().getAppToEdit().equals(CalendarViewer.NO_APPOINT)); + } + }); + } + + @Override + public void actionPerformed(final ActionEvent event) { + NotifyUser.info(i18n.t(TextUtils.IN_DEVELOPMENT)); + } + } + + @Inject + public EventEditMenuItem(final EventEditAction action, final CalendarOnOverMenu cal) { + super(action); + setParent(cal.get()); + } +} Copied: trunk/src/main/java/cc/kune/events/client/actions/EventRemoveMenuItem.java (from rev 1646, trunk/src/main/java/cc/kune/events/client/viewer/EventRemoveMenuItem.java) =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/EventRemoveMenuItem.java (rev 0) +++ trunk/src/main/java/cc/kune/events/client/actions/EventRemoveMenuItem.java 2011-12-21 23:32:22 UTC (rev 1647) @@ -0,0 +1,56 @@ +package cc.kune.events.client.actions; + +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.client.ui.dialogs.PromptTopDialog; +import cc.kune.common.client.utils.TextUtils; +import cc.kune.common.shared.i18n.I18nTranslationService; +import cc.kune.core.client.actions.RolAction; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.shared.dto.AccessRolDTO; +import cc.kune.events.client.viewer.CalendarStateChangeEvent; +import cc.kune.events.client.viewer.CalendarViewer; + +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class EventRemoveMenuItem extends MenuItemDescriptor { + public static class EventEditAction extends RolAction { + private final Provider<CalendarViewer> calendar; + private PromptTopDialog dialog; + private final I18nTranslationService i18n; + + @Inject + public EventEditAction(final CoreResources res, final I18nTranslationService i18n, + final Provider<CalendarViewer> calendar, final EventBus eventBus) { + super(AccessRolDTO.Editor, true); + this.i18n = i18n; + this.calendar = calendar; + withText(i18n.t("Remove this appointment")).withIcon(res.cancel()); + eventBus.addHandler(CalendarStateChangeEvent.getType(), + new CalendarStateChangeEvent.CalendarStateChangeHandler() { + @Override + public void onCalendarStateChange(final CalendarStateChangeEvent event) { + setEnabled(!calendar.get().getAppToEdit().equals(CalendarViewer.NO_APPOINT)); + } + }); + } + + @Override + public void actionPerformed(final ActionEvent event) { + NotifyUser.info(i18n.t(TextUtils.IN_DEVELOPMENT)); + } + } + + public static final String CREATE_APP_ADD_ID = "event-add-menu-item-add-btn"; + public static final String CREATE_APP_CANCEL_ID = "event-add-menu-item-add-btn"; + public static final String CREATE_APP_ID = "event-add-menu-item-form"; + + @Inject + public EventRemoveMenuItem(final EventEditAction action, final CalendarOnOverMenu cal) { + super(action); + setParent(cal.get()); + } +} Modified: trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java 2011-12-21 17:45:17 UTC (rev 1646) +++ trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java 2011-12-21 23:32:22 UTC (rev 1647) @@ -26,8 +26,6 @@ import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.events.client.viewer.EventAddMenuItem; -import cc.kune.events.client.viewer.EventEditMenuItem; import cc.kune.gspace.client.actions.AbstractFoldableToolActions; import cc.kune.gspace.client.actions.ActionGroups; import cc.kune.gspace.client.actions.ContentViewerOptionsMenu; @@ -56,6 +54,7 @@ final Provider<Calendar7DaysViewSelectBtn> cal7DaysBtn, final Provider<CalendarMonthViewSelectBtn> calMonthBtn, final Provider<EventAddMenuItem> eventAddMenuItem, + final Provider<EventRemoveMenuItem> eventRemoveMenuItem, final Provider<EventEditMenuItem> eventEditMenuItem, final Provider<CalendarGoPrevBtn> calPrevBtn, final Provider<CalendarGoNextBtn> calNextBtn, final CalendarOnOverMenu onOverMenu, final Provider<CalendarGoTodayBtn> goToday, final Provider<RefreshContentMenuItem> refresh) { @@ -74,6 +73,7 @@ actionsRegistry.addAction(ActionGroups.TOOLBAR, onOverMenu, containers); eventAddMenuItem.get(); eventEditMenuItem.get(); + eventRemoveMenuItem.get(); // For now, commented: // actionsRegistry.addAction(ActionGroups.TOOLBAR, newMeetingsBtn, Modified: trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPanel.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPanel.java 2011-12-21 17:45:17 UTC (rev 1646) +++ trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPanel.java 2011-12-21 23:32:22 UTC (rev 1647) @@ -24,6 +24,7 @@ import com.bradrydzewski.gwt.calendar.client.event.MouseOverHandler; import com.bradrydzewski.gwt.calendar.client.event.TimeBlockClickHandler; import com.bradrydzewski.gwt.calendar.client.event.UpdateHandler; +import com.google.gwt.dom.client.NativeEvent; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.DoubleClickHandler; @@ -32,12 +33,16 @@ import com.google.gwt.event.shared.GwtEvent; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.Event; +import com.google.gwt.user.client.Event.NativePreviewEvent; +import com.google.gwt.user.client.Event.NativePreviewHandler; import com.google.inject.Inject; import com.google.inject.Provider; public class CalendarViewerPanel extends AbstractFolderViewerPanel implements CalendarViewerView { private final Calendar calendar; + private int clientX; + private int clientY; @Inject public CalendarViewerPanel(final GSpaceArmor gsArmor, final I18nTranslationService i18n, @@ -46,12 +51,21 @@ final Provider<FolderViewerDropController> dropControllerProv) { super(gsArmor, i18n, capabilitiesRegistry, dragController, dropControllerProv); calendar = new Calendar(); - // calendar.setWidth("auto"); - // calendar.setHeight("auto"); widget = calendar; calendar.sinkEvents(Event.ONMOUSEDOWN | Event.ONDBLCLICK | Event.KEYEVENTS | Event.ONMOUSEOVER | Event.ONCLICK); - + Event.addNativePreviewHandler(new NativePreviewHandler() { + @Override + public void onPreviewNativeEvent(final NativePreviewEvent eventPrev) { + // We store click position in onder to show the menu + final NativeEvent natEvent = eventPrev.getNativeEvent(); + if (Event.getTypeInt(natEvent.getType()) != Event.ONCLICK) { + clientX = natEvent.getClientX(); + clientY = natEvent.getClientY(); + return; + } + } + }); } @Override @@ -149,6 +163,16 @@ } @Override + public int getClientX() { + return clientX; + } + + @Override + public int getClientY() { + return clientY; + } + + @Override public Date getDate() { return calendar.getDate(); } Modified: trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java 2011-12-21 17:45:17 UTC (rev 1646) +++ trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java 2011-12-21 23:32:22 UTC (rev 1647) @@ -6,7 +6,9 @@ import cc.kune.common.client.actions.ui.descrip.Position; import cc.kune.common.client.notify.NotifyUser; -import cc.kune.common.client.tooltip.Tooltip; +import cc.kune.common.shared.i18n.I18nTranslationService; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.HasContent; import cc.kune.events.client.actions.CalendarOnOverMenu; import cc.kune.gspace.client.viewers.AbstractFolderViewerView; @@ -28,7 +30,6 @@ import com.bradrydzewski.gwt.calendar.client.event.TimeBlockClickHandler; import com.bradrydzewski.gwt.calendar.client.event.UpdateEvent; import com.bradrydzewski.gwt.calendar.client.event.UpdateHandler; -import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.logical.shared.HasOpenHandlers; import com.google.gwt.event.logical.shared.HasSelectionHandlers; @@ -38,7 +39,6 @@ import com.google.gwt.event.logical.shared.SelectionHandler; import com.google.gwt.event.shared.EventBus; import com.google.gwt.event.shared.HandlerRegistration; -import com.google.gwt.user.client.ui.Widget; import com.google.gwt.user.datepicker.client.CalendarUtil; import com.google.inject.Inject; import com.gwtplatform.mvp.client.Presenter; @@ -65,6 +65,10 @@ HandlerRegistration addCreateHandler(CreateHandler<Appointment> handler); + int getClientX(); + + int getClientY(); + Date getDate(); void goToday(); @@ -74,7 +78,6 @@ void setView(CalendarViews view); void setView(CalendarViews view, int days); - } private static final CalendarViews DEF_VIEW = CalendarViews.DAY; @@ -83,16 +86,23 @@ private CalendarViews currentCalView; private int currentDaysView = 7; private final FolderViewerUtils folderViewerUtils; + private final I18nTranslationService i18n; private Date onOverDate; private final CalendarOnOverMenu onOverMenu; + private final Session session; + private final StateManager stateManager; @Inject public CalendarViewerPresenter(final EventBus eventBus, final CalendarViewerView view, final CalendarViewerProxy proxy, final FolderViewerUtils folderViewerUtils, - final CalendarOnOverMenu onOverMenu) { + final CalendarOnOverMenu onOverMenu, final Session session, final StateManager stateManager, + final I18nTranslationService i18n) { super(eventBus, view, proxy); this.folderViewerUtils = folderViewerUtils; this.onOverMenu = onOverMenu; + this.session = session; + this.stateManager = stateManager; + this.i18n = i18n; addListeners(); setViewImpl(DEF_VIEW, currentDaysView); } @@ -113,30 +123,21 @@ showMenu(); } }); - getView().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - setMenuPosition(event.getClientX(), event.getClientY()); - } - - }); getView().addMouseOverHandler(new MouseOverHandler<Appointment>() { @Override public void onMouseOver(final MouseOverEvent<Appointment> event) { - NotifyUser.info("on mouse over"); - // final Element element = (Element) event.getElement(); - // showMenu(element.getAbsoluteLeft() + 10, element.getAbsoluteTop() + - // 10); - Tooltip.to((Widget) event.getElement(), "kk"); - // final Tooltip tooltip = new Tooltip(); - // tooltip.setText("lalala"); - // tooltip.setPopupPosition(, currentDaysView) - // tooltip.showRelativeTo((UIObject) event.getElement()); + // NotifyUser.info("on mouse over"); } }); getView().addUpdateHandler(new UpdateHandler<Appointment>() { @Override public void onUpdate(final UpdateEvent<Appointment> event) { + final boolean editable = session.getCurrentState().getGroupRights().isEditable(); + if (!editable) { + NotifyUser.error(i18n.t("Only members can update events")); + } + event.setCancelled(!editable); + // event.setCancelled(true); NotifyUser.info("updated handler"); } }); @@ -154,7 +155,6 @@ NotifyUser.info("on selection"); updateMenuItems(); showMenu(); - // getView().removeAppointment(event.getSelectedItem()); } }); } @@ -194,6 +194,10 @@ getView().goToday(); } + private void hide() { + onOverMenu.get().hide(); + } + @Override public void increment() { incrementDate(true); @@ -255,6 +259,7 @@ } private void showMenu() { + setMenuPosition(getView().getClientX(), getView().getClientY()); onOverMenu.get().show(); } Deleted: trunk/src/main/java/cc/kune/events/client/viewer/EventAddMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/viewer/EventAddMenuItem.java 2011-12-21 17:45:17 UTC (rev 1646) +++ trunk/src/main/java/cc/kune/events/client/viewer/EventAddMenuItem.java 2011-12-21 23:32:22 UTC (rev 1647) @@ -1,74 +0,0 @@ -package cc.kune.events.client.viewer; - -import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; -import cc.kune.common.client.notify.NotifyUser; -import cc.kune.common.client.ui.dialogs.PromptTopDialog; -import cc.kune.common.client.ui.dialogs.PromptTopDialog.Builder; -import cc.kune.common.shared.i18n.I18nTranslationService; -import cc.kune.core.client.actions.RolAction; -import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.events.client.actions.CalendarOnOverMenu; - -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.inject.Inject; -import com.google.inject.Provider; - -public class EventAddMenuItem extends MenuItemDescriptor { - public static class EventAddAction extends RolAction { - private final Provider<CalendarViewer> calendar; - private PromptTopDialog dialog; - private final I18nTranslationService i18n; - - @Inject - public EventAddAction(final NavResources res, final I18nTranslationService i18n, - final Provider<CalendarViewer> calendar) { - super(AccessRolDTO.Editor, true); - this.i18n = i18n; - this.calendar = calendar; - withText(i18n.t("Add a appointment")).withIcon(res.calendarAdd()); - } - - @Override - public void actionPerformed(final ActionEvent event) { - if (dialog == null) { - final Builder builder = new PromptTopDialog.Builder(CREATE_APP_ID, - i18n.t("Description of the appointment"), true, true, i18n.getDirection()); - builder.firstButtonTitle(i18n.t("Add")).firstButtonId(CREATE_APP_ADD_ID); - builder.sndButtonTitle(i18n.t("Cancel")).sndButtonId(CREATE_APP_CANCEL_ID); - dialog = builder.build(); - dialog.getFirstBtn().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - if (dialog.isValid()) { - calendar.get().addAppointment(dialog.getTextFieldValue(), calendar.get().getOnOverDate()); - NotifyUser.info("Appointment added but not yet saved (this is under development)"); - dialog.hide(); - } - } - }); - dialog.getSecondBtn().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - dialog.hide(); - } - }); - } - dialog.clearTextFieldValue(); - dialog.showCentered(); - dialog.focusOnTextBox(); - } - } - - public static final String CREATE_APP_ADD_ID = "event-add-menu-item-add-btn"; - public static final String CREATE_APP_CANCEL_ID = "event-add-menu-item-add-btn"; - public static final String CREATE_APP_ID = "event-add-menu-item-form"; - - @Inject - public EventAddMenuItem(final EventAddAction action, final CalendarOnOverMenu cal) { - super(action); - setParent(cal.get()); - } -} Deleted: trunk/src/main/java/cc/kune/events/client/viewer/EventEditMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/viewer/EventEditMenuItem.java 2011-12-21 17:45:17 UTC (rev 1646) +++ trunk/src/main/java/cc/kune/events/client/viewer/EventEditMenuItem.java 2011-12-21 23:32:22 UTC (rev 1647) @@ -1,48 +0,0 @@ -package cc.kune.events.client.viewer; - -import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; -import cc.kune.common.client.ui.dialogs.PromptTopDialog; -import cc.kune.common.shared.i18n.I18nTranslationService; -import cc.kune.core.client.actions.RolAction; -import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.events.client.actions.CalendarOnOverMenu; - -import com.google.gwt.event.shared.EventBus; -import com.google.inject.Inject; -import com.google.inject.Provider; - -public class EventEditMenuItem extends MenuItemDescriptor { - public static class EventEditAction extends RolAction { - private final Provider<CalendarViewer> calendar; - private PromptTopDialog dialog; - private final I18nTranslationService i18n; - - @Inject - public EventEditAction(final NavResources res, final I18nTranslationService i18n, - final Provider<CalendarViewer> calendar, final EventBus eventBus) { - super(AccessRolDTO.Administrator, true); - this.i18n = i18n; - this.calendar = calendar; - withText(i18n.t("Edit the appointment")).withIcon(res.calendarAdd()); - eventBus.addHandler(CalendarStateChangeEvent.getType(), - new CalendarStateChangeEvent.CalendarStateChangeHandler() { - @Override - public void onCalendarStateChange(final CalendarStateChangeEvent event) { - setEnabled(!calendar.get().getAppToEdit().equals(CalendarViewer.NO_APPOINT)); - } - }); - } - - @Override - public void actionPerformed(final ActionEvent event) { - } - } - - @Inject - public EventEditMenuItem(final EventEditAction action, final CalendarOnOverMenu cal) { - super(action); - setParent(cal.get()); - } -} Deleted: trunk/src/main/java/cc/kune/events/client/viewer/EventRemoveMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/viewer/EventRemoveMenuItem.java 2011-12-21 17:45:17 UTC (rev 1646) +++ trunk/src/main/java/cc/kune/events/client/viewer/EventRemoveMenuItem.java 2011-12-21 23:32:22 UTC (rev 1647) @@ -1,83 +0,0 @@ -package cc.kune.events.client.viewer; - -import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; -import cc.kune.common.client.notify.NotifyUser; -import cc.kune.common.client.ui.dialogs.PromptTopDialog; -import cc.kune.common.client.ui.dialogs.PromptTopDialog.Builder; -import cc.kune.common.shared.i18n.I18nTranslationService; -import cc.kune.core.client.actions.RolAction; -import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.events.client.actions.CalendarOnOverMenu; - -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.event.shared.EventBus; -import com.google.inject.Inject; -import com.google.inject.Provider; - -public class EventRemoveMenuItem extends MenuItemDescriptor { - public static class EventEditAction extends RolAction { - private final Provider<CalendarViewer> calendar; - private PromptTopDialog dialog; - private final I18nTranslationService i18n; - - @Inject - public EventEditAction(final NavResources res, final I18nTranslationService i18n, - final Provider<CalendarViewer> calendar, final EventBus eventBus) { - super(AccessRolDTO.Editor, true); - this.i18n = i18n; - this.calendar = calendar; - withText(i18n.t("Edit the appointment")).withIcon(res.calendarAdd()); - eventBus.addHandler(CalendarStateChangeEvent.getType(), - new CalendarStateChangeEvent.CalendarStateChangeHandler() { - - @Override - public void onCalendarStateChange(final CalendarStateChangeEvent event) { - setEnabled(!calendar.get().getAppToEdit().equals(CalendarViewer.NO_APPOINT)); - } - }); - } - - @Override - public void actionPerformed(final ActionEvent event) { - if (dialog == null) { - final Builder builder = new PromptTopDialog.Builder(CREATE_APP_ID, - i18n.t("Description of the appointment"), true, true, i18n.getDirection()); - builder.firstButtonTitle(i18n.t("Add")).firstButtonId(CREATE_APP_ADD_ID); - builder.sndButtonTitle(i18n.t("Cancel")).sndButtonId(CREATE_APP_CANCEL_ID); - dialog = builder.build(); - dialog.getFirstBtn().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - if (dialog.isValid()) { - calendar.get().addAppointment(dialog.getTextFieldValue(), calendar.get().getOnOverDate()); - NotifyUser.info("Appointment should be edited (this is under development)"); - dialog.hide(); - } - } - }); - dialog.getSecondBtn().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - dialog.hide(); - } - }); - } - dialog.clearTextFieldValue(); - dialog.showCentered(); - dialog.focusOnTextBox(); - } - } - - public static final String CREATE_APP_ADD_ID = "event-add-menu-item-add-btn"; - public static final String CREATE_APP_CANCEL_ID = "event-add-menu-item-add-btn"; - public static final String CREATE_APP_ID = "event-add-menu-item-form"; - - @Inject - public EventRemoveMenuItem(final EventEditAction action, final CalendarOnOverMenu cal) { - super(action); - setParent(cal.get()); - } -}

1 0

r1646 - in trunk/src/main/java/cc/kune: common/client/actions/ui/descrip events/client/viewer
by Vicente J. Ruiz Jurado 21 Dec '11

21 Dec '11

Author: vjrj_ Date: 2011-12-21 18:45:17 +0100 (Wed, 21 Dec 2011) New Revision: 1646 Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuDescriptor.java trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java Log: calendar updated Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuDescriptor.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuDescriptor.java 2011-12-21 16:48:51 UTC (rev 1645) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuDescriptor.java 2011-12-21 17:45:17 UTC (rev 1646) @@ -98,6 +98,10 @@ return (Boolean) super.getValue(MENU_STANDALONE); } + public void setMenuPosition(final Position position) { + putValue(MENU_SHOW_NEAR_TO, position); + } + public void setRightIcon(final ImageResource icon) { putValue(MENU_RIGHTICON, icon); } @@ -118,6 +122,13 @@ } /** + * Show the menu (remember to set the menu position before) + */ + public void show() { + putValue(MENU_SHOW, !((Boolean) getValue(MENU_SHOW))); + } + + /** * Show the menu near the Element object specified * * @param object @@ -125,7 +136,7 @@ */ public void show(final Object object) { putValue(MENU_SHOW_NEAR_TO, object); - putValue(MENU_SHOW, !((Boolean) getValue(MENU_SHOW))); + show(); } /** @@ -135,8 +146,8 @@ * the position to show menu near of it */ public void show(final Position position) { - putValue(MENU_SHOW_NEAR_TO, position); - putValue(MENU_SHOW, !((Boolean) getValue(MENU_SHOW))); + setMenuPosition(position); + show(); } /** @@ -147,6 +158,6 @@ */ public void show(final String id) { putValue(MENU_SHOW_NEAR_TO, id); - putValue(MENU_SHOW, !((Boolean) getValue(MENU_SHOW))); + show(); } } Modified: trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java 2011-12-21 16:48:51 UTC (rev 1645) +++ trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java 2011-12-21 17:45:17 UTC (rev 1646) @@ -6,6 +6,7 @@ import cc.kune.common.client.actions.ui.descrip.Position; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.client.tooltip.Tooltip; import cc.kune.core.shared.dto.HasContent; import cc.kune.events.client.actions.CalendarOnOverMenu; import cc.kune.gspace.client.viewers.AbstractFolderViewerView; @@ -37,6 +38,7 @@ import com.google.gwt.event.logical.shared.SelectionHandler; import com.google.gwt.event.shared.EventBus; import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.user.client.ui.Widget; import com.google.gwt.user.datepicker.client.CalendarUtil; import com.google.inject.Inject; import com.gwtplatform.mvp.client.Presenter; @@ -108,19 +110,24 @@ appToEdit = NO_APPOINT; onOverDate = event.getTarget(); updateMenuItems(); + showMenu(); } }); getView().addClickHandler(new ClickHandler() { @Override public void onClick(final ClickEvent event) { - onOverMenu.get().show(new Position(event.getClientX(), event.getClientY())); + setMenuPosition(event.getClientX(), event.getClientY()); } + }); getView().addMouseOverHandler(new MouseOverHandler<Appointment>() { @Override public void onMouseOver(final MouseOverEvent<Appointment> event) { NotifyUser.info("on mouse over"); - // Tooltip.to((Widget) event.getSource(), "kk"); + // final Element element = (Element) event.getElement(); + // showMenu(element.getAbsoluteLeft() + 10, element.getAbsoluteTop() + + // 10); + Tooltip.to((Widget) event.getElement(), "kk"); // final Tooltip tooltip = new Tooltip(); // tooltip.setText("lalala"); // tooltip.setPopupPosition(, currentDaysView) @@ -146,6 +153,7 @@ onOverDate = event.getSelectedItem().getStart(); NotifyUser.info("on selection"); updateMenuItems(); + showMenu(); // getView().removeAppointment(event.getSelectedItem()); } }); @@ -220,6 +228,10 @@ getView().setDate(date); } + private void setMenuPosition(final int x, final int y) { + onOverMenu.get().setMenuPosition(new Position(x, y)); + } + @Override public void setView(final CalendarViews calView) { setViewImpl(calView); @@ -242,6 +254,10 @@ getView().setView(calView, days); } + private void showMenu() { + onOverMenu.get().show(); + } + private void updateMenuItems() { CalendarStateChangeEvent.fire(getEventBus()); }

1 0

r1645 - in trunk: . src/main/java/cc/kune/common/client/actions src/main/java/cc/kune/common/client/ui/dialogs src/main/java/cc/kune/common/client/utils src/main/java/cc/kune/events/client src/main/java/cc/kune/events/client/actions src/main/java/cc/kune/events/client/viewer src/main/java/cc/kune/gspace/client/actions
by Vicente J. Ruiz Jurado 21 Dec '11

21 Dec '11

Author: vjrj_ Date: 2011-12-21 17:48:51 +0100 (Wed, 21 Dec 2011) New Revision: 1645 Added: trunk/src/main/java/cc/kune/events/client/actions/CalendarOnOverMenu.java trunk/src/main/java/cc/kune/events/client/viewer/CalendarStateChangeEvent.java trunk/src/main/java/cc/kune/events/client/viewer/EventAddMenuItem.java trunk/src/main/java/cc/kune/events/client/viewer/EventEditMenuItem.java trunk/src/main/java/cc/kune/events/client/viewer/EventRemoveMenuItem.java trunk/src/main/java/cc/kune/gspace/client/actions/AbstractEditorsMenu.java trunk/src/main/java/cc/kune/gspace/client/actions/AbstractStandaloneMenu.java trunk/src/main/java/cc/kune/gspace/client/actions/StandaloneMenuProvider.java Modified: trunk/pom.xml trunk/src/main/java/cc/kune/common/client/actions/AbstractExtendedAction.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/PromptTopDialog.java trunk/src/main/java/cc/kune/common/client/utils/WindowUtils.java trunk/src/main/java/cc/kune/events/client/EventsGinModule.java trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewer.java trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPanel.java trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java trunk/src/main/java/cc/kune/gspace/client/actions/AbstractNewMenu.java Log: Calendar tool updated Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-21 09:41:22 UTC (rev 1644) +++ trunk/pom.xml 2011-12-21 16:48:51 UTC (rev 1645) @@ -917,26 +917,29 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <configuration> + <descriptors> + <descriptor>src/main/resources/assembly.xml</descriptor> + </descriptors> <archive> <manifest> <mainClass>cc.kune.wave.server.WaveMain</mainClass> </manifest> </archive> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> + + + <dependencySets> <dependencySet> <outputDirectory>/</outputDirectory> <scope>runtime</scope> <unpackOptions> - <excludes> -  - <exclude>**/gxt/**</exclude> - <exclude>**/extjs/**</exclude> - <exclude>**extjs**</exclude> - <exclude>**gxt**</exclude> - </excludes> + + + + + + + <includes> <include>${basedir}/target/kune-0.1.0-SNAPSHOT/ws/**</include> <include>${basedir}/src/main/webapp/**</include> Modified: trunk/src/main/java/cc/kune/common/client/actions/AbstractExtendedAction.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/AbstractExtendedAction.java 2011-12-21 09:41:22 UTC (rev 1644) +++ trunk/src/main/java/cc/kune/common/client/actions/AbstractExtendedAction.java 2011-12-21 16:48:51 UTC (rev 1645) @@ -22,45 +22,45 @@ import com.google.gwt.resources.client.ImageResource; public abstract class AbstractExtendedAction extends AbstractAction { - public static final String NO_ICON = null; - public static final String NO_TEXT = null; + public static final String NO_ICON = null; + public static final String NO_TEXT = null; - public AbstractExtendedAction() { - super(); - } + public AbstractExtendedAction() { + super(); + } - public AbstractExtendedAction(final String text) { - this(text, null, null); - } + public AbstractExtendedAction(final String text) { + this(text, null, null); + } - public AbstractExtendedAction(final String text, final String iconCls) { - this(text, null, iconCls); - } + public AbstractExtendedAction(final String text, final String iconCls) { + this(text, null, iconCls); + } - public AbstractExtendedAction(final String text, final String tooltip, final String iconCls) { - super(); - super.putValue(Action.NAME, text); - super.putValue(Action.TOOLTIP, tooltip); - super.putValue(Action.SMALL_ICON, iconCls); - } + public AbstractExtendedAction(final String text, final String tooltip, final String iconCls) { + super(); + super.putValue(Action.NAME, text); + super.putValue(Action.TOOLTIP, tooltip); + super.putValue(Action.SMALL_ICON, iconCls); + } - public AbstractExtendedAction withIcon(final ImageResource icon) { - super.putValue(Action.TOOLTIP, icon); - return this; - } + public AbstractExtendedAction withIcon(final ImageResource icon) { + super.putValue(Action.SMALL_ICON, icon); + return this; + } - public AbstractExtendedAction withIconCls(final String icon) { - super.putValue(Action.TOOLTIP, icon); - return this; - } + public AbstractExtendedAction withIconCls(final String icon) { + super.putValue(Action.TOOLTIP, icon); + return this; + } - public AbstractExtendedAction withText(final String text) { - super.putValue(Action.NAME, text); - return this; - } + public AbstractExtendedAction withText(final String text) { + super.putValue(Action.NAME, text); + return this; + } - public AbstractExtendedAction withToolTip(final String tooltip) { - super.putValue(Action.TOOLTIP, tooltip); - return this; - } + public AbstractExtendedAction withToolTip(final String tooltip) { + super.putValue(Action.TOOLTIP, tooltip); + return this; + } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/PromptTopDialog.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/PromptTopDialog.java 2011-12-21 09:41:22 UTC (rev 1644) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/PromptTopDialog.java 2011-12-21 16:48:51 UTC (rev 1645) @@ -125,6 +125,10 @@ super.getInnerPanel().add(textField); } + public void clearTextFieldValue() { + textField.reset(); + } + public void focusOnTextBox() { textField.focus(); } Modified: trunk/src/main/java/cc/kune/common/client/utils/WindowUtils.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/utils/WindowUtils.java 2011-12-21 09:41:22 UTC (rev 1644) +++ trunk/src/main/java/cc/kune/common/client/utils/WindowUtils.java 2011-12-21 16:48:51 UTC (rev 1645) @@ -15,51 +15,52 @@ */ package cc.kune.common.client.utils; + public class WindowUtils { - public static Location getLocation() { - Location result = new Location(); - result.setHash(getHash()); - result.setHost(getHost()); - result.setHostName(getHostName()); - result.setHref(getHref()); - result.setPath(getPath()); - result.setPort(getPort()); - result.setProtocol(getProtocol()); - result.setQueryString(getQueryString()); - return result; - } + private static native String getHash() /*-{ + return $wnd.location.hash; + }-*/; - private static native String getHash() /*-{ - return $wnd.location.hash; - }-*/; + private static native String getHost() /*-{ + return $wnd.location.host; + }-*/; - private static native String getHost() /*-{ - return $wnd.location.host; - }-*/; + private static native String getHostName() /*-{ + return $wnd.location.hostname; + }-*/; - private static native String getHostName() /*-{ - return $wnd.location.hostname; - }-*/; + private static native String getHref() /*-{ + return $wnd.location.href; + }-*/; - private static native String getHref() /*-{ - return $wnd.location.href; - }-*/; + public static Location getLocation() { + final Location result = new Location(); + result.setHash(getHash()); + result.setHost(getHost()); + result.setHostName(getHostName()); + result.setHref(getHref()); + result.setPath(getPath()); + result.setPort(getPort()); + result.setProtocol(getProtocol()); + result.setQueryString(getQueryString()); + return result; + } - private static native String getPath() /*-{ - return $wnd.location.pathname; - }-*/; + private static native String getPath() /*-{ + return $wnd.location.pathname; + }-*/; - private static native String getPort() /*-{ - return $wnd.location.port; - }-*/; + private static native String getPort() /*-{ + return $wnd.location.port; + }-*/; - private static native String getProtocol() /*-{ - return $wnd.location.protocol; - }-*/; + private static native String getProtocol() /*-{ + return $wnd.location.protocol; + }-*/; - private static native String getQueryString() /*-{ - return $wnd.location.search; - }-*/; + private static native String getQueryString() /*-{ + return $wnd.location.search; + }-*/; } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/events/client/EventsGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/EventsGinModule.java 2011-12-21 09:41:22 UTC (rev 1644) +++ trunk/src/main/java/cc/kune/events/client/EventsGinModule.java 2011-12-21 16:48:51 UTC (rev 1645) @@ -27,6 +27,7 @@ import cc.kune.events.client.actions.CalendarGoPrevBtn; import cc.kune.events.client.actions.CalendarGoTodayBtn; import cc.kune.events.client.actions.CalendarMonthViewSelectBtn; +import cc.kune.events.client.actions.CalendarOnOverMenu; import cc.kune.events.client.actions.EventsClientActions; import cc.kune.events.client.viewer.CalendarViewer; import cc.kune.events.client.viewer.CalendarViewerPanel; @@ -47,6 +48,7 @@ s(CalendarGoPrevBtn.class); s(CalendarGoNextBtn.class); s(CalendarGoTodayBtn.class); + s(CalendarOnOverMenu.class); bindPresenter(CalendarViewerPresenter.class, CalendarViewerPresenter.CalendarViewerView.class, CalendarViewerPanel.class, CalendarViewerPresenter.CalendarViewerProxy.class); bind(CalendarViewer.class).to(CalendarViewerPresenter.class).in(Singleton.class); Added: trunk/src/main/java/cc/kune/events/client/actions/CalendarOnOverMenu.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/CalendarOnOverMenu.java (rev 0) +++ trunk/src/main/java/cc/kune/events/client/actions/CalendarOnOverMenu.java 2011-12-21 16:48:51 UTC (rev 1645) @@ -0,0 +1,14 @@ +package cc.kune.events.client.actions; + +import cc.kune.gspace.client.actions.AbstractStandaloneMenu; +import cc.kune.gspace.client.actions.StandaloneMenuProvider; + +import com.google.inject.Inject; + +public class CalendarOnOverMenu extends StandaloneMenuProvider { + + @Inject + public CalendarOnOverMenu(final AbstractStandaloneMenu menu) { + super(menu); + } +} Modified: trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java 2011-12-21 09:41:22 UTC (rev 1644) +++ trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java 2011-12-21 16:48:51 UTC (rev 1645) @@ -26,6 +26,8 @@ import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.events.client.viewer.EventAddMenuItem; +import cc.kune.events.client.viewer.EventEditMenuItem; import cc.kune.gspace.client.actions.AbstractFoldableToolActions; import cc.kune.gspace.client.actions.ActionGroups; import cc.kune.gspace.client.actions.ContentViewerOptionsMenu; @@ -53,7 +55,9 @@ final Provider<Calendar3DaysViewSelectBtn> cal3DaysBtn, final Provider<Calendar7DaysViewSelectBtn> cal7DaysBtn, final Provider<CalendarMonthViewSelectBtn> calMonthBtn, - final Provider<CalendarGoPrevBtn> calPrevBtn, final Provider<CalendarGoNextBtn> calNextBtn, + final Provider<EventAddMenuItem> eventAddMenuItem, + final Provider<EventEditMenuItem> eventEditMenuItem, final Provider<CalendarGoPrevBtn> calPrevBtn, + final Provider<CalendarGoNextBtn> calNextBtn, final CalendarOnOverMenu onOverMenu, final Provider<CalendarGoTodayBtn> goToday, final Provider<RefreshContentMenuItem> refresh) { super(session, stateManager, i18n, registry); actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContent, all); @@ -66,6 +70,11 @@ actionsRegistry.addAction(ActionGroups.TOOLBAR, calMonthBtn, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, calNextBtn, containers); + // On over calendar menu + actionsRegistry.addAction(ActionGroups.TOOLBAR, onOverMenu, containers); + eventAddMenuItem.get(); + eventEditMenuItem.get(); + // For now, commented: // actionsRegistry.addAction(ActionGroups.TOOLBAR, newMeetingsBtn, // containers); Added: trunk/src/main/java/cc/kune/events/client/viewer/CalendarStateChangeEvent.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/viewer/CalendarStateChangeEvent.java (rev 0) +++ trunk/src/main/java/cc/kune/events/client/viewer/CalendarStateChangeEvent.java 2011-12-21 16:48:51 UTC (rev 1645) @@ -0,0 +1,56 @@ +package cc.kune.events.client.viewer; + +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 CalendarStateChangeEvent extends + GwtEvent<CalendarStateChangeEvent.CalendarStateChangeHandler> { + + public interface CalendarStateChangeHandler extends EventHandler { + public void onCalendarStateChange(CalendarStateChangeEvent event); + } + + public interface HasCalendarStateChangeHandlers extends HasHandlers { + HandlerRegistration addCalendarStateChangeHandler(CalendarStateChangeHandler handler); + } + + private static final Type<CalendarStateChangeHandler> TYPE = new Type<CalendarStateChangeHandler>(); + + public static void fire(final HasHandlers source) { + source.fireEvent(new CalendarStateChangeEvent()); + } + + public static Type<CalendarStateChangeHandler> getType() { + return TYPE; + } + + public CalendarStateChangeEvent() { + } + + @Override + protected void dispatch(final CalendarStateChangeHandler handler) { + handler.onCalendarStateChange(this); + } + + @Override + public boolean equals(final Object obj) { + return super.equals(obj); + } + + @Override + public Type<CalendarStateChangeHandler> getAssociatedType() { + return TYPE; + } + + @Override + public int hashCode() { + return super.hashCode(); + } + + @Override + public String toString() { + return "CalendarStateChangeEvent[" + "]"; + } +} Modified: trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewer.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewer.java 2011-12-21 09:41:22 UTC (rev 1644) +++ trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewer.java 2011-12-21 16:48:51 UTC (rev 1645) @@ -4,13 +4,30 @@ import cc.kune.gspace.client.tool.ContentViewer; +import com.bradrydzewski.gwt.calendar.client.Appointment; import com.bradrydzewski.gwt.calendar.client.CalendarViews; public interface CalendarViewer extends ContentViewer { + public static final Appointment NO_APPOINT = new Appointment(); + + void addAppointment(String description, Date onDate); + void decrement(); + /** + * Gets the current Appointment that can be edit. + * + * @return the appointment to edit + */ + Appointment getAppToEdit(); + Date getDate(); + /** + * @return if you click on the calendar, this get the date you clicked + */ + Date getOnOverDate(); + void goToday(); void increment(); Modified: trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPanel.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPanel.java 2011-12-21 09:41:22 UTC (rev 1644) +++ trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPanel.java 2011-12-21 16:48:51 UTC (rev 1645) @@ -24,12 +24,14 @@ import com.bradrydzewski.gwt.calendar.client.event.MouseOverHandler; import com.bradrydzewski.gwt.calendar.client.event.TimeBlockClickHandler; import com.bradrydzewski.gwt.calendar.client.event.UpdateHandler; +import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.DoubleClickHandler; import com.google.gwt.event.logical.shared.OpenHandler; import com.google.gwt.event.logical.shared.SelectionHandler; import com.google.gwt.event.shared.GwtEvent; import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.user.client.Event; import com.google.inject.Inject; import com.google.inject.Provider; @@ -47,6 +49,9 @@ // calendar.setWidth("auto"); // calendar.setHeight("auto"); widget = calendar; + calendar.sinkEvents(Event.ONMOUSEDOWN | Event.ONDBLCLICK | Event.KEYEVENTS | Event.ONMOUSEOVER + | Event.ONCLICK); + } @Override @@ -72,6 +77,11 @@ } @Override + public HandlerRegistration addClickHandler(final ClickHandler clickHandler) { + return calendar.addHandler(clickHandler, ClickEvent.getType()); + } + + @Override public HandlerRegistration addCreateHandler(final CreateHandler<Appointment> handler) { return calendar.addCreateHandler(handler); } Modified: trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java 2011-12-21 09:41:22 UTC (rev 1644) +++ trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java 2011-12-21 16:48:51 UTC (rev 1645) @@ -4,11 +4,10 @@ import javax.annotation.Nonnull; +import cc.kune.common.client.actions.ui.descrip.Position; import cc.kune.common.client.notify.NotifyUser; -import cc.kune.common.client.tooltip.Tooltip; -import cc.kune.common.client.utils.SimpleResponseCallback; -import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.shared.dto.HasContent; +import cc.kune.events.client.actions.CalendarOnOverMenu; import cc.kune.gspace.client.viewers.AbstractFolderViewerView; import cc.kune.gspace.client.viewers.FolderViewerUtils; @@ -28,6 +27,8 @@ import com.bradrydzewski.gwt.calendar.client.event.TimeBlockClickHandler; import com.bradrydzewski.gwt.calendar.client.event.UpdateEvent; import com.bradrydzewski.gwt.calendar.client.event.UpdateHandler; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.logical.shared.HasOpenHandlers; import com.google.gwt.event.logical.shared.HasSelectionHandlers; import com.google.gwt.event.logical.shared.OpenEvent; @@ -36,7 +37,6 @@ import com.google.gwt.event.logical.shared.SelectionHandler; import com.google.gwt.event.shared.EventBus; import com.google.gwt.event.shared.HandlerRegistration; -import com.google.gwt.user.client.ui.Widget; import com.google.gwt.user.datepicker.client.CalendarUtil; import com.google.inject.Inject; import com.gwtplatform.mvp.client.Presenter; @@ -59,6 +59,8 @@ void addAppointment(String title, Date date); + HandlerRegistration addClickHandler(ClickHandler clickHandler); + HandlerRegistration addCreateHandler(CreateHandler<Appointment> handler); Date getDate(); @@ -74,45 +76,51 @@ } private static final CalendarViews DEF_VIEW = CalendarViews.DAY; + public Appointment appToEdit = NO_APPOINT; + private CalendarViews currentCalView; private int currentDaysView = 7; private final FolderViewerUtils folderViewerUtils; - private final I18nTranslationService i18n; + private Date onOverDate; + private final CalendarOnOverMenu onOverMenu; @Inject public CalendarViewerPresenter(final EventBus eventBus, final CalendarViewerView view, final CalendarViewerProxy proxy, final FolderViewerUtils folderViewerUtils, - final I18nTranslationService i18n) { + final CalendarOnOverMenu onOverMenu) { super(eventBus, view, proxy); this.folderViewerUtils = folderViewerUtils; - this.i18n = i18n; + this.onOverMenu = onOverMenu; addListeners(); setViewImpl(DEF_VIEW, currentDaysView); } + @Override + public void addAppointment(final String description, final Date onDate) { + getView().addAppointment(description, onDate); + } + private void addListeners() { getView().addTimeBlockClickHandler(new TimeBlockClickHandler<Date>() { @Override public void onTimeBlockClick(final TimeBlockClickEvent<Date> event) { - NotifyUser.askConfirmation(i18n.t("Confirm, please"), i18n.t("Add a new appointment?"), - new SimpleResponseCallback() { - @Override - public void onCancel() { - // do nothing - } - - @Override - public void onSuccess() { - getView().addAppointment("Only a test", event.getTarget()); - NotifyUser.info("Appointment added but not yet saved (this is under development)"); - } - }); + NotifyUser.info("on time block"); + appToEdit = NO_APPOINT; + onOverDate = event.getTarget(); + updateMenuItems(); } }); + getView().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + onOverMenu.get().show(new Position(event.getClientX(), event.getClientY())); + } + }); getView().addMouseOverHandler(new MouseOverHandler<Appointment>() { @Override public void onMouseOver(final MouseOverEvent<Appointment> event) { - Tooltip.to((Widget) event.getSource(), "kk"); + NotifyUser.info("on mouse over"); + // Tooltip.to((Widget) event.getSource(), "kk"); // final Tooltip tooltip = new Tooltip(); // tooltip.setText("lalala"); // tooltip.setPopupPosition(, currentDaysView) @@ -134,7 +142,10 @@ getView().addSelectionHandler(new SelectionHandler<Appointment>() { @Override public void onSelection(final SelectionEvent<Appointment> event) { + appToEdit = event.getSelectedItem(); + onOverDate = event.getSelectedItem().getStart(); NotifyUser.info("on selection"); + updateMenuItems(); // getView().removeAppointment(event.getSelectedItem()); } }); @@ -156,11 +167,21 @@ } @Override + public Appointment getAppToEdit() { + return appToEdit; + } + + @Override public Date getDate() { return getView().getDate(); } @Override + public Date getOnOverDate() { + return onOverDate; + } + + @Override public void goToday() { getView().goToday(); } @@ -220,4 +241,8 @@ this.currentDaysView = days; getView().setView(calView, days); } + + private void updateMenuItems() { + CalendarStateChangeEvent.fire(getEventBus()); + } } Added: trunk/src/main/java/cc/kune/events/client/viewer/EventAddMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/viewer/EventAddMenuItem.java (rev 0) +++ trunk/src/main/java/cc/kune/events/client/viewer/EventAddMenuItem.java 2011-12-21 16:48:51 UTC (rev 1645) @@ -0,0 +1,74 @@ +package cc.kune.events.client.viewer; + +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.client.ui.dialogs.PromptTopDialog; +import cc.kune.common.client.ui.dialogs.PromptTopDialog.Builder; +import cc.kune.common.shared.i18n.I18nTranslationService; +import cc.kune.core.client.actions.RolAction; +import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.shared.dto.AccessRolDTO; +import cc.kune.events.client.actions.CalendarOnOverMenu; + +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class EventAddMenuItem extends MenuItemDescriptor { + public static class EventAddAction extends RolAction { + private final Provider<CalendarViewer> calendar; + private PromptTopDialog dialog; + private final I18nTranslationService i18n; + + @Inject + public EventAddAction(final NavResources res, final I18nTranslationService i18n, + final Provider<CalendarViewer> calendar) { + super(AccessRolDTO.Editor, true); + this.i18n = i18n; + this.calendar = calendar; + withText(i18n.t("Add a appointment")).withIcon(res.calendarAdd()); + } + + @Override + public void actionPerformed(final ActionEvent event) { + if (dialog == null) { + final Builder builder = new PromptTopDialog.Builder(CREATE_APP_ID, + i18n.t("Description of the appointment"), true, true, i18n.getDirection()); + builder.firstButtonTitle(i18n.t("Add")).firstButtonId(CREATE_APP_ADD_ID); + builder.sndButtonTitle(i18n.t("Cancel")).sndButtonId(CREATE_APP_CANCEL_ID); + dialog = builder.build(); + dialog.getFirstBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + if (dialog.isValid()) { + calendar.get().addAppointment(dialog.getTextFieldValue(), calendar.get().getOnOverDate()); + NotifyUser.info("Appointment added but not yet saved (this is under development)"); + dialog.hide(); + } + } + }); + dialog.getSecondBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + dialog.hide(); + } + }); + } + dialog.clearTextFieldValue(); + dialog.showCentered(); + dialog.focusOnTextBox(); + } + } + + public static final String CREATE_APP_ADD_ID = "event-add-menu-item-add-btn"; + public static final String CREATE_APP_CANCEL_ID = "event-add-menu-item-add-btn"; + public static final String CREATE_APP_ID = "event-add-menu-item-form"; + + @Inject + public EventAddMenuItem(final EventAddAction action, final CalendarOnOverMenu cal) { + super(action); + setParent(cal.get()); + } +} Added: trunk/src/main/java/cc/kune/events/client/viewer/EventEditMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/viewer/EventEditMenuItem.java (rev 0) +++ trunk/src/main/java/cc/kune/events/client/viewer/EventEditMenuItem.java 2011-12-21 16:48:51 UTC (rev 1645) @@ -0,0 +1,48 @@ +package cc.kune.events.client.viewer; + +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.client.ui.dialogs.PromptTopDialog; +import cc.kune.common.shared.i18n.I18nTranslationService; +import cc.kune.core.client.actions.RolAction; +import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.shared.dto.AccessRolDTO; +import cc.kune.events.client.actions.CalendarOnOverMenu; + +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class EventEditMenuItem extends MenuItemDescriptor { + public static class EventEditAction extends RolAction { + private final Provider<CalendarViewer> calendar; + private PromptTopDialog dialog; + private final I18nTranslationService i18n; + + @Inject + public EventEditAction(final NavResources res, final I18nTranslationService i18n, + final Provider<CalendarViewer> calendar, final EventBus eventBus) { + super(AccessRolDTO.Administrator, true); + this.i18n = i18n; + this.calendar = calendar; + withText(i18n.t("Edit the appointment")).withIcon(res.calendarAdd()); + eventBus.addHandler(CalendarStateChangeEvent.getType(), + new CalendarStateChangeEvent.CalendarStateChangeHandler() { + @Override + public void onCalendarStateChange(final CalendarStateChangeEvent event) { + setEnabled(!calendar.get().getAppToEdit().equals(CalendarViewer.NO_APPOINT)); + } + }); + } + + @Override + public void actionPerformed(final ActionEvent event) { + } + } + + @Inject + public EventEditMenuItem(final EventEditAction action, final CalendarOnOverMenu cal) { + super(action); + setParent(cal.get()); + } +} Added: trunk/src/main/java/cc/kune/events/client/viewer/EventRemoveMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/viewer/EventRemoveMenuItem.java (rev 0) +++ trunk/src/main/java/cc/kune/events/client/viewer/EventRemoveMenuItem.java 2011-12-21 16:48:51 UTC (rev 1645) @@ -0,0 +1,83 @@ +package cc.kune.events.client.viewer; + +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.client.ui.dialogs.PromptTopDialog; +import cc.kune.common.client.ui.dialogs.PromptTopDialog.Builder; +import cc.kune.common.shared.i18n.I18nTranslationService; +import cc.kune.core.client.actions.RolAction; +import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.shared.dto.AccessRolDTO; +import cc.kune.events.client.actions.CalendarOnOverMenu; + +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class EventRemoveMenuItem extends MenuItemDescriptor { + public static class EventEditAction extends RolAction { + private final Provider<CalendarViewer> calendar; + private PromptTopDialog dialog; + private final I18nTranslationService i18n; + + @Inject + public EventEditAction(final NavResources res, final I18nTranslationService i18n, + final Provider<CalendarViewer> calendar, final EventBus eventBus) { + super(AccessRolDTO.Editor, true); + this.i18n = i18n; + this.calendar = calendar; + withText(i18n.t("Edit the appointment")).withIcon(res.calendarAdd()); + eventBus.addHandler(CalendarStateChangeEvent.getType(), + new CalendarStateChangeEvent.CalendarStateChangeHandler() { + + @Override + public void onCalendarStateChange(final CalendarStateChangeEvent event) { + setEnabled(!calendar.get().getAppToEdit().equals(CalendarViewer.NO_APPOINT)); + } + }); + } + + @Override + public void actionPerformed(final ActionEvent event) { + if (dialog == null) { + final Builder builder = new PromptTopDialog.Builder(CREATE_APP_ID, + i18n.t("Description of the appointment"), true, true, i18n.getDirection()); + builder.firstButtonTitle(i18n.t("Add")).firstButtonId(CREATE_APP_ADD_ID); + builder.sndButtonTitle(i18n.t("Cancel")).sndButtonId(CREATE_APP_CANCEL_ID); + dialog = builder.build(); + dialog.getFirstBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + if (dialog.isValid()) { + calendar.get().addAppointment(dialog.getTextFieldValue(), calendar.get().getOnOverDate()); + NotifyUser.info("Appointment should be edited (this is under development)"); + dialog.hide(); + } + } + }); + dialog.getSecondBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + dialog.hide(); + } + }); + } + dialog.clearTextFieldValue(); + dialog.showCentered(); + dialog.focusOnTextBox(); + } + } + + public static final String CREATE_APP_ADD_ID = "event-add-menu-item-add-btn"; + public static final String CREATE_APP_CANCEL_ID = "event-add-menu-item-add-btn"; + public static final String CREATE_APP_ID = "event-add-menu-item-form"; + + @Inject + public EventRemoveMenuItem(final EventEditAction action, final CalendarOnOverMenu cal) { + super(action); + setParent(cal.get()); + } +} Added: trunk/src/main/java/cc/kune/gspace/client/actions/AbstractEditorsMenu.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/AbstractEditorsMenu.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/actions/AbstractEditorsMenu.java 2011-12-21 16:48:51 UTC (rev 1645) @@ -0,0 +1,39 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.actions; + +import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; +import cc.kune.core.client.state.AccessRightsChangedEvent; +import cc.kune.core.client.state.AccessRightsChangedEvent.AccessRightsChangedHandler; +import cc.kune.core.client.state.AccessRightsClientManager; + +public class AbstractEditorsMenu extends MenuDescriptor { + + public AbstractEditorsMenu(final AccessRightsClientManager rightsManager) { + super(); + this.withStyles("k-button, k-btn, k-5corners, k-def-docbtn, k-fl"); + rightsManager.onRightsChanged(true, new AccessRightsChangedHandler() { + @Override + public void onAccessRightsChanged(final AccessRightsChangedEvent event) { + AbstractEditorsMenu.this.setVisible(event.getCurrentRights().isEditable()); + } + }); + } +} Modified: trunk/src/main/java/cc/kune/gspace/client/actions/AbstractNewMenu.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/AbstractNewMenu.java 2011-12-21 09:41:22 UTC (rev 1644) +++ trunk/src/main/java/cc/kune/gspace/client/actions/AbstractNewMenu.java 2011-12-21 16:48:51 UTC (rev 1645) @@ -19,29 +19,18 @@ */ package cc.kune.gspace.client.actions; -import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.client.state.AccessRightsChangedEvent; -import cc.kune.core.client.state.AccessRightsChangedEvent.AccessRightsChangedHandler; import cc.kune.core.client.state.AccessRightsClientManager; import com.google.inject.Inject; -public class AbstractNewMenu extends MenuDescriptor { +public class AbstractNewMenu extends AbstractEditorsMenu { @Inject public AbstractNewMenu(final CoreResources res, final I18nTranslationService i18n, final AccessRightsClientManager rightsManager) { - super(); - this.withIcon(res.addGreen()).withStyles("k-button, k-btn, k-5corners, k-def-docbtn, k-fl").withText( - i18n.t("More")); - - rightsManager.onRightsChanged(true, new AccessRightsChangedHandler() { - @Override - public void onAccessRightsChanged(final AccessRightsChangedEvent event) { - AbstractNewMenu.this.setVisible(event.getCurrentRights().isEditable()); - } - }); + super(rightsManager); + withText(i18n.t("More")).withIcon(res.addGreen()); } } Added: trunk/src/main/java/cc/kune/gspace/client/actions/AbstractStandaloneMenu.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/AbstractStandaloneMenu.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/actions/AbstractStandaloneMenu.java 2011-12-21 16:48:51 UTC (rev 1645) @@ -0,0 +1,33 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.actions; + +import cc.kune.core.client.state.AccessRightsClientManager; + +import com.google.inject.Inject; + +public class AbstractStandaloneMenu extends AbstractEditorsMenu { + + @Inject + public AbstractStandaloneMenu(final AccessRightsClientManager rightsManager) { + super(rightsManager); + setStandalone(true); + } +} Added: trunk/src/main/java/cc/kune/gspace/client/actions/StandaloneMenuProvider.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/StandaloneMenuProvider.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/actions/StandaloneMenuProvider.java 2011-12-21 16:48:51 UTC (rev 1645) @@ -0,0 +1,45 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.actions; + +import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; + +import com.google.inject.Provider; + +/** + * The Class StandAloneMenuProvider is a way to create a kind of singletons for + * menu entries. This can be register in a list of Providers<GuiDescriptor> but + * in fact only references one item and can be used to select the parent of some + * menu items + */ +public abstract class StandaloneMenuProvider implements Provider<MenuDescriptor> { + + private final AbstractStandaloneMenu menu; + + public StandaloneMenuProvider(final AbstractStandaloneMenu menu) { + this.menu = menu; + } + + @Override + public MenuDescriptor get() { + return menu; + } + +}

1 0

r1644 - trunk/src/main/java/cc/kune/gspace/client/i18n
by Vicente J. Ruiz Jurado 21 Dec '11

21 Dec '11

Author: vjrj_ Date: 2011-12-21 10:41:22 +0100 (Wed, 21 Dec 2011) New Revision: 1644 Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/AbstractLanguageSelectorPanel.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nCellList.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslationDataProvider.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.ui.xml trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java Log: Some usability fixes in translator Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/AbstractLanguageSelectorPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/AbstractLanguageSelectorPanel.java 2011-12-21 09:02:04 UTC (rev 1643) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/AbstractLanguageSelectorPanel.java 2011-12-21 09:41:22 UTC (rev 1644) @@ -112,6 +112,7 @@ private void createLangCombo(final boolean withEnglish) { // Field.setMsgTarget("side"); + // NOTE: The Combo box in modal popups fails! langCombo = new ComboBox<LanguageData>(); langCombo.setName(LANG_FIELD); langCombo.setMinChars(1); Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nCellList.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nCellList.java 2011-12-21 09:02:04 UTC (rev 1643) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nCellList.java 2011-12-21 09:41:22 UTC (rev 1644) @@ -17,6 +17,7 @@ */ package cc.kune.gspace.client.i18n; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.SimpleCallback; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.shared.dto.I18nLanguageSimpleDTO; @@ -174,6 +175,7 @@ @Override public void onCallback() { translatorForm.focusToTranslate(); + NotifyUser.hideProgress(); } }); Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslationDataProvider.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslationDataProvider.java 2011-12-21 09:02:04 UTC (rev 1643) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslationDataProvider.java 2011-12-21 09:41:22 UTC (rev 1644) @@ -17,6 +17,7 @@ import java.util.List; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.SimpleCallback; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.I18nServiceAsync; @@ -70,6 +71,7 @@ } public void setLanguage(final I18nLanguageSimpleDTO language, final boolean toTranslate) { + NotifyUser.showProgressLoading(); dataProvider.getList().clear(); dataProvider.refresh(); i18n.getTranslatedLexicon(session.getUserHash(), language.getCode(), toTranslate, Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java 2011-12-21 09:02:04 UTC (rev 1643) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java 2011-12-21 09:41:22 UTC (rev 1644) @@ -37,7 +37,7 @@ import com.google.gwt.user.client.ui.Widget; /** - * A form used for editing contacts. + * A form used for editing translations. */ public class I18nTranslatorForm extends Composite { @@ -167,7 +167,6 @@ toTranslate.setText(""); translation.setText(""); noteForTranslators.setVisible(false); - } private void updateWithTimer() { Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.ui.xml 2011-12-21 09:02:04 UTC (rev 1643) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.ui.xml 2011-12-21 09:41:22 UTC (rev 1644) @@ -39,8 +39,8 @@ padding: 5px; } - .textarea { - resize: both; + textarea.input { + resize: both !important; } .tip { @@ -78,7 +78,7 @@ </g:FlowPanel> <g:FlowPanel addStyleNames="{style.row}"> <g:Label ui:field="toLanguageTitle" addStyleNames="{style.titles} {style.cell}"/> - <g:TextArea ui:field='translation' addStyleNames="{style.cell}{style.textarea}" + <g:TextArea ui:field='translation' addStyleNames="{style.cell} {style.input}" visibleLines="5"/> <g:FlowPanel styleName="k-button" addStyleNames="{style.cell} {style.copyicon} k-button k-btn k-5corners"> Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java 2011-12-21 09:02:04 UTC (rev 1643) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java 2011-12-21 09:41:22 UTC (rev 1644) @@ -47,7 +47,8 @@ final LanguageSelectorWithoutEnglishPanel lanSelectorPanel, final I18nToTranslateGridPanel toTranslateGrid, final I18nTranslatedGridPanel translatedGrid, final I18nTranslateRecomendPanel transRecommend, final CoreResources res) { - super(TRANSLATOR_PANEL_ID, "", true, false, images, TRANSLATOR_ERROR_ID, i18n.t("Close"), null, + // Warning: Modal = true == you cannot select languages with mouse + super(TRANSLATOR_PANEL_ID, "", false, false, images, TRANSLATOR_ERROR_ID, i18n.t("Close"), null, null, null, transGroup, i18n.getDirection()); setIcon(res.language()); this.lanSelectorPanel = lanSelectorPanel;

1 0

r1643 - in trunk/src: main/java/cc/kune/core/server/utils main/resources test/java/cc/kune/core/server test/java/cc/kune/core/server/utils
by Vicente J. Ruiz Jurado 21 Dec '11

21 Dec '11

Author: vjrj_ Date: 2011-12-21 10:02:04 +0100 (Wed, 21 Dec 2011) New Revision: 1643 Added: trunk/src/main/resources/assembly.xml trunk/src/test/java/cc/kune/core/server/utils/ trunk/src/test/java/cc/kune/core/server/utils/FilenameUtilsTest.java Modified: trunk/src/main/java/cc/kune/core/server/utils/FilenameUtils.java Log: CLOSED - # 78: Rename don't fails with a name with only a space http://kune.ourproject.org/issues/ticket/78 Modified: trunk/src/main/java/cc/kune/core/server/utils/FilenameUtils.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/utils/FilenameUtils.java 2011-12-20 17:27:01 UTC (rev 1642) +++ trunk/src/main/java/cc/kune/core/server/utils/FilenameUtils.java 2011-12-21 09:02:04 UTC (rev 1643) @@ -21,22 +21,31 @@ import org.apache.commons.lang.StringUtils; +import cc.kune.common.client.utils.TextUtils; import cc.kune.core.client.errors.NameNotPermittedException; public class FilenameUtils { - /** - * Check filename is not empty, or '.', or '..' - * - * @param filename - */ - public static void checkBasicFilename(final String filename) { - if (filename == null || filename.length() == 0 || filename.equals(".") || filename.equals("..")) { - throw new NameNotPermittedException(); - } + /** + * Check filename is not empty, or '.', or '..' + * + * @param filename + */ + public static void checkBasicFilename(final String filename) { + if (TextUtils.empty(StringUtils.trimToEmpty(filename)) || filename.equals(".") + || filename.equals("..")) { + throw new NameNotPermittedException(); } + } - public static String chomp(final String filename) { - return StringUtils.chomp(filename); - } + /** + * Chomp the filename using {@link StringUtils.chomp} + * + * @param filename + * the filename + * @return the filename chomped + */ + public static String chomp(final String filename) { + return StringUtils.chomp(filename); + } } Added: trunk/src/main/resources/assembly.xml =================================================================== --- trunk/src/main/resources/assembly.xml (rev 0) +++ trunk/src/main/resources/assembly.xml 2011-12-21 09:02:04 UTC (rev 1643) @@ -0,0 +1,30 @@ +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + <id>complete</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <dependencySets> + <dependencySet> + <outputDirectory>/</outputDirectory> + <useProjectArtifact>true</useProjectArtifact> + <unpack>true</unpack> + <scope>runtime</scope> + </dependencySet> + </dependencySets> + <fileSets> + <fileSet> +  + <directory>target/kune-0.1.0-SNAPSHOT/ws/</directory> + <outputDirectory>META-INF/resources/ws</outputDirectory> + </fileSet> + <fileSet> + <directory>${project.basedir}/src/main/webapp/</directory> + <outputDirectory>META-INF/resources/webapp</outputDirectory> + <filtered>true</filtered> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Added: trunk/src/test/java/cc/kune/core/server/utils/FilenameUtilsTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/utils/FilenameUtilsTest.java (rev 0) +++ trunk/src/test/java/cc/kune/core/server/utils/FilenameUtilsTest.java 2011-12-21 09:02:04 UTC (rev 1643) @@ -0,0 +1,38 @@ +package cc.kune.core.server.utils; + +import org.junit.Test; + +import cc.kune.core.client.errors.NameNotPermittedException; + +public class FilenameUtilsTest { + + @Test(expected = NameNotPermittedException.class) + public void testNoDot() { + FilenameUtils.checkBasicFilename("."); + } + + @Test(expected = NameNotPermittedException.class) + public void testNoDoubleDot() { + FilenameUtils.checkBasicFilename(".."); + } + + @Test(expected = NameNotPermittedException.class) + public void testNoEmpty() { + FilenameUtils.checkBasicFilename(""); + } + + @Test(expected = NameNotPermittedException.class) + public void testNoNull() { + FilenameUtils.checkBasicFilename(null); + } + + @Test(expected = NameNotPermittedException.class) + public void testNoReturn() { + FilenameUtils.checkBasicFilename("\n"); + } + + @Test(expected = NameNotPermittedException.class) + public void testNoSpace() { + FilenameUtils.checkBasicFilename(" "); + } +}

1 0

r1642 - in trunk/src/main/java/cc/kune: common/client/tooltip events/client/viewer
by Vicente J. Ruiz Jurado 20 Dec '11

20 Dec '11

Author: vjrj_ Date: 2011-12-20 18:27:01 +0100 (Tue, 20 Dec 2011) New Revision: 1642 Modified: trunk/src/main/java/cc/kune/common/client/tooltip/TooltipPositionCalculator.java trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java Log: Tooltip fix & some minor change Modified: trunk/src/main/java/cc/kune/common/client/tooltip/TooltipPositionCalculator.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/tooltip/TooltipPositionCalculator.java 2011-12-20 00:39:19 UTC (rev 1641) +++ trunk/src/main/java/cc/kune/common/client/tooltip/TooltipPositionCalculator.java 2011-12-20 17:27:01 UTC (rev 1642) @@ -23,64 +23,70 @@ public class TooltipPositionCalculator { - public static TooltipPosition calculate(final int windowWitdh, final int windowHeight, final int widgetLeft, - final int widgetTop, final int widgetWidth, final int widgetHeight, final int tooltipWidth, - final int tooltipHeight) { - // GWT.log("ww: " + windowWitdh + " wh: " + windowHeight + " widL: " + - // widgetLeft + " widT: " + widgetTop - // + " widW: " + widgetWidth + " widH: " + widgetHeight + " tW: " + - // tooltipWidth + " tH: " + tooltipHeight); - final boolean overflowsWidth = overflowsWidth(windowWitdh, widgetLeft, tooltipWidth); - final boolean overflowsHeight = overflowsHeight(windowHeight, widgetTop, tooltipHeight); - // GWT.log("ow: " + overflowsWidth + " oH: " + overflowsHeight); - if (overflowsWidth && overflowsHeight) { - // esta es mezcla de las anteriores (y falta) - return new TooltipPosition(leftOverflow(widgetLeft, widgetWidth, tooltipWidth), widgetTop - tooltipHeight - - TooltipPosition.TOOLTIP_DISTANCE, ArrowPosition.SE, leftArrowOverflow(tooltipWidth), -2 - * TooltipPosition.ARROW_SIZE); - } else if (overflowsHeight) { - return new TooltipPosition(leftNoOverflow(widgetLeft), widgetTop - tooltipHeight - - TooltipPosition.TOOLTIP_DISTANCE, ArrowPosition.SW, 0, -2 * TooltipPosition.ARROW_SIZE); - } else if (overflowsWidth) { - return new TooltipPosition(leftOverflow(widgetLeft, widgetWidth, tooltipWidth), topNoOverflow(widgetTop, - widgetHeight), ArrowPosition.NE, leftArrowOverflow(tooltipWidth), -2 * TooltipPosition.ARROW_SIZE - - 1); - // 10 in the border width - } else if (overflowsHeight) { - return new TooltipPosition(onTopPositionTop(widgetLeft, widgetWidth), widgetTop - tooltipHeight - - TooltipPosition.TOOLTIP_DISTANCE, ArrowPosition.SW, TooltipPosition.ARROW_DEF_MARGIN, 0); - } else { - // Don't overflow - return new TooltipPosition(leftNoOverflow(widgetLeft), topNoOverflow(widgetTop, widgetHeight), - ArrowPosition.NW, TooltipPosition.ARROW_DEF_MARGIN, -2 * TooltipPosition.ARROW_SIZE - 1); - } + public static TooltipPosition calculate(final int windowWitdh, final int windowHeight, + final int widgetLeft, final int widgetTop, final int widgetWidth, final int widgetHeight, + final int tooltipWidth, final int tooltipHeight) { + // GWT.log("ww: " + windowWitdh + " wh: " + windowHeight + " widL: " + + // widgetLeft + " widT: " + widgetTop + // + " widW: " + widgetWidth + " widH: " + widgetHeight + " tW: " + + // tooltipWidth + " tH: " + tooltipHeight); + final boolean overflowsWidth = overflowsWidth(windowWitdh, widgetLeft, tooltipWidth); + final boolean overflowsHeight = overflowsHeight(windowHeight, widgetTop, tooltipHeight); + // GWT.log("ow: " + overflowsWidth + " oH: " + overflowsHeight); + if (overflowsWidth && overflowsHeight) { + // esta es mezcla de las anteriores (y falta) + return new TooltipPosition(leftOverflow(widgetLeft, widgetWidth, tooltipWidth), widgetTop + - tooltipHeight - TooltipPosition.TOOLTIP_DISTANCE, ArrowPosition.SE, + leftArrowOverflow(tooltipWidth), -2 * TooltipPosition.ARROW_SIZE); + } else if (overflowsHeight) { + return new TooltipPosition(leftNoOverflow(widgetLeft), widgetTop - tooltipHeight + - TooltipPosition.TOOLTIP_DISTANCE, ArrowPosition.SW, TooltipPosition.ARROW_DEF_MARGIN + 5, -2 + * TooltipPosition.ARROW_SIZE); + } else if (overflowsWidth) { + return new TooltipPosition(leftOverflow(widgetLeft, widgetWidth, tooltipWidth), topNoOverflow( + widgetTop, widgetHeight), ArrowPosition.NE, leftArrowOverflow(tooltipWidth), -2 + * TooltipPosition.ARROW_SIZE - 1); + // 10 in the border width + // } else if (overflowsHeight) { + // + // return new TooltipPosition(onTopPositionTop(widgetLeft, widgetWidth), + // widgetTop - tooltipHeight + // - TooltipPosition.TOOLTIP_DISTANCE, ArrowPosition.SW, + // TooltipPosition.ARROW_DEF_MARGIN, 0); + } else { + // Don't overflow + return new TooltipPosition(leftNoOverflow(widgetLeft), topNoOverflow(widgetTop, widgetHeight), + ArrowPosition.NW, TooltipPosition.ARROW_DEF_MARGIN + 5, -2 * TooltipPosition.ARROW_SIZE - 1); } + } - private static int leftArrowOverflow(final int tooltipWidth) { - return tooltipWidth - TooltipPosition.ARROW_DEF_MARGIN - 2 * 10; - } + private static int leftArrowOverflow(final int tooltipWidth) { + return tooltipWidth - TooltipPosition.ARROW_DEF_MARGIN - 2 * 10; + } - private static int leftNoOverflow(final int widgetLeft) { - return widgetLeft; - } + private static int leftNoOverflow(final int widgetLeft) { + return widgetLeft; + } - private static int leftOverflow(final int widgetLeft, final int widgetWidth, final int tooltipWidth) { - return widgetLeft + widgetWidth - tooltipWidth - TooltipPosition.TOOLTIP_DISTANCE; - } + private static int leftOverflow(final int widgetLeft, final int widgetWidth, final int tooltipWidth) { + return widgetLeft + widgetWidth - tooltipWidth - TooltipPosition.TOOLTIP_DISTANCE; + } - private static int onTopPositionTop(final int widgetTop, final int widgetHeight) { - return topNoOverflow(widgetTop, widgetHeight); - } + private static int onTopPositionTop(final int widgetTop, final int widgetHeight) { + return topNoOverflow(widgetTop, widgetHeight); + } - private static boolean overflowsHeight(final int windowHeight, final int widgetTop, final int tooltipHeight) { - return widgetTop + TooltipPosition.TOOLTIP_DISTANCE + tooltipHeight > windowHeight; - } + private static boolean overflowsHeight(final int windowHeight, final int widgetTop, + final int tooltipHeight) { + return widgetTop + TooltipPosition.TOOLTIP_DISTANCE + tooltipHeight > windowHeight; + } - private static boolean overflowsWidth(final int windowWitdh, final int widgetLeft, final int tooltipWidth) { - return widgetLeft + TooltipPosition.TOOLTIP_DISTANCE + tooltipWidth > windowWitdh; - } + private static boolean overflowsWidth(final int windowWitdh, final int widgetLeft, + final int tooltipWidth) { + return widgetLeft + TooltipPosition.TOOLTIP_DISTANCE + tooltipWidth > windowWitdh; + } - private static int topNoOverflow(final int widgetTop, final int widgetHeight) { - return widgetTop + widgetHeight + TooltipPosition.TOOLTIP_DISTANCE; - } + private static int topNoOverflow(final int widgetTop, final int widgetHeight) { + return widgetTop + widgetHeight + TooltipPosition.TOOLTIP_DISTANCE; + } } Modified: trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java 2011-12-20 00:39:19 UTC (rev 1641) +++ trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java 2011-12-20 17:27:01 UTC (rev 1642) @@ -5,6 +5,9 @@ import javax.annotation.Nonnull; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.client.tooltip.Tooltip; +import cc.kune.common.client.utils.SimpleResponseCallback; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.shared.dto.HasContent; import cc.kune.gspace.client.viewers.AbstractFolderViewerView; import cc.kune.gspace.client.viewers.FolderViewerUtils; @@ -19,14 +22,21 @@ import com.bradrydzewski.gwt.calendar.client.event.HasMouseOverHandlers; import com.bradrydzewski.gwt.calendar.client.event.HasTimeBlockClickHandlers; import com.bradrydzewski.gwt.calendar.client.event.HasUpdateHandlers; +import com.bradrydzewski.gwt.calendar.client.event.MouseOverEvent; +import com.bradrydzewski.gwt.calendar.client.event.MouseOverHandler; import com.bradrydzewski.gwt.calendar.client.event.TimeBlockClickEvent; import com.bradrydzewski.gwt.calendar.client.event.TimeBlockClickHandler; +import com.bradrydzewski.gwt.calendar.client.event.UpdateEvent; +import com.bradrydzewski.gwt.calendar.client.event.UpdateHandler; import com.google.gwt.event.logical.shared.HasOpenHandlers; import com.google.gwt.event.logical.shared.HasSelectionHandlers; +import com.google.gwt.event.logical.shared.OpenEvent; +import com.google.gwt.event.logical.shared.OpenHandler; import com.google.gwt.event.logical.shared.SelectionEvent; import com.google.gwt.event.logical.shared.SelectionHandler; import com.google.gwt.event.shared.EventBus; import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.user.client.ui.Widget; import com.google.gwt.user.datepicker.client.CalendarUtil; import com.google.inject.Inject; import com.gwtplatform.mvp.client.Presenter; @@ -67,12 +77,15 @@ private CalendarViews currentCalView; private int currentDaysView = 7; private final FolderViewerUtils folderViewerUtils; + private final I18nTranslationService i18n; @Inject public CalendarViewerPresenter(final EventBus eventBus, final CalendarViewerView view, - final CalendarViewerProxy proxy, final FolderViewerUtils folderViewerUtils) { + final CalendarViewerProxy proxy, final FolderViewerUtils folderViewerUtils, + final I18nTranslationService i18n) { super(eventBus, view, proxy); this.folderViewerUtils = folderViewerUtils; + this.i18n = i18n; addListeners(); setViewImpl(DEF_VIEW, currentDaysView); } @@ -81,13 +94,47 @@ getView().addTimeBlockClickHandler(new TimeBlockClickHandler<Date>() { @Override public void onTimeBlockClick(final TimeBlockClickEvent<Date> event) { - getView().addAppointment("Only a test", event.getTarget()); - NotifyUser.info("Appointment added but not yet saved (this is under development)"); + NotifyUser.askConfirmation(i18n.t("Confirm, please"), i18n.t("Add a new appointment?"), + new SimpleResponseCallback() { + @Override + public void onCancel() { + // do nothing + } + + @Override + public void onSuccess() { + getView().addAppointment("Only a test", event.getTarget()); + NotifyUser.info("Appointment added but not yet saved (this is under development)"); + } + }); } }); + getView().addMouseOverHandler(new MouseOverHandler<Appointment>() { + @Override + public void onMouseOver(final MouseOverEvent<Appointment> event) { + Tooltip.to((Widget) event.getSource(), "kk"); + // final Tooltip tooltip = new Tooltip(); + // tooltip.setText("lalala"); + // tooltip.setPopupPosition(, currentDaysView) + // tooltip.showRelativeTo((UIObject) event.getElement()); + } + }); + getView().addUpdateHandler(new UpdateHandler<Appointment>() { + @Override + public void onUpdate(final UpdateEvent<Appointment> event) { + NotifyUser.info("updated handler"); + } + }); + getView().addOpenHandler(new OpenHandler<Appointment>() { + @Override + public void onOpen(final OpenEvent<Appointment> event) { + NotifyUser.info("open handler"); + } + }); getView().addSelectionHandler(new SelectionHandler<Appointment>() { @Override public void onSelection(final SelectionEvent<Appointment> event) { + NotifyUser.info("on selection"); // getView().removeAppointment(event.getSelectedItem()); } });

1 0

r1641 - in kune-sandbox: . .settings src/cc/kune/sandbox src/cc/kune/sandbox/client
by Vicente J. Ruiz Jurado 20 Dec '11

20 Dec '11

Author: vjrj_ Date: 2011-12-20 01:39:19 +0100 (Tue, 20 Dec 2011) New Revision: 1641 Modified: kune-sandbox/.classpath kune-sandbox/.settings/com.google.gwt.eclipse.core.prefs kune-sandbox/src/cc/kune/sandbox/KuneSandbox.gwt.xml kune-sandbox/src/cc/kune/sandbox/client/KuneSandboxEntryPoint.java Log: Modified: kune-sandbox/.classpath =================================================================== --- kune-sandbox/.classpath 2011-12-20 00:10:39 UTC (rev 1640) +++ kune-sandbox/.classpath 2011-12-20 00:39:19 UTC (rev 1641) @@ -11,5 +11,6 @@ <classpathentry kind="lib" path="lib/gin-r137.jar"/> <classpathentry kind="lib" path="lib/guice-3.0-rc2.jar"/> <classpathentry kind="lib" path="lib/gwtp-all-0.5.jar"/> + <classpathentry kind="lib" path="lib/gwt-plupload-1.1.jar"/> <classpathentry kind="output" path="war/WEB-INF/classes"/> </classpath> Modified: kune-sandbox/.settings/com.google.gwt.eclipse.core.prefs =================================================================== --- kune-sandbox/.settings/com.google.gwt.eclipse.core.prefs 2011-12-20 00:10:39 UTC (rev 1640) +++ kune-sandbox/.settings/com.google.gwt.eclipse.core.prefs 2011-12-20 00:39:19 UTC (rev 1641) @@ -1,5 +1,5 @@ -#Thu Jun 30 02:40:51 CEST 2011 +#Fri Nov 11 03:29:14 CET 2011 eclipse.preferences.version=1 entryPointModules= filesCopiedToWebInfLib=gwt-servlet.jar -gwtCompileSettings=PGd3dC1jb21waWxlLXNldHRpbmdzPjxsb2ctbGV2ZWw+SU5GTzwvbG9nLWxldmVsPjxvdXRwdXQtc3R5bGU+T0JGVVNDQVRFRDwvb3V0cHV0LXN0eWxlPjxleHRyYS1hcmdzPjwhW0NEQVRBW11dPjwvZXh0cmEtYXJncz48dm0tYXJncz48IVtDREFUQVstWG14NTEybV1dPjwvdm0tYXJncz48L2d3dC1jb21waWxlLXNldHRpbmdzPg\=\= +gwtCompileSettings=PGd3dC1jb21waWxlLXNldHRpbmdzPjxsb2ctbGV2ZWw+SU5GTzwvbG9nLWxldmVsPjxvdXRwdXQtc3R5bGU+T0JGVVNDQVRFRDwvb3V0cHV0LXN0eWxlPjxleHRyYS1hcmdzPjwhW0NEQVRBW11dPjwvZXh0cmEtYXJncz48dm0tYXJncz48IVtDREFUQVstWG14NTEybV1dPjwvdm0tYXJncz48ZW50cnktcG9pbnQtbW9kdWxlPmNjLmt1bmUuc2FuZGJveC5LdW5lU2FuZGJveDwvZW50cnktcG9pbnQtbW9kdWxlPjwvZ3d0LWNvbXBpbGUtc2V0dGluZ3M+ Modified: kune-sandbox/src/cc/kune/sandbox/KuneSandbox.gwt.xml =================================================================== --- kune-sandbox/src/cc/kune/sandbox/KuneSandbox.gwt.xml 2011-12-20 00:10:39 UTC (rev 1640) +++ kune-sandbox/src/cc/kune/sandbox/KuneSandbox.gwt.xml 2011-12-20 00:39:19 UTC (rev 1641) @@ -3,9 +3,10 @@  <inherits name='com.google.gwt.user.User' /> <inherits name="cc.kune.msgs.KuneMsgs" /> - <inherits name="cc.kune.core.KuneCore" /> - <inherits name="cc.kune.wave.KuneWave" /> - <inherits name="org.adamtacy.GWTEffects"></inherits> + + <inherits name="cc.kune.common.KuneCommon" /> + +    @@ -20,4 +21,5 @@ <public path="public" /> <stylesheet src="kune-sandbox.css" /> <inherits name="com.extjs.gxt.ui.GXT" /> + </module> Modified: kune-sandbox/src/cc/kune/sandbox/client/KuneSandboxEntryPoint.java =================================================================== --- kune-sandbox/src/cc/kune/sandbox/client/KuneSandboxEntryPoint.java 2011-12-20 00:10:39 UTC (rev 1640) +++ kune-sandbox/src/cc/kune/sandbox/client/KuneSandboxEntryPoint.java 2011-12-20 00:39:19 UTC (rev 1641) @@ -1,54 +1,30 @@ package cc.kune.sandbox.client; -import cc.kune.common.client.notify.NotifyLevel; import cc.kune.common.client.tooltip.Tooltip; -import cc.kune.common.client.ui.MaskWidget; -import cc.kune.common.client.ui.PopupBottomPanel; -import cc.kune.common.client.ui.PopupTopPanel; -import cc.kune.common.client.ui.dialogs.BasicDialog; -import cc.kune.common.client.ui.dialogs.PromptTopDialog; -import cc.kune.common.client.ui.dialogs.PromptTopDialog.Builder; -import cc.kune.common.client.utils.TextUtils; -import cc.kune.core.client.sub.SubtitlesWidget; -import cc.kune.gspace.client.GSpaceArmorImpl; -import cc.kune.gspace.client.tool.selector.ToolSelectorItemPanel; -import cc.kune.gspace.client.tool.selector.ToolSelectorPanel; -import cc.kune.msgs.client.CloseCallback; -import cc.kune.msgs.client.UserMessage; -import cc.kune.msgs.client.UserMessagesPanel; -import cc.kune.msgs.client.UserMessagesPresenter; import com.google.gwt.core.client.EntryPoint; -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.AbsolutePanel; import com.google.gwt.user.client.ui.Button; -import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gwt.user.client.ui.IsWidget; -import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.RootPanel; -import com.google.gwt.user.client.ui.VerticalPanel; /** * Entry point classes define <code>onModuleLoad()</code>. */ public class KuneSandboxEntryPoint implements EntryPoint { + // + // private PopupBottomPanel pop; - private PopupBottomPanel pop; - /** * This is the entry point method. */ @Override public void onModuleLoad() { - testUserMessages(); + // testUserMessages(); // testDialogs(); // testToolpanel(); // toolSelector.addWidget(new Label("Test")); - // testTooltips(); + testTooltips(); // testBarButtons(); // testPromptDialog(); @@ -56,31 +32,21 @@ // testAvatarDecorators(); // testSubWidget(); - } - private void testSubWidget() { - // String title = new String("Some big title áéíóú!"); - // String bTitle = Base64Utils.toBase64(title.getBytes()); - // String descr = new String("Some big description áéíóú"); - // String bDescr = Base64Utils.toBase64(descr.getBytes()); - // - // final SubtitlesWidget sub = new SubtitlesWidget(); - // sub.setTitleText(new String(Base64Utils.fromBase64(bTitle))); - // sub.setDescription(new String(Base64Utils.fromBase64(bDescr))); - // sub.setSize(Window.getClientWidth() + "px", Window.getClientHeight() + - // "px"); - // Button btn = new Button("Click me"); - // btn.addClickHandler(new ClickHandler() { - // @Override - // public void onClick(ClickEvent event) { - // - // sub.show(); - // } - // }); - // RootPanel.get().add(btn); - // RootPanel.get().add(sub); + // testPUload(); } + // private void testPUload() { + // final Button browseButton = new Button(); + // browseButton.getElement().setId("my-browse-button"); + // final PluploadBuilder builder = new PluploadBuilder(); + // // ADD ANY PLUPLOAD PROPERTIES HERE + // builder.uploadUrl("server/upload.php"); + // builder.browseButton("my-browse-button"); + // final Plupload plupload = builder.create(); + // RootPanel.get().add(browseButton); + // } + private void testAvatarDecorators() { // BasicThumb thumb = new // BasicThumb("http://kune.beta.iepala.es/others/unknown.jpg", 50, "kk", @@ -95,46 +61,48 @@ // RootPanel.get().add(avatarDecorator); } - private void testPromptDialog() { - Builder builder = new PromptTopDialog.Builder("kkj-kk", "Some ask text?", false, true); - builder.width("200px").height("200px").firstButtonTitle("Create").sndButtonTitle("Cancel"); - builder.regex(TextUtils.UNIX_NAME).regexText( - "The name must contain only characters, numbers and dashes"); - PromptTopDialog diag = builder.build(); - diag.showCentered(); - diag.focusOnTextBox(); - diag.getFirstBtn().addClickHandler(new ClickHandler() { - - @Override - public void onClick(ClickEvent event) { - Window.alert("ok"); - } - }); - } - - private void testBarButtons() { - Button btn1 = new Button("Btn 1"); - Button btn2 = new Button("Btn 2"); - Button btn3 = new Button("Btn 3"); - btn1.addStyleName("k-button"); - btn1.addStyleName("k-button-left"); - btn2.addStyleName("k-button"); - btn2.addStyleName("k-button-center"); - btn3.addStyleName("k-button"); - btn3.addStyleName("k-button-right"); - btn1.addStyleName("kune-Margin-Large-t"); - btn2.addStyleName("kune-Margin-Large-t"); - btn3.addStyleName("kune-Margin-Large-t"); - btn1.addStyleName("k-fl"); - btn2.addStyleName("k-fl"); - btn3.addStyleName("k-fl"); - FlowPanel vp = new FlowPanel(); - vp.add(btn1); - vp.add(btn2); - vp.add(btn3); - RootPanel.get().add(vp); - } - + // + // private void testPromptDialog() { + // Builder builder = new PromptTopDialog.Builder("kkj-kk", "Some ask text?", + // false, true, Direction.LTR); + // builder.width("200px").height("200px").firstButtonTitle("Create").sndButtonTitle("Cancel"); + // builder.regex(TextUtils.UNIX_NAME).regexText( + // "The name must contain only characters, numbers and dashes"); + // PromptTopDialog diag = builder.build(); + // diag.showCentered(); + // diag.focusOnTextBox(); + // diag.getFirstBtn().addClickHandler(new ClickHandler() { + // + // @Override + // public void onClick(ClickEvent event) { + // Window.alert("ok"); + // } + // }); + // } + // + // private void testBarButtons() { + // Button btn1 = new Button("Btn 1"); + // Button btn2 = new Button("Btn 2"); + // Button btn3 = new Button("Btn 3"); + // btn1.addStyleName("k-button"); + // btn1.addStyleName("k-button-left"); + // btn2.addStyleName("k-button"); + // btn2.addStyleName("k-button-center"); + // btn3.addStyleName("k-button"); + // btn3.addStyleName("k-button-right"); + // btn1.addStyleName("kune-Margin-Large-t"); + // btn2.addStyleName("kune-Margin-Large-t"); + // btn3.addStyleName("kune-Margin-Large-t"); + // btn1.addStyleName("k-fl"); + // btn2.addStyleName("k-fl"); + // btn3.addStyleName("k-fl"); + // FlowPanel vp = new FlowPanel(); + // vp.add(btn1); + // vp.add(btn2); + // vp.add(btn3); + // RootPanel.get().add(vp); + // } + // private void testTooltips() { final AbsolutePanel panel = new AbsolutePanel(); final Button button = new Button("Btn 1"); @@ -148,124 +116,156 @@ panel.add(button2, clientWidth - 60, 5); panel.add(button3, 5, clientHeight - 40); panel.add(button4, clientWidth - 60, clientHeight - 40); - Tooltip.to(button, "Some tooltip"); - Tooltip.to(button2, "Some tooltip"); - Tooltip.to(button3, "Some tooltip"); - Tooltip.to(button4, "Some tooltip"); + Tooltip.to(button, "Some tooltip, Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Donec vitae eros. ").setWidth(100); + Tooltip.to(button2, "Some tooltip, Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Donec vitae eros. ").setWidth(100); + Tooltip.to(button3, "Some tooltip, Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Donec vitae eros. ").setWidth(100); + Tooltip.to(button4, "Some tooltip, Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Donec vitae eros. ").setWidth(100); // DOM.setElementProperty(button2.getElement(), "position", "relative"); RootPanel.get().add(panel); } - private void testToolpanel() { - ToolSelectorPanel toolSelector = new ToolSelectorPanel(new GSpaceArmorImpl(null), null); - ToolSelectorItemPanel toolItem1 = new ToolSelectorItemPanel(); - toolItem1.getLabel().setText("documents"); - ToolSelectorItemPanel toolItem2 = new ToolSelectorItemPanel(); - toolItem2.getLabel().setText("something very longgggggg"); - ToolSelectorItemPanel toolItem3 = new ToolSelectorItemPanel(); - toolItem3.getLabel().setText("media"); - toolSelector.addItem(toolItem1); - toolSelector.addItem(toolItem2); - toolSelector.addItem(toolItem3); - toolItem1.setSelected(true); - toolItem2.setSelected(false); - toolItem3.setSelected(false); - toolSelector.asWidget().setWidth("200px"); - RootPanel.get().add(toolSelector.asWidget()); - } + // + // private void testToolpanel() { + // ToolSelectorPanel toolSelector = new ToolSelectorPanel(new + // GSpaceArmorImpl(null), null); + // ToolSelectorItemPanel toolItem1 = new ToolSelectorItemPanel(); + // toolItem1.getLabel().setText("documents"); + // ToolSelectorItemPanel toolItem2 = new ToolSelectorItemPanel(); + // toolItem2.getLabel().setText("something very longgggggg"); + // ToolSelectorItemPanel toolItem3 = new ToolSelectorItemPanel(); + // toolItem3.getLabel().setText("media"); + // toolSelector.addItem(toolItem1); + // toolSelector.addItem(toolItem2); + // toolSelector.addItem(toolItem3); + // toolItem1.setSelected(true); + // toolItem2.setSelected(false); + // toolItem3.setSelected(false); + // toolSelector.asWidget().setWidth("200px"); + // RootPanel.get().add(toolSelector.asWidget()); + // } + // + // private void postAdd(final PopupBottomPanel pop) { + // pop.setCenterPosition(); + // } + // + // private void postAdd(final PopupTopPanel pop) { + // pop.setCenterPosition(); + // } + // + // private void testDialogs() { + // final PopupTopPanel pop2 = new PopupTopPanel(false, true); + // pop2.setGlassEnabled(true); + // final BasicDialog dialog = new BasicDialog(); + // pop2.add(dialog); + // + // dialog.getTitleText().setText("Title"); + // dialog.setFirstBtnText("Accept"); + // dialog.setSecondBtnText("Cancel"); + // dialog.setFirstBtnTabIndex(2); + // dialog.setSecondBtnTabIndex(3); + // final VerticalPanel sPanel = new VerticalPanel(); + // sPanel.add(new Label("lo que sea")); + // final Button btn = new Button("lo que sea"); + // btn.setTabIndex(1); + // btn.setFocus(true); + // sPanel.add(btn); + // sPanel.setSize("300px", "150px"); + // dialog.getInnerPanel().add((IsWidget) sPanel); + // final Label label = new Label("Test label"); + // // final NotifyLevelImages levelImg = + // // GWT.create(NotifyLevelImages.class); + // // dialog.getBottomPanel().add(new MessagePanel(levelImg, "kk")); + // final MaskWidget mask = new MaskWidget(); + // + // RootPanel.get().add(label); + // pop2.showNear(label); + // // final String zIndex = DOM.getStyleAttribute(pop2.getElement(), + // // "zIndex"); + // DOM.setStyleAttribute(pop.getElement(), "zIndex", "10000"); + // mask.mask(pop2, "JAarrrrr!"); + // } + // + // private void testUserMessages() { + // final UserMessagesPanel panel = new UserMessagesPanel(); + // UserMessage.setFadeMills(3000); + // UserMessage.setCloseTitle("Close message"); + // panel.setWidth("422px"); + // final UserMessagesPresenter presenter = new UserMessagesPresenter(); + // presenter.init(panel); + // + // pop = new PopupBottomPanel(); + // final CloseCallback closeCalback = new CloseCallback() { + // @Override + // public void onClose() { + // pop.setCenterPosition(); + // } + // }; + // presenter.add(NotifyLevel.info, "Title", + // "Lorem ipsum dolor sit amet, consectetuer adipiscing elit", + // "", false, closeCalback); + // postAdd(pop); + // presenter.add(NotifyLevel.error, "Title", + // "Lorem ipsum dolor sit amet, consectetuer adipiscing elit", "", false, + // closeCalback); + // pop.add(panel); + // + // postAdd(pop); + // + // final Timer time = new Timer() { + // @Override + // public void run() { + // presenter.add( + // NotifyLevel.error, + // "", + // "Lorem <a href='/'>ipsum</a> dolor sit amet, consectetuer adipiscing elit. Lorem ipsum dolor sit amet, consectetuer adipiscing elit", + // "", true, closeCalback); + // postAdd(pop); + // } + // }; + // final Timer time2 = new Timer() { + // @Override + // public void run() { + // presenter.add(NotifyLevel.important, "", "Lorem ", "", false, + // closeCalback); + // postAdd(pop); + // presenter.add(NotifyLevel.important, "Title", "Lorem ", "", true, + // closeCalback); + // presenter.add(NotifyLevel.important, "", "Lorem ", "", true, closeCalback); + // presenter.add(NotifyLevel.important, "", "Lorem ", "", false, + // closeCalback); + // presenter.add(NotifyLevel.important, "", "Lorem ", "", false, + // closeCalback); + // presenter.add(NotifyLevel.important, "", "Lorem ", "", false, + // closeCalback); + // postAdd(pop); + // } + // }; + // time.schedule(1000); + // time2.schedule(5000); + // pop.show(); + // + // } - private void postAdd(final PopupBottomPanel pop) { - pop.setCenterPosition(); + private void testSubWidget() { + // String title = new String("Some big title áéíóú!"); + // String bTitle = Base64Utils.toBase64(title.getBytes()); + // String descr = new String("Some big description áéíóú"); + // String bDescr = Base64Utils.toBase64(descr.getBytes()); + // + // final SubtitlesWidget sub = new SubtitlesWidget(); + // sub.setTitleText(new String(Base64Utils.fromBase64(bTitle))); + // sub.setDescription(new String(Base64Utils.fromBase64(bDescr))); + // sub.setSize(Window.getClientWidth() + "px", Window.getClientHeight() + + // "px"); + // Button btn = new Button("Click me"); + // btn.addClickHandler(new ClickHandler() { + // @Override + // public void onClick(ClickEvent event) { + // + // sub.show(); + // } + // }); + // RootPanel.get().add(btn); + // RootPanel.get().add(sub); } - - private void postAdd(final PopupTopPanel pop) { - pop.setCenterPosition(); - } - - private void testDialogs() { - final PopupTopPanel pop2 = new PopupTopPanel(false, true); - pop2.setGlassEnabled(true); - final BasicDialog dialog = new BasicDialog(); - pop2.add(dialog); - - dialog.getTitleText().setText("Title"); - dialog.setFirstBtnText("Accept"); - dialog.setSecondBtnText("Cancel"); - dialog.setFirstBtnTabIndex(2); - dialog.setSecondBtnTabIndex(3); - final VerticalPanel sPanel = new VerticalPanel(); - sPanel.add(new Label("lo que sea")); - final Button btn = new Button("lo que sea"); - btn.setTabIndex(1); - btn.setFocus(true); - sPanel.add(btn); - sPanel.setSize("300px", "150px"); - dialog.getInnerPanel().add((IsWidget) sPanel); - final Label label = new Label("Test label"); - // final NotifyLevelImages levelImg = - // GWT.create(NotifyLevelImages.class); - // dialog.getBottomPanel().add(new MessagePanel(levelImg, "kk")); - final MaskWidget mask = new MaskWidget(); - - RootPanel.get().add(label); - pop2.showNear(label); - // final String zIndex = DOM.getStyleAttribute(pop2.getElement(), - // "zIndex"); - DOM.setStyleAttribute(pop.getElement(), "zIndex", "10000"); - mask.mask(pop2, "JAarrrrr!"); - } - - private void testUserMessages() { - final UserMessagesPanel panel = new UserMessagesPanel(); - UserMessage.setFadeMills(3000); - UserMessage.setCloseTitle("Close message"); - panel.setWidth("422px"); - final UserMessagesPresenter presenter = new UserMessagesPresenter(); - presenter.init(panel); - - pop = new PopupBottomPanel(); - final CloseCallback closeCalback = new CloseCallback() { - @Override - public void onClose() { - pop.setCenterPosition(); - } - }; - presenter.add(NotifyLevel.info, "Title", "Lorem ipsum dolor sit amet, consectetuer adipiscing elit", - "", false, closeCalback); - postAdd(pop); - presenter.add(NotifyLevel.error, "Title", - "Lorem ipsum dolor sit amet, consectetuer adipiscing elit", "", false, closeCalback); - pop.add(panel); - - postAdd(pop); - - final Timer time = new Timer() { - @Override - public void run() { - presenter.add( - NotifyLevel.error, - "", - "Lorem <a href='/'>ipsum</a> dolor sit amet, consectetuer adipiscing elit. Lorem ipsum dolor sit amet, consectetuer adipiscing elit", - "", true, closeCalback); - postAdd(pop); - } - }; - final Timer time2 = new Timer() { - @Override - public void run() { - presenter.add(NotifyLevel.important, "", "Lorem ", "", false, closeCalback); - postAdd(pop); - presenter.add(NotifyLevel.important, "Title", "Lorem ", "", true, closeCalback); - presenter.add(NotifyLevel.important, "", "Lorem ", "", true, closeCalback); - presenter.add(NotifyLevel.important, "", "Lorem ", "", false, closeCalback); - presenter.add(NotifyLevel.important, "", "Lorem ", "", false, closeCalback); - presenter.add(NotifyLevel.important, "", "Lorem ", "", false, closeCalback); - postAdd(pop); - } - }; - time.schedule(1000); - time2.schedule(5000); - pop.show(); - - } }

1 0

r1640 - in trunk/src/main/java/cc/kune: common common/client/ui common/client/ui/dialogs common/shared/i18n core/client/i18n core/client/sn core/client/ui core/client/ui/dialogs core/client/ui/dialogs/tabbed gspace/client/i18n gspace/client/options gspace/client/options/general gspace/client/options/license gspace/client/options/logo gspace/client/options/style gspace/client/options/tools gspace/client/viewers
by Vicente J. Ruiz Jurado 20 Dec '11

20 Dec '11

Author: vjrj_ Date: 2011-12-20 01:10:39 +0100 (Tue, 20 Dec 2011) New Revision: 1640 Added: trunk/src/main/java/cc/kune/common/shared/i18n/I18nTranslationServiceMocked.java trunk/src/main/java/cc/kune/core/client/ui/BasicDragableThumb.java trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/ Removed: trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/ trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java Modified: trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml trunk/src/main/java/cc/kune/common/client/ui/BasicThumb.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/PromptTopDialog.java trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/AbstractTabbedDialog.java trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/TabTitleGenerator.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/EntityOptions.java trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/general/EntityOptGeneralPanel.java trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java Log: More refactoring for calendar tool Modified: trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml 2011-12-20 00:10:39 UTC (rev 1640) @@ -9,7 +9,7 @@  <source path="shared"/> <source path='client' - excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> + excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java"/> <public path="public"/> <inherits name='org.cobogw.gwt.user.User'/> <inherits name='com.google.gwt.inject.Inject'/> Modified: trunk/src/main/java/cc/kune/common/client/ui/BasicThumb.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/BasicThumb.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/common/client/ui/BasicThumb.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -23,7 +23,6 @@ import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.utils.TextUtils; -import com.allen_sauer.gwt.dnd.client.HasDragHandle; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.DoubleClickEvent; @@ -37,12 +36,11 @@ import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.VerticalPanel; -import com.google.gwt.user.client.ui.Widget; /** * BasicThumb.java */ -public class BasicThumb extends Composite implements HasDragHandle { +public class BasicThumb extends Composite { private static final int NOSIZE = -1; private final Image image; private Tooltip imageTooltip; @@ -150,8 +148,7 @@ panel.addDomHandler(clickHandler, DoubleClickEvent.getType()); } - @Override - public Widget getDragHandle() { + public Image getImage() { return image; } Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/PromptTopDialog.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/PromptTopDialog.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/PromptTopDialog.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -27,6 +27,7 @@ public static class Builder extends BasicTopDialog.Builder { private boolean allowBlank = false; + private int fieldWidth; private int maxLength = 0; private String maxLengthText; private int minLength = 0; @@ -53,6 +54,11 @@ return dialog; } + public Builder fieldWidth(final int fieldWidth) { + this.fieldWidth = fieldWidth; + return this; + } + public Builder maxLength(final int maxLength) { this.maxLength = maxLength; return this; @@ -114,6 +120,7 @@ if (builder.maxLength != 0) { textField.setMaxLength(builder.maxLength); } + textField.setWidth(builder.fieldWidth); textField.setAllowBlank(builder.allowBlank); super.getInnerPanel().add(textField); } Copied: trunk/src/main/java/cc/kune/common/shared/i18n/I18nTranslationServiceMocked.java (from rev 1639, trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java) =================================================================== --- trunk/src/main/java/cc/kune/common/shared/i18n/I18nTranslationServiceMocked.java (rev 0) +++ trunk/src/main/java/cc/kune/common/shared/i18n/I18nTranslationServiceMocked.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -0,0 +1,36 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.common.shared.i18n; + +import cc.kune.common.client.utils.TextUtils; + +public class I18nTranslationServiceMocked extends I18nTranslationService { + @Override + public boolean isRTL() { + return false; + } + + @Override + public String tWithNT(final String text, final String noteForTranslators) { + final String encodeText = TextUtils.escapeHtmlLight(text); + final String translation = encodeText; + return decodeHtml(translation); + } +} Deleted: trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -1,37 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.core.client.i18n; - -import cc.kune.common.client.utils.TextUtils; -import cc.kune.common.shared.i18n.I18nTranslationService; - -public class I18nTranslationServiceMocked extends I18nTranslationService { - @Override - public boolean isRTL() { - return false; - } - - @Override - public String tWithNT(final String text, final String noteForTranslators) { - final String encodeText = TextUtils.escapeHtmlLight(text); - final String translation = encodeText; - return decodeHtml(translation); - } -} Modified: trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -28,11 +28,11 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.client.tooltip.Tooltip; -import cc.kune.common.client.ui.BasicThumb; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.avatar.SmallAvatarDecorator; import cc.kune.core.client.dnd.KuneDragController; import cc.kune.core.client.dnd.NotImplementedDropManager; +import cc.kune.core.client.ui.BasicDragableThumb; import cc.kune.gspace.client.GSpaceArmor; import com.google.gwt.core.client.GWT; @@ -133,9 +133,10 @@ actions.clear(); } - public BasicThumb createThumb(final String text, final String avatarUrl, final String tooltip, + public BasicDragableThumb createThumb(final String text, final String avatarUrl, final String tooltip, final String tooltipTitle, final GuiActionDescCollection menuitems) { - final BasicThumb thumb = new BasicThumb(avatarUrl, AVATARSIZE, text, AVATARLABELMAXSIZE, false); + final BasicDragableThumb thumb = new BasicDragableThumb(avatarUrl, AVATARSIZE, text, + AVATARLABELMAXSIZE, false); final ClickHandler clickHand = new ClickHandler() { MenuDescriptor menu; @@ -163,7 +164,8 @@ return thumb; } - public SmallAvatarDecorator decorateAvatarWithXmppStatus(final String shortname, final BasicThumb thumb) { + public SmallAvatarDecorator decorateAvatarWithXmppStatus(final String shortname, + final BasicDragableThumb thumb) { final SmallAvatarDecorator decorator = avatarDecoratorProv.get(); decorator.setWidget(thumb); decorator.setItem(shortname); Modified: trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -23,12 +23,12 @@ import cc.kune.common.client.actions.ui.bind.GuiProvider; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.common.client.tooltip.Tooltip; -import cc.kune.common.client.ui.BasicThumb; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.avatar.SmallAvatarDecorator; import cc.kune.core.client.dnd.KuneDragController; import cc.kune.core.client.dnd.NotImplementedDropManager; import cc.kune.core.client.sn.GroupSNPresenter.GroupSNView; +import cc.kune.core.client.ui.BasicDragableThumb; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.gspace.client.GSpaceArmor; @@ -65,7 +65,8 @@ @Override public void addAdmin(final GroupDTO group, final String avatarUrl, final String tooltip, final String tooltipTitle, final GuiActionDescCollection menu) { - final BasicThumb thumb = createThumb(group.getShortName(), avatarUrl, tooltip, tooltipTitle, menu); + final BasicDragableThumb thumb = createThumb(group.getShortName(), avatarUrl, tooltip, tooltipTitle, + menu); firstCategoryFlow.add(group.isPersonal() ? (Widget) decorateAvatarWithXmppStatus( group.getShortName(), thumb) : thumb); } @@ -73,7 +74,8 @@ @Override public void addCollab(final GroupDTO group, final String avatarUrl, final String tooltip, final String tooltipTitle, final GuiActionDescCollection menu) { - final BasicThumb thumb = createThumb(group.getShortName(), avatarUrl, tooltip, tooltipTitle, menu); + final BasicDragableThumb thumb = createThumb(group.getShortName(), avatarUrl, tooltip, tooltipTitle, + menu); sndCategoryFlow.add(group.isPersonal() ? (Widget) decorateAvatarWithXmppStatus(group.getShortName(), thumb) : thumb); } @@ -81,7 +83,8 @@ @Override public void addPending(final GroupDTO group, final String avatarUrl, final String tooltip, final String tooltipTitle, final GuiActionDescCollection menu) { - final BasicThumb thumb = createThumb(group.getShortName(), avatarUrl, tooltip, tooltipTitle, menu); + final BasicDragableThumb thumb = createThumb(group.getShortName(), avatarUrl, tooltip, tooltipTitle, + menu); trdCategoryFlow.add(thumb); } Modified: trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -22,13 +22,13 @@ import cc.kune.common.client.actions.ui.ActionFlowPanel; import cc.kune.common.client.actions.ui.bind.GuiProvider; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; -import cc.kune.common.client.ui.BasicThumb; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.avatar.SmallAvatarDecorator; import cc.kune.core.client.dnd.KuneDragController; import cc.kune.core.client.dnd.NotImplementedDropManager; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.sn.UserSNPresenter.UserSNView; +import cc.kune.core.client.ui.BasicDragableThumb; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.UserSimpleDTO; import cc.kune.gspace.client.GSpaceArmor; @@ -76,7 +76,8 @@ @Override public void addBuddie(final UserSimpleDTO user, final String avatarUrl, final String tooltip, final String tooltipTitle, final GuiActionDescCollection menu) { - final BasicThumb thumb = createThumb(user.getShortName(), avatarUrl, tooltip, tooltipTitle, menu); + final BasicDragableThumb thumb = createThumb(user.getShortName(), avatarUrl, tooltip, tooltipTitle, + menu); firstCategoryFlow.add((Widget) decorateAvatarWithXmppStatus(user.getShortName(), thumb)); } Added: trunk/src/main/java/cc/kune/core/client/ui/BasicDragableThumb.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/BasicDragableThumb.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/ui/BasicDragableThumb.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -0,0 +1,20 @@ +package cc.kune.core.client.ui; + +import cc.kune.common.client.ui.BasicThumb; + +import com.allen_sauer.gwt.dnd.client.HasDragHandle; +import com.google.gwt.user.client.ui.Widget; + +public class BasicDragableThumb extends BasicThumb implements HasDragHandle { + + public BasicDragableThumb(final Object imageRef, final int imgSize, final String text, + final int textMaxLenght, final boolean crop) { + super(imageRef, imgSize, text, textMaxLenght, crop); + } + + @Override + public Widget getDragHandle() { + return getImage(); + } + +} Copied: trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed (from rev 1630, trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed) Modified: trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/AbstractTabbedDialog.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialog.java 2011-11-28 16:19:48 UTC (rev 1630) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/AbstractTabbedDialog.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.common.client.ui.dialogs.tabbed; +package cc.kune.core.client.ui.dialogs.tabbed; import cc.kune.common.client.notify.NotifyLevel; Modified: trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java 2011-11-28 16:19:48 UTC (rev 1630) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.common.client.ui.dialogs.tabbed; +package cc.kune.core.client.ui.dialogs.tabbed; import cc.kune.common.client.ProvidersCollection; import cc.kune.common.client.notify.NotifyLevel; @@ -25,7 +25,7 @@ import cc.kune.common.client.ui.dialogs.BasicTopDialog; import cc.kune.common.client.ui.dialogs.BasicTopDialog.Builder; import cc.kune.common.client.ui.dialogs.MessageToolbar; -import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter.AbstractTabbedDialogView; +import cc.kune.core.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter.AbstractTabbedDialogView; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; Modified: trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java 2011-11-28 16:19:48 UTC (rev 1630) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.common.client.ui.dialogs.tabbed; +package cc.kune.core.client.ui.dialogs.tabbed; import cc.kune.common.client.notify.NotifyLevel; Modified: trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/TabTitleGenerator.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/TabTitleGenerator.java 2011-11-28 16:19:48 UTC (rev 1630) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/TabTitleGenerator.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.common.client.ui.dialogs.tabbed; +package cc.kune.core.client.ui.dialogs.tabbed; import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.ui.IconLabel; Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -20,10 +20,10 @@ package cc.kune.gspace.client.i18n; import cc.kune.common.client.notify.NotifyLevelImages; -import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; import cc.kune.common.client.utils.SimpleCallback; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; import cc.kune.core.shared.dto.I18nLanguageSimpleDTO; import cc.kune.gspace.client.i18n.I18nTranslatorPresenter.I18nTranslatorView; Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPresenter.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -19,10 +19,10 @@ */ package cc.kune.gspace.client.i18n; -import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialog; -import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.state.Session; +import cc.kune.core.client.ui.dialogs.tabbed.AbstractTabbedDialog; +import cc.kune.core.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; import cc.kune.core.shared.dto.I18nLanguageDTO; import cc.kune.core.shared.dto.I18nLanguageSimpleDTO; import cc.kune.gspace.client.i18n.I18nTranslatorPresenter.I18nTranslatorView; @@ -41,7 +41,7 @@ } public interface I18nTranslatorView extends - cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter.AbstractTabbedDialogView { + cc.kune.core.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter.AbstractTabbedDialogView { void init(); Modified: trunk/src/main/java/cc/kune/gspace/client/options/EntityOptions.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/EntityOptions.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/options/EntityOptions.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -19,7 +19,7 @@ */ package cc.kune.gspace.client.options; -import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialog; +import cc.kune.core.client.ui.dialogs.tabbed.AbstractTabbedDialog; import com.google.gwt.user.client.ui.IsWidget; Modified: trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -19,7 +19,7 @@ */ package cc.kune.gspace.client.options; -import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter.AbstractTabbedDialogView; +import cc.kune.core.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter.AbstractTabbedDialogView; public interface EntityOptionsView extends AbstractTabbedDialogView { Modified: trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -21,9 +21,9 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.notify.NotifyLevelImages; -import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreMessages; +import cc.kune.core.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; import cc.kune.core.client.ws.entheader.EntityHeader; import cc.kune.gspace.client.options.GroupOptionsPresenter.GroupOptionsView; Modified: trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -24,7 +24,6 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; -import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; @@ -33,6 +32,7 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.client.state.UserSignOutEvent; import cc.kune.core.client.state.UserSignOutEvent.UserSignOutHandler; +import cc.kune.core.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.gspace.client.options.GroupOptionsPresenter.GroupOptionsView; Modified: trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -20,9 +20,9 @@ package cc.kune.gspace.client.options; import cc.kune.common.client.notify.NotifyLevelImages; -import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreMessages; +import cc.kune.core.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; import cc.kune.core.client.ws.entheader.EntityHeader; import cc.kune.gspace.client.options.UserOptionsPresenter.UserOptionsView; Modified: trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -23,7 +23,6 @@ import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; -import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.sitebar.SiteUserOptions; @@ -33,6 +32,7 @@ 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.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; import cc.kune.gspace.client.options.UserOptionsPresenter.UserOptionsView; import com.google.gwt.event.shared.EventBus; Modified: trunk/src/main/java/cc/kune/gspace/client/options/general/EntityOptGeneralPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/general/EntityOptGeneralPanel.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/options/general/EntityOptGeneralPanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -21,8 +21,8 @@ import cc.kune.common.client.ui.IconLabel; import cc.kune.common.client.ui.MaskWidget; -import cc.kune.common.client.ui.dialogs.tabbed.TabTitleGenerator; import cc.kune.core.client.ui.DefaultForm; +import cc.kune.core.client.ui.dialogs.tabbed.TabTitleGenerator; import cc.kune.gspace.client.options.EntityOptionsView; import com.extjs.gxt.ui.client.event.BaseEvent; Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -22,9 +22,9 @@ import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.ui.IconLabel; import cc.kune.common.client.ui.KuneWindowUtils; -import cc.kune.common.client.ui.dialogs.tabbed.TabTitleGenerator; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.ui.dialogs.tabbed.TabTitleGenerator; import cc.kune.core.shared.dto.LicenseDTO; import cc.kune.gspace.client.options.EntityOptionsView; Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -24,11 +24,11 @@ import gwtupload.client.IUploader.OnFinishUploaderHandler; import gwtupload.client.IUploader.OnStartUploaderHandler; import cc.kune.common.client.ui.IconLabel; -import cc.kune.common.client.ui.dialogs.tabbed.TabTitleGenerator; import cc.kune.common.client.utils.OnAcceptCallback; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.client.ui.dialogs.tabbed.TabTitleGenerator; import cc.kune.core.shared.FileConstants; import cc.kune.gspace.client.options.EntityOptionsView; Modified: trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -25,9 +25,9 @@ import gwtupload.client.IUploader.OnStartUploaderHandler; import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.ui.IconLabel; -import cc.kune.common.client.ui.dialogs.tabbed.TabTitleGenerator; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.ui.dialogs.tabbed.TabTitleGenerator; import cc.kune.gspace.client.options.EntityOptionsView; import cc.kune.gspace.client.options.logo.EntityUploaderForm; import cc.kune.gspace.client.themes.GSpaceThemeSelectorPanel; Modified: trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPanel.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -25,10 +25,10 @@ import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.ui.IconLabel; import cc.kune.common.client.ui.MaskWidget; -import cc.kune.common.client.ui.dialogs.tabbed.TabTitleGenerator; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.ui.DefaultForm; +import cc.kune.core.client.ui.dialogs.tabbed.TabTitleGenerator; import cc.kune.core.shared.dto.ToolSimpleDTO; import cc.kune.gspace.client.options.EntityOptionsView; Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -23,11 +23,11 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; -import cc.kune.common.client.ui.BasicThumb; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.dnd.FolderViewerDropController; import cc.kune.core.client.dnd.KuneDragController; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.core.client.ui.BasicDragableThumb; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.gspace.client.GSpaceArmor; @@ -74,10 +74,11 @@ super.clear(); } - public BasicThumb createThumb(final String text, final Object icon, final String tooltip, + public BasicDragableThumb createThumb(final String text, final Object icon, final String tooltip, final String tooltipTitle, final GuiActionDescCollection menuitems, final DoubleClickHandler doubleClickHandler) { - final BasicThumb thumb = new BasicThumb(icon, ICONSIZE, text, ICONLABELMAXSIZE, false); + final BasicDragableThumb thumb = new BasicDragableThumb(icon, ICONSIZE, text, ICONLABELMAXSIZE, + false); final MenuDescriptor menu = new MenuDescriptor(); menu.setStandalone(true); menu.putValue(AbstractGxtMenuGui.MENU_POSITION, AbstractGxtMenuGui.MenuPosition.bl);

1 0

19 Dec '11

Author: vjrj_ Date: 2011-12-19 22:49:18 +0100 (Mon, 19 Dec 2011) New Revision: 1639 Added: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/DropTarget.java trunk/src/main/java/cc/kune/common/client/events/ trunk/src/main/java/cc/kune/common/client/events/ProgressHideEvent.java trunk/src/main/java/cc/kune/common/client/events/ProgressShowEvent.java trunk/src/main/java/cc/kune/common/client/events/UserNotifyEvent.java trunk/src/main/java/cc/kune/common/client/resources/CommonResources.java trunk/src/main/java/cc/kune/common/client/resources/alert.png trunk/src/main/java/cc/kune/common/client/resources/error.png trunk/src/main/java/cc/kune/common/client/resources/important-32.png trunk/src/main/java/cc/kune/common/client/resources/important.png trunk/src/main/java/cc/kune/common/client/resources/info.png trunk/src/main/java/cc/kune/common/client/resources/kune-anim-g.gif trunk/src/main/java/cc/kune/common/client/resources/kune-anim.gif trunk/src/main/java/cc/kune/common/shared/ trunk/src/main/java/cc/kune/common/shared/i18n/ trunk/src/main/java/cc/kune/common/shared/i18n/HasRTL.java trunk/src/main/java/cc/kune/core/client/ExtendedGinModule.java trunk/src/main/java/cc/kune/core/client/ui/dialogs/ trunk/src/main/java/cc/kune/core/client/ui/dialogs/WizardFormDialog.java trunk/src/main/java/cc/kune/wave/client/WaveClientUtils.java Removed: trunk/src/main/java/cc/kune/common/client/ExtendedGinModule.java trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java trunk/src/main/java/cc/kune/core/client/dnd/DropTarget.java trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifyEvent.java trunk/src/main/java/cc/kune/core/client/notify/spiner/ProgressHideEvent.java trunk/src/main/java/cc/kune/core/client/notify/spiner/ProgressShowEvent.java trunk/src/main/java/cc/kune/core/client/resources/IconConstants.java trunk/src/main/java/cc/kune/core/client/resources/alert.png trunk/src/main/java/cc/kune/core/client/resources/error.png trunk/src/main/java/cc/kune/core/client/resources/important-32.png trunk/src/main/java/cc/kune/core/client/resources/important.png trunk/src/main/java/cc/kune/core/client/resources/info.png trunk/src/main/java/cc/kune/core/client/resources/kune-anim-g.gif trunk/src/main/java/cc/kune/core/client/resources/kune-anim.gif trunk/src/main/java/cc/kune/core/shared/i18n/ Modified: trunk/TODO trunk/script/server.sh trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java trunk/src/main/java/cc/kune/barters/client/actions/DelBartersMenuItem.java trunk/src/main/java/cc/kune/barters/client/actions/DelFolderMenuItem.java trunk/src/main/java/cc/kune/barters/client/actions/GoParentFolderBtn.java trunk/src/main/java/cc/kune/barters/client/actions/NewBartersBtn.java trunk/src/main/java/cc/kune/barters/client/actions/NewFolderBtn.java trunk/src/main/java/cc/kune/barters/client/actions/OpenBartersMenuItem.java trunk/src/main/java/cc/kune/barters/server/BarterServerTool.java trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java trunk/src/main/java/cc/kune/blogs/client/BlogsGinModule.java trunk/src/main/java/cc/kune/blogs/client/actions/DelBlogMenuItem.java trunk/src/main/java/cc/kune/blogs/client/actions/DelPostMenuItem.java trunk/src/main/java/cc/kune/blogs/client/actions/GoParentBlogBtn.java trunk/src/main/java/cc/kune/blogs/client/actions/NewBlogBtn.java trunk/src/main/java/cc/kune/blogs/client/actions/NewPostIconBtn.java trunk/src/main/java/cc/kune/blogs/client/actions/NewPostMenuItem.java trunk/src/main/java/cc/kune/blogs/client/actions/OpenBlogMenuItem.java trunk/src/main/java/cc/kune/blogs/server/BlogServerTool.java trunk/src/main/java/cc/kune/chat/client/AvatarDecoratorImpl.java trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java trunk/src/main/java/cc/kune/chat/client/ChatParts.java trunk/src/main/java/cc/kune/chat/client/KuneChatNotifier.java trunk/src/main/java/cc/kune/chat/client/KuneHablarSignals.java trunk/src/main/java/cc/kune/chat/client/MediumAvatarDecoratorImpl.java trunk/src/main/java/cc/kune/chat/client/SmallAvatarDecoratorImpl.java trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddyAction.java trunk/src/main/java/cc/kune/chat/client/actions/ChatAboutContentBtn.java trunk/src/main/java/cc/kune/chat/client/actions/ChatSitebarActions.java trunk/src/main/java/cc/kune/chat/client/actions/GoParentChatBtn.java trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java trunk/src/main/java/cc/kune/chat/client/actions/OpenChatAction.java trunk/src/main/java/cc/kune/chat/client/actions/OpenGroupPublicChatRoomAction.java trunk/src/main/java/cc/kune/chat/client/actions/OpenRoomArchiveMenuItem.java trunk/src/main/java/cc/kune/chat/client/actions/OpenRoomBtn.java trunk/src/main/java/cc/kune/chat/client/actions/OpenRoomMenuItem.java trunk/src/main/java/cc/kune/chat/client/actions/StartAssemblyWithMembers.java trunk/src/main/java/cc/kune/chat/client/actions/StartAssemblyWithMembersAction.java trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithMemberAction.java trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddyAction.java trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisPersonAction.java trunk/src/main/java/cc/kune/chat/server/ChatServerTool.java trunk/src/main/java/cc/kune/client/KuneGinjector.java trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSimpleGuiItem.java trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractComposedGuiItem.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/client/actions/ui/ActionSimplePanel.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java trunk/src/main/java/cc/kune/common/client/notify/NotifyLevelImages.java trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java trunk/src/main/java/cc/kune/common/client/ui/DottedTab.ui.xml trunk/src/main/java/cc/kune/common/client/ui/MaskWidget.ui.xml trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.ui.xml trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialog.java trunk/src/main/java/cc/kune/common/shared/i18n/I18nTranslationService.java trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/actions/xml/AddGadgetAction.java trunk/src/main/java/cc/kune/core/client/actions/xml/NewGadgetAction.java trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java trunk/src/main/java/cc/kune/core/client/auth/AnonUsersManager.java trunk/src/main/java/cc/kune/core/client/auth/RegisterForm.java trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java trunk/src/main/java/cc/kune/core/client/auth/SignInForm.java trunk/src/main/java/cc/kune/core/client/auth/SignInNewForm.java trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java trunk/src/main/java/cc/kune/core/client/auth/UserFieldFactory.java trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarImpl.java trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPanel.java trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPresenter.java trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java trunk/src/main/java/cc/kune/core/client/dnd/NotAllowedDropController.java trunk/src/main/java/cc/kune/core/client/dnd/NotImplementedDropController.java trunk/src/main/java/cc/kune/core/client/dnd/NotImplementedDropManager.java trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/GroupFieldFactory.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierPresenter.java trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierViewImpl.java trunk/src/main/java/cc/kune/core/client/notify/spiner/SpinerPresenter.java trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java trunk/src/main/java/cc/kune/core/client/resources/core.css trunk/src/main/java/cc/kune/core/client/services/ImageUtils.java trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.java trunk/src/main/java/cc/kune/core/client/sitebar/ErrorsDialog.java trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPanel.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/UserSNPresenter.java trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/AddEntityToThisGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/GotoPersonAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/GotoYourHomePageAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/MembersModerationAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/MembersVisibilityAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/SNRolAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/UserSNVisibilityAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAdmins.java trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToMembers.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNAdminsMenuItemsRegistry.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNCollabsMenuItemsRegistry.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNMenuItemsRegistry.java trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java trunk/src/main/java/cc/kune/core/client/ui/ContentPosition.java trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPanel.java trunk/src/main/java/cc/kune/core/server/AbstractServerTool.java trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java trunk/src/main/java/cc/kune/core/server/manager/file/EntityBackgroundUploadManager.java trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoUploadManager.java trunk/src/main/java/cc/kune/core/server/manager/file/FileJsonUploadManagerAbstract.java trunk/src/main/java/cc/kune/core/server/manager/file/FileUploadManager.java trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java trunk/src/main/java/cc/kune/docs/client/DocsGinModule.java trunk/src/main/java/cc/kune/docs/client/actions/DelDocMenuItem.java trunk/src/main/java/cc/kune/docs/client/actions/DelFolderMenuItem.java trunk/src/main/java/cc/kune/docs/client/actions/GoParentFolderBtn.java trunk/src/main/java/cc/kune/docs/client/actions/NewDocIconBtn.java trunk/src/main/java/cc/kune/docs/client/actions/NewDocMenuItem.java trunk/src/main/java/cc/kune/docs/client/actions/NewFolderBtn.java trunk/src/main/java/cc/kune/docs/client/actions/NewFolderMenuItem.java trunk/src/main/java/cc/kune/docs/client/actions/OpenDocMenuItem.java trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java trunk/src/main/java/cc/kune/events/client/EventsClientTool.java trunk/src/main/java/cc/kune/events/client/EventsGinModule.java trunk/src/main/java/cc/kune/events/client/actions/Calendar1DayViewSelectBtn.java trunk/src/main/java/cc/kune/events/client/actions/Calendar3DaysViewSelectBtn.java trunk/src/main/java/cc/kune/events/client/actions/Calendar7DaysViewSelectBtn.java trunk/src/main/java/cc/kune/events/client/actions/CalendarGoNextBtn.java trunk/src/main/java/cc/kune/events/client/actions/CalendarGoPrevBtn.java trunk/src/main/java/cc/kune/events/client/actions/CalendarGoTodayBtn.java trunk/src/main/java/cc/kune/events/client/actions/CalendarMonthViewSelectBtn.java trunk/src/main/java/cc/kune/events/client/actions/DelMeetingMenuItem.java trunk/src/main/java/cc/kune/events/client/actions/GoParentFolderBtn.java trunk/src/main/java/cc/kune/events/client/actions/NewMeetingBtn.java trunk/src/main/java/cc/kune/events/client/actions/OpenMeetingMenuItem.java trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPanel.java trunk/src/main/java/cc/kune/events/server/EventsServerTool.java trunk/src/main/java/cc/kune/gallery/server/GalleryServerTool.java trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java trunk/src/main/java/cc/kune/gspace/client/actions/AbstractNewMenu.java trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java trunk/src/main/java/cc/kune/gspace/client/actions/DelContentMenuItem.java trunk/src/main/java/cc/kune/gspace/client/actions/GoParentContainerBtn.java trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerMenuItem.java trunk/src/main/java/cc/kune/gspace/client/actions/NewContentAction.java trunk/src/main/java/cc/kune/gspace/client/actions/NewContentBtn.java trunk/src/main/java/cc/kune/gspace/client/actions/NewContentMenuItem.java trunk/src/main/java/cc/kune/gspace/client/actions/OpenContentMenuItem.java trunk/src/main/java/cc/kune/gspace/client/actions/ParticipateInContentBtn.java trunk/src/main/java/cc/kune/gspace/client/actions/RefreshContentMenuItem.java trunk/src/main/java/cc/kune/gspace/client/actions/RenameAction.java trunk/src/main/java/cc/kune/gspace/client/actions/SetAsHomePageMenuItem.java trunk/src/main/java/cc/kune/gspace/client/actions/SetContentStatusAsAdminMenuItem.java trunk/src/main/java/cc/kune/gspace/client/i18n/AbstractLanguageSelectorPanel.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nToTranslateGridPanel.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslateRecomendPanel.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatedGridPanel.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorPanel.java trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorWithoutEnglishPanel.java trunk/src/main/java/cc/kune/gspace/client/i18n/SiteOptionsI18nTranslatorAction.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseChangeAction.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardPanel.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFirstForm.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFlags.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFrdForm.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardSndForm.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardTrdForm.java trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/general/GroupOptGeneralPanel.java trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptGeneralPanel.java trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptPassPanel.java trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptPassPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicensePanel.java trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicensePanel.java trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoPanel.java trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoPanel.java trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePresenter.java trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePanel.java trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePresenter.java trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePanel.java trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePresenter.java trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPanel.java trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPanel.java trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPanel.java trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPresenter.java trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPanel.java trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPanel.java trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPresenter.java trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/ContentTitleWidget.java trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerUtils.java trunk/src/main/java/cc/kune/gspace/client/viewers/NoHomePageViewer.java trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java trunk/src/main/java/cc/kune/hspace/client/HSpacePresenter.java trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java trunk/src/main/java/cc/kune/lists/client/ListsGinModule.java trunk/src/main/java/cc/kune/lists/client/actions/DelListMenuItem.java trunk/src/main/java/cc/kune/lists/client/actions/DelPostMenuItem.java trunk/src/main/java/cc/kune/lists/client/actions/GoParentFolderBtn.java trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java trunk/src/main/java/cc/kune/lists/client/actions/NewListBtn.java trunk/src/main/java/cc/kune/lists/client/actions/NewListMenuItem.java trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java trunk/src/main/java/cc/kune/lists/client/actions/NewListPostIconBtn.java trunk/src/main/java/cc/kune/lists/client/actions/NewListPostIconMenuItem.java trunk/src/main/java/cc/kune/lists/client/actions/OpenFolderMenuItem.java trunk/src/main/java/cc/kune/lists/client/actions/RefreshListMenuItem.java trunk/src/main/java/cc/kune/lists/client/actions/SetListOpenessAction.java trunk/src/main/java/cc/kune/lists/client/actions/SetListOpenessMenuItem.java trunk/src/main/java/cc/kune/lists/client/actions/ShowSubscribersOfListBtn.java trunk/src/main/java/cc/kune/lists/client/actions/SubscribeToListBtn.java trunk/src/main/java/cc/kune/lists/client/actions/SubscriteToListAction.java trunk/src/main/java/cc/kune/lists/server/ListsServerTool.java trunk/src/main/java/cc/kune/pspace/client/PSpaceInDevelopment.java trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java trunk/src/main/java/cc/kune/tasks/client/TasksGinModule.java trunk/src/main/java/cc/kune/tasks/client/actions/DelFolderMenuItem.java trunk/src/main/java/cc/kune/tasks/client/actions/GoParentFolderBtn.java trunk/src/main/java/cc/kune/tasks/client/actions/MarkAsDoneTaskMenuItem.java trunk/src/main/java/cc/kune/tasks/client/actions/MarkAsNotDoneTaskMenuItem.java trunk/src/main/java/cc/kune/tasks/client/actions/NewFolderBtn.java trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskIconBtn.java trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskMenuItem.java trunk/src/main/java/cc/kune/tasks/client/actions/OpenFolderMenuItem.java trunk/src/main/java/cc/kune/tasks/server/TaskServerTool.java trunk/src/main/java/cc/kune/wave/client/KuneParticipantController.java trunk/src/main/java/cc/kune/wave/client/KuneStagesProvider.java trunk/src/main/java/cc/kune/wave/client/WaveGinModule.java trunk/src/main/java/cc/kune/wave/client/WaveStatusIndicator.java trunk/src/main/java/cc/kune/wave/client/WebClient.java trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPanel.java trunk/src/main/java/cc/kune/wave/server/KuneAgent.java trunk/src/main/java/cc/kune/wave/server/KuneWaveService.java trunk/src/main/java/cc/kune/wave/server/KuneWaveServiceDefault.java trunk/src/main/java/cc/kune/wiki/client/WikiGinModule.java trunk/src/main/java/cc/kune/wiki/client/actions/DelFolderMenuItem.java trunk/src/main/java/cc/kune/wiki/client/actions/DelWikiMenuItem.java trunk/src/main/java/cc/kune/wiki/client/actions/GoParentFolderBtn.java trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderMenuItem.java trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiIconBtn.java trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiMenuItem.java trunk/src/main/java/cc/kune/wiki/client/actions/OpenWikiMenuItem.java trunk/src/main/java/cc/kune/wiki/server/WikiServerTool.java trunk/src/main/java/com/example/client/HelloWorldActions.java trunk/src/main/resources/wave-server.properties trunk/src/test/java/cc/kune/core/server/manager/I18nManagerDefaultTest.java trunk/src/test/java/cc/kune/selenium/spaces/UserSpacePageObject.java trunk/src/test/java/cc/kune/wave/server/KuneWaveServiceDefaultTest.java Log: Some refactorization for calendar tool Modified: trunk/TODO =================================================================== --- trunk/TODO 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/TODO 2011-12-19 21:49:18 UTC (rev 1639) @@ -12,11 +12,13 @@ nick == assigned to * SHORT-TERM (URGENT) -** Reu FLOSS Ocuppy 10pm EST - DEADLINE: <2011-11-16 mié 9pm EST> ** group.inexistentTool nasty error ** calendar support *** gwt-cal + http://ical4j.sourceforge.net/introduction.html +*** add --> event --> rpc --> gadget + wave +*** modification --> event ---> rpc gadget + wave +*** delete ---> ? +*** get --> list<waveref> ---> list<app> ** i18n usecase | logged | locale in URL | i18n supported | useDB | | false | false | false | true | Modified: trunk/script/server.sh =================================================================== --- trunk/script/server.sh 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/script/server.sh 2011-12-19 21:49:18 UTC (rev 1639) @@ -8,6 +8,7 @@ Options: -j <jar file> : runs jar file generated via mvn assembly:assembly + or adding -Dgwt.compiler.skip=true to skip compilation -a: run as a daemon (only root user) -l LOGLEVEL : IGNORE|DEBUG|INFO|WARN Modified: trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -23,9 +23,9 @@ import static cc.kune.barters.shared.BartersConstants.TYPE_BARTER; import static cc.kune.barters.shared.BartersConstants.TYPE_FOLDER; import static cc.kune.barters.shared.BartersConstants.TYPE_ROOT; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; Modified: trunk/src/main/java/cc/kune/barters/client/actions/DelBartersMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/actions/DelBartersMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/barters/client/actions/DelBartersMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.barters.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.DelContentMenuItem; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/barters/client/actions/DelFolderMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/actions/DelFolderMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/barters/client/actions/DelFolderMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.barters.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.DelContainerMenuItem; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/barters/client/actions/GoParentFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/actions/GoParentFolderBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/barters/client/actions/GoParentFolderBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,9 +20,9 @@ package cc.kune.barters.client.actions; import cc.kune.barters.shared.BartersConstants; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.GoParentContainerBtn; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/barters/client/actions/NewBartersBtn.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/actions/NewBartersBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/barters/client/actions/NewBartersBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,8 +21,8 @@ import cc.kune.barters.shared.BartersConstants; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.NewContentAction; import cc.kune.gspace.client.actions.NewContentBtn; Modified: trunk/src/main/java/cc/kune/barters/client/actions/NewFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/actions/NewFolderBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/barters/client/actions/NewFolderBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.barters.client.actions; import cc.kune.barters.shared.BartersConstants; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.NewContainerBtn; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/barters/client/actions/OpenBartersMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/actions/OpenBartersMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/barters/client/actions/OpenBartersMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.barters.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.OpenContentMenuItem; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/barters/server/BarterServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/barters/server/BarterServerTool.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/barters/server/BarterServerTool.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -29,6 +29,7 @@ import java.util.Arrays; import java.util.Date; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.server.AbstractServerTool; import cc.kune.core.server.content.ContainerManager; import cc.kune.core.server.content.ContentManager; @@ -39,7 +40,6 @@ import cc.kune.core.server.utils.UrlUtils; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.domain.GroupListMode; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.AccessLists; import cc.kune.domain.Container; import cc.kune.domain.Content; Modified: trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -25,9 +25,9 @@ import static cc.kune.blogs.shared.BlogsConstants.TYPE_ROOT; import static cc.kune.blogs.shared.BlogsConstants.TYPE_UPLOADEDFILE; import cc.kune.blogs.shared.BlogsConstants; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; Modified: trunk/src/main/java/cc/kune/blogs/client/BlogsGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/BlogsGinModule.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/blogs/client/BlogsGinModule.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,7 +22,7 @@ import cc.kune.blogs.client.actions.BlogsClientActions; import cc.kune.blogs.client.actions.BlogsNewMenu; import cc.kune.blogs.client.actions.PostNewMenu; -import cc.kune.common.client.ExtendedGinModule; +import cc.kune.core.client.ExtendedGinModule; public class BlogsGinModule extends ExtendedGinModule { Modified: trunk/src/main/java/cc/kune/blogs/client/actions/DelBlogMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/DelBlogMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/blogs/client/actions/DelBlogMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.blogs.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.DelContainerMenuItem; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/blogs/client/actions/DelPostMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/DelPostMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/blogs/client/actions/DelPostMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.blogs.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.DelContentMenuItem; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/blogs/client/actions/GoParentBlogBtn.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/GoParentBlogBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/blogs/client/actions/GoParentBlogBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,9 +20,9 @@ package cc.kune.blogs.client.actions; import cc.kune.blogs.shared.BlogsConstants; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.GoParentContainerBtn; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/blogs/client/actions/NewBlogBtn.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/NewBlogBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/blogs/client/actions/NewBlogBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.blogs.client.actions; import cc.kune.blogs.shared.BlogsConstants; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.NewContainerBtn; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/blogs/client/actions/NewPostIconBtn.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/NewPostIconBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/blogs/client/actions/NewPostIconBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,8 +21,8 @@ import cc.kune.blogs.shared.BlogsConstants; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.NewContentAction; import cc.kune.gspace.client.actions.NewContentBtn; Modified: trunk/src/main/java/cc/kune/blogs/client/actions/NewPostMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/NewPostMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/blogs/client/actions/NewPostMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,8 +21,8 @@ import cc.kune.blogs.shared.BlogsConstants; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.NewContentAction; import cc.kune.gspace.client.actions.NewContentMenuItem; Modified: trunk/src/main/java/cc/kune/blogs/client/actions/OpenBlogMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/OpenBlogMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/blogs/client/actions/OpenBlogMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.blogs.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.OpenContentMenuItem; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/blogs/server/BlogServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/server/BlogServerTool.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/blogs/server/BlogServerTool.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -28,13 +28,13 @@ import java.util.Arrays; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.server.AbstractServerTool; import cc.kune.core.server.content.ContainerManager; import cc.kune.core.server.content.ContentManager; import cc.kune.core.server.content.CreationService; import cc.kune.core.server.manager.ToolConfigurationManager; import cc.kune.core.server.tool.ServerToolTarget; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.Container; import cc.kune.domain.Group; import cc.kune.domain.I18nLanguage; Modified: trunk/src/main/java/cc/kune/chat/client/AvatarDecoratorImpl.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/AvatarDecoratorImpl.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/client/AvatarDecoratorImpl.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,8 +21,8 @@ import cc.kune.common.client.ui.AbstractDecorator; import cc.kune.common.client.utils.TextUtils; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.avatar.AvatarDecorator; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.emite.core.client.events.StateChangedEvent; import com.calclab.emite.core.client.events.StateChangedHandler; Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -39,6 +39,7 @@ import cc.kune.common.client.utils.SimpleResponseCallback; import cc.kune.common.client.utils.TextUtils; import cc.kune.common.client.utils.WindowUtils; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.events.AvatarChangedEvent; import cc.kune.core.client.events.NewUserRegisteredEvent; import cc.kune.core.client.init.AppStartEvent; @@ -52,7 +53,6 @@ import cc.kune.core.client.state.UserSignOutEvent; import cc.kune.core.client.state.UserSignOutEvent.UserSignOutHandler; import cc.kune.core.shared.dto.UserInfoDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.emite.core.client.xmpp.session.XmppSession; import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; Modified: trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,7 +22,7 @@ import cc.kune.chat.client.actions.AddAsBuddieHeaderButton; import cc.kune.chat.client.actions.ChatClientActions; import cc.kune.chat.client.actions.ChatSitebarActions; -import cc.kune.common.client.ExtendedGinModule; +import cc.kune.core.client.ExtendedGinModule; import cc.kune.core.client.avatar.MediumAvatarDecorator; import cc.kune.core.client.avatar.SmallAvatarDecorator; import cc.kune.core.client.sn.SimpleContactManager; Modified: trunk/src/main/java/cc/kune/chat/client/ChatParts.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatParts.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/client/ChatParts.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -33,6 +33,7 @@ import cc.kune.common.client.actions.PropertyChangeEvent; import cc.kune.common.client.actions.PropertyChangeListener; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.init.AppStartEvent.AppStartHandler; import cc.kune.core.client.sn.GroupSNPresenter; @@ -50,7 +51,6 @@ import cc.kune.core.client.sn.actions.registry.GroupSNPendingsMenuItemsRegistry; import cc.kune.core.client.sn.actions.registry.UserSNMenuItemsRegistry; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.tool.ContentViewerSelector; import cc.kune.gspace.client.viewers.FolderViewerPresenter; Modified: trunk/src/main/java/cc/kune/chat/client/KuneChatNotifier.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/KuneChatNotifier.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/client/KuneChatNotifier.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.chat.client; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.hablar.signals.client.notifications.HablarNotifier; import com.google.gwt.event.dom.client.ClickEvent; Modified: trunk/src/main/java/cc/kune/chat/client/KuneHablarSignals.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/KuneHablarSignals.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/client/KuneHablarSignals.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.chat.client; import cc.kune.chat.client.ChatClientDefault.ChatClientAction; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.emite.core.client.xmpp.session.XmppSession; import com.calclab.emite.xep.storage.client.PrivateStorageManager; Modified: trunk/src/main/java/cc/kune/chat/client/MediumAvatarDecoratorImpl.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/MediumAvatarDecoratorImpl.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/client/MediumAvatarDecoratorImpl.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,9 +19,9 @@ */ package cc.kune.chat.client; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.avatar.MediumAvatarDecorator; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/chat/client/SmallAvatarDecoratorImpl.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/SmallAvatarDecoratorImpl.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/client/SmallAvatarDecoratorImpl.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,9 +19,9 @@ */ package cc.kune.chat.client; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.avatar.SmallAvatarDecorator; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -28,6 +28,7 @@ import cc.kune.common.client.actions.PropertyChangeEvent; import cc.kune.common.client.actions.PropertyChangeListener; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; @@ -36,7 +37,6 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.client.ws.entheader.EntityHeader; import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.emite.im.client.roster.events.RosterItemChangedEvent; import com.calclab.emite.im.client.roster.events.RosterItemChangedHandler; Modified: trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddyAction.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddyAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddyAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -24,12 +24,12 @@ 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.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.UserSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/chat/client/actions/ChatAboutContentBtn.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/ChatAboutContentBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/client/actions/ChatAboutContentBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -24,12 +24,12 @@ import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.SimpleResponseCallback; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.RolAction; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/chat/client/actions/ChatSitebarActions.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/ChatSitebarActions.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/client/actions/ChatSitebarActions.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -33,11 +33,11 @@ import cc.kune.common.client.actions.ui.descrip.MenuRadioItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuSeparatorDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuTitleItemDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.events.WindowFocusEvent; import cc.kune.core.client.sitebar.SiteUserOptions; import cc.kune.core.client.sitebar.SiteUserOptionsPresenter; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.emite.core.client.events.StateChangedEvent; import com.calclab.emite.core.client.events.StateChangedHandler; Modified: trunk/src/main/java/cc/kune/chat/client/actions/GoParentChatBtn.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/GoParentChatBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/client/actions/GoParentChatBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,9 +20,9 @@ package cc.kune.chat.client.actions; import cc.kune.chat.shared.ChatConstants; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.GoParentContainerBtn; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -25,6 +25,7 @@ import cc.kune.common.client.ui.dialogs.PromptTopDialog; import cc.kune.common.client.ui.dialogs.PromptTopDialog.Builder; import cc.kune.common.client.utils.TextUtils; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.RolAction; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.resources.nav.NavResources; @@ -35,7 +36,6 @@ import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.StateContainerDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; Modified: trunk/src/main/java/cc/kune/chat/client/actions/OpenChatAction.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/OpenChatAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/client/actions/OpenChatAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,6 +22,7 @@ import cc.kune.chat.client.ChatClient; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.notify.NotifyLevel; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.RolAction; import cc.kune.core.client.auth.SignIn; import cc.kune.core.client.state.Session; @@ -31,7 +32,6 @@ import cc.kune.core.shared.dto.AbstractContentSimpleDTO; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.StateContainerDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/chat/client/actions/OpenGroupPublicChatRoomAction.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/OpenGroupPublicChatRoomAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/client/actions/OpenGroupPublicChatRoomAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -27,6 +27,7 @@ import cc.kune.chat.client.resources.ChatResources; import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.RolActionAutoUpdated; import cc.kune.core.client.state.AccessRightsClientManager; import cc.kune.core.client.state.Session; @@ -37,7 +38,6 @@ import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.SocialNetworkDTO; import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; import com.calclab.emite.im.client.chat.ChatStates; Modified: trunk/src/main/java/cc/kune/chat/client/actions/OpenRoomArchiveMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/OpenRoomArchiveMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/client/actions/OpenRoomArchiveMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.chat.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.OpenContentMenuItem; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/chat/client/actions/OpenRoomBtn.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/OpenRoomBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/client/actions/OpenRoomBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.chat.client.actions; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/chat/client/actions/OpenRoomMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/OpenRoomMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/client/actions/OpenRoomMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.chat.client.actions; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/chat/client/actions/StartAssemblyWithMembers.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/StartAssemblyWithMembers.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/client/actions/StartAssemblyWithMembers.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.chat.client.actions; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.sn.actions.registry.GroupSNConfActions; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/chat/client/actions/StartAssemblyWithMembersAction.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/StartAssemblyWithMembersAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/client/actions/StartAssemblyWithMembersAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -27,12 +27,12 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.SimpleResponseCallback; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.state.AccessRightsClientManager; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.i18n.client.DateTimeFormat; import com.google.gwt.i18n.client.DateTimeFormat.PredefinedFormat; Modified: trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithMemberAction.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithMemberAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithMemberAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -24,10 +24,10 @@ import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.UserSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddyAction.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddyAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddyAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.chat.client.actions; import cc.kune.chat.client.ChatClient; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisPersonAction.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisPersonAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisPersonAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.chat.client.actions; import cc.kune.chat.client.ChatClient; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/chat/server/ChatServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/chat/server/ChatServerTool.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/chat/server/ChatServerTool.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -27,13 +27,13 @@ import java.util.Arrays; import java.util.Collections; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.server.AbstractServerTool; import cc.kune.core.server.content.ContainerManager; import cc.kune.core.server.content.ContentManager; import cc.kune.core.server.content.CreationService; import cc.kune.core.server.manager.ToolConfigurationManager; import cc.kune.core.server.tool.ServerToolTarget; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.Container; import cc.kune.domain.Group; import cc.kune.domain.User; Modified: trunk/src/main/java/cc/kune/client/KuneGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -29,6 +29,7 @@ import cc.kune.common.client.actions.ui.bind.GuiProvider; import cc.kune.common.client.log.EventBusWithLogging; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.CoreGinModule; import cc.kune.core.client.CoreParts; import cc.kune.core.client.actions.xml.XMLActionsParser; @@ -51,7 +52,6 @@ import cc.kune.core.client.sub.SubtitlesManager; import cc.kune.core.client.ws.CorePresenter; import cc.kune.core.client.ws.entheader.EntityHeaderPresenter; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.docs.client.DocsGinModule; import cc.kune.docs.client.DocsGinjector; import cc.kune.events.client.EventsGinModule; Modified: trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml 2011-12-19 21:49:18 UTC (rev 1639) @@ -1,17 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <module>  - <inherits name='com.google.gwt.user.User' /> + <inherits name='com.google.gwt.user.User'/>     + <source path="shared"/> <source path='client' - excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> - <public path="public" /> - <inherits name='org.cobogw.gwt.user.User' /> - <inherits name='com.google.gwt.inject.Inject' /> - <inherits name="com.extjs.gxt.ui.GXT" /> - <stylesheet src="kune-common.css" /> + excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> + <public path="public"/> + <inherits name='org.cobogw.gwt.user.User'/> + <inherits name='com.google.gwt.inject.Inject'/> + <inherits name="com.extjs.gxt.ui.GXT"/> + <stylesheet src="kune-common.css"/> </module> \ No newline at end of file Deleted: trunk/src/main/java/cc/kune/common/client/ExtendedGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ExtendedGinModule.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/common/client/ExtendedGinModule.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -1,39 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.common.client; - -import com.google.inject.Singleton; -import com.gwtplatform.mvp.client.gin.AbstractPresenterModule; - -public abstract class ExtendedGinModule extends AbstractPresenterModule { - - protected void eagle(final Class<?> type) { - bind(type).asEagerSingleton(); - } - - protected void s(final Class<?> type) { - bind(type).in(Singleton.class); - } - - protected <V, W> void s(final Class<V> type, final Class<? extends V> typeImpl) { - bind(type).to(typeImpl).in(Singleton.class); - } - -} Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -33,7 +33,7 @@ import cc.kune.common.client.actions.ui.descrip.MenuRadioItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuTitleItemDescriptor; import cc.kune.common.client.errors.UIException; -import cc.kune.common.client.resources.CommonIconResources; +import cc.kune.common.client.resources.CommonResources; import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.ui.IconLabel; @@ -47,7 +47,7 @@ private IconLabel iconLabel; private GwtBaseMenuItem item; - private final CommonIconResources res = CommonIconResources.INSTANCE; + private final CommonResources res = CommonResources.INSTANCE; private void confCheckListener(final MenuCheckItemDescriptor descriptor, final GwtCheckItem checkItem) { descriptor.addPropertyChangeListener(new PropertyChangeListener() { Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSimpleGuiItem.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSimpleGuiItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSimpleGuiItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,7 +22,7 @@ import cc.kune.common.client.actions.ui.AbstractComposedGuiItem; import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.bind.GuiProvider; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.HasRTL; import com.google.gwt.user.client.ui.HorizontalPanel; @@ -30,7 +30,7 @@ private final HorizontalPanel bar; - public GwtSimpleGuiItem(final GuiProvider provider, final I18nTranslationService i18n) { + public GwtSimpleGuiItem(final GuiProvider provider, final HasRTL i18n) { super(provider, i18n); bar = new HorizontalPanel(); initWidget(bar); Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractComposedGuiItem.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractComposedGuiItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractComposedGuiItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -28,16 +28,16 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.HasChilds; import cc.kune.common.client.errors.UIException; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.HasRTL; import com.google.gwt.user.client.ui.Composite; public abstract class AbstractComposedGuiItem extends Composite implements IsActionExtensible { private final GuiProvider bindings; private GuiActionDescCollection guiItems; - private final I18nTranslationService i18n; + private final HasRTL i18n; - public AbstractComposedGuiItem(final GuiProvider bindings, final I18nTranslationService i18n) { + public AbstractComposedGuiItem(final GuiProvider bindings, final HasRTL i18n) { super(); this.bindings = bindings; this.i18n = i18n; 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-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -25,11 +25,10 @@ import cc.kune.common.client.actions.PropertyChangeEvent; import cc.kune.common.client.actions.PropertyChangeListener; import cc.kune.common.client.actions.ui.bind.GuiBinding; +import cc.kune.common.client.actions.ui.descrip.DropTarget; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.errors.NotImplementedException; import cc.kune.common.client.utils.TextUtils; -import cc.kune.core.client.dnd.DropTarget; -import cc.kune.core.client.resources.IconConstants; import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.ui.Composite; @@ -154,7 +153,7 @@ protected abstract void setIconBackground(String backgroundColor); public void setIconResource(final ImageResource icon) { - setIconStyle((IconConstants.CSS_SUFFIX + icon.getName())); + setIconStyle(("k-icon-" + icon.getName())); } protected abstract void setIconStyle(String style); 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-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/ActionFlowPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,7 +20,7 @@ package cc.kune.common.client.actions.ui; import cc.kune.common.client.actions.ui.bind.GuiProvider; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.HasRTL; import com.google.gwt.user.client.ui.FlowPanel; import com.google.inject.Inject; @@ -30,7 +30,7 @@ private final FlowPanel bar; @Inject - public ActionFlowPanel(final GuiProvider guiProvider, final I18nTranslationService i18n) { + public ActionFlowPanel(final GuiProvider guiProvider, final HasRTL i18n) { super(guiProvider, i18n); bar = new FlowPanel(); initWidget(bar); Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/ActionSimplePanel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/ActionSimplePanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/ActionSimplePanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,7 +20,7 @@ package cc.kune.common.client.actions.ui; import cc.kune.common.client.actions.ui.bind.GuiProvider; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.HasRTL; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.inject.Inject; @@ -30,7 +30,7 @@ private final HorizontalPanel bar; @Inject - public ActionSimplePanel(final GuiProvider guiProvider, final I18nTranslationService i18n) { + public ActionSimplePanel(final GuiProvider guiProvider, final HasRTL i18n) { super(guiProvider, i18n); bar = new HorizontalPanel(); initWidget(bar); Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -27,7 +27,6 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ChangeableObject; import cc.kune.common.client.actions.KeyStroke; -import cc.kune.core.client.dnd.DropTarget; import com.google.gwt.i18n.client.HasDirection.Direction; Copied: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/DropTarget.java (from rev 1630, trunk/src/main/java/cc/kune/core/client/dnd/DropTarget.java) =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/DropTarget.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/DropTarget.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -0,0 +1,28 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.common.client.actions.ui.descrip; + +import com.google.gwt.user.client.ui.Widget; + +public interface DropTarget { + + void init(Widget dropTarget); + +} Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -23,7 +23,6 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.KeyStroke; import cc.kune.common.client.actions.PropertyChangeListener; -import cc.kune.core.client.dnd.DropTarget; import com.google.gwt.i18n.client.HasDirection.Direction; Copied: trunk/src/main/java/cc/kune/common/client/events/ProgressHideEvent.java (from rev 1630, trunk/src/main/java/cc/kune/core/client/notify/spiner/ProgressHideEvent.java) =================================================================== --- trunk/src/main/java/cc/kune/common/client/events/ProgressHideEvent.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/events/ProgressHideEvent.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -0,0 +1,81 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.common.client.events; + +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 ProgressHideEvent extends GwtEvent<ProgressHideEvent.ProgressHideHandler> { + + public interface HasProgressHideHandlers extends HasHandlers { + HandlerRegistration addProgressHideHandler(ProgressHideHandler handler); + } + + public interface ProgressHideHandler extends EventHandler { + public void onProgressHide(ProgressHideEvent event); + } + + private static final Type<ProgressHideHandler> TYPE = new Type<ProgressHideHandler>(); + + public static void fire(final HasHandlers source) { + source.fireEvent(new ProgressHideEvent()); + } + + public static Type<ProgressHideHandler> getType() { + return TYPE; + } + + public ProgressHideEvent() { + } + + @Override + protected void dispatch(final ProgressHideHandler handler) { + handler.onProgressHide(this); + } + + @Override + public boolean equals(final Object other) { + if (other != null && other.getClass().equals(this.getClass())) { + final ProgressHideEvent o = (ProgressHideEvent) other; + return true; + } + return false; + } + + @Override + public Type<ProgressHideHandler> getAssociatedType() { + return TYPE; + } + + @Override + public int hashCode() { + int hashCode = 23; + hashCode = (hashCode * 37) + getClass().hashCode(); + return hashCode; + } + + @Override + public String toString() { + return "ProgressHideEvent[" + "]"; + } + +} Copied: trunk/src/main/java/cc/kune/common/client/events/ProgressShowEvent.java (from rev 1630, trunk/src/main/java/cc/kune/core/client/notify/spiner/ProgressShowEvent.java) =================================================================== --- trunk/src/main/java/cc/kune/common/client/events/ProgressShowEvent.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/events/ProgressShowEvent.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -0,0 +1,93 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.common.client.events; + +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 ProgressShowEvent extends GwtEvent<ProgressShowEvent.ProgressShowHandler> { + + public interface HasProgressShowHandlers extends HasHandlers { + HandlerRegistration addProgressShowHandler(ProgressShowHandler handler); + } + + public interface ProgressShowHandler extends EventHandler { + public void onProgressShow(ProgressShowEvent event); + } + + private static final Type<ProgressShowHandler> TYPE = new Type<ProgressShowHandler>(); + + public static void fire(final HasHandlers source, final java.lang.String message) { + source.fireEvent(new ProgressShowEvent(message)); + } + + public static Type<ProgressShowHandler> getType() { + return TYPE; + } + + private final java.lang.String message; + + public ProgressShowEvent() { + this(""); + } + + public ProgressShowEvent(final java.lang.String message) { + this.message = message; + } + + @Override + protected void dispatch(final ProgressShowHandler handler) { + handler.onProgressShow(this); + } + + @Override + public boolean equals(final Object other) { + if (other != null && other.getClass().equals(this.getClass())) { + final ProgressShowEvent o = (ProgressShowEvent) other; + return true && ((o.message == null && this.message == null) || (o.message != null && o.message.equals(this.message))); + } + return false; + } + + @Override + public Type<ProgressShowHandler> getAssociatedType() { + return TYPE; + } + + public java.lang.String getMessage() { + return message; + } + + @Override + public int hashCode() { + int hashCode = 23; + hashCode = (hashCode * 37) + getClass().hashCode(); + hashCode = (hashCode * 37) + (message == null ? 1 : message.hashCode()); + return hashCode; + } + + @Override + public String toString() { + return "ProgressShowEvent[" + message + "]"; + } + +} Copied: trunk/src/main/java/cc/kune/common/client/events/UserNotifyEvent.java (from rev 1635, trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifyEvent.java) =================================================================== --- trunk/src/main/java/cc/kune/common/client/events/UserNotifyEvent.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/events/UserNotifyEvent.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -0,0 +1,155 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.common.client.events; + +import cc.kune.common.client.notify.NotifyLevel; + +import com.google.gwt.event.dom.client.ClickHandler; +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 UserNotifyEvent extends GwtEvent<UserNotifyEvent.UserNotifyHandler> { + + public interface HasUserNotifyHandlers extends HasHandlers { + HandlerRegistration addUserNotifyHandler(UserNotifyHandler handler); + } + + public interface UserNotifyCloser { + public void close(); + } + + public interface UserNotifyHandler extends EventHandler { + public void onUserNotify(UserNotifyEvent event); + } + + private static final Type<UserNotifyHandler> TYPE = new Type<UserNotifyHandler>(); + + public static void fire(final HasHandlers source, final NotifyLevel level, + final java.lang.String message) { + source.fireEvent(new UserNotifyEvent(level, "", message)); + } + + public static void fire(final HasHandlers source, final NotifyLevel level, + final java.lang.String message, final Boolean closeable) { + source.fireEvent(new UserNotifyEvent(level, "", message, closeable)); + } + + public static void fire(final HasHandlers source, final NotifyLevel level, + final java.lang.String title, final java.lang.String message) { + source.fireEvent(new UserNotifyEvent(level, title, message)); + } + + public static UserNotifyEvent fire(final HasHandlers source, final NotifyLevel level, + final java.lang.String title, final java.lang.String message, final Boolean closeable) { + final UserNotifyEvent event = new UserNotifyEvent(level, title, message, closeable); + source.fireEvent(event); + return event; + } + + public static Type<UserNotifyHandler> getType() { + return TYPE; + } + + private ClickHandler clickHandler; + private final Boolean closeable; + private UserNotifyCloser closer; + private java.lang.String id; + private final NotifyLevel level; + private final java.lang.String message; + private final java.lang.String title; + + public UserNotifyEvent(final NotifyLevel level, final java.lang.String message) { + this(level, "", message, false); + } + + public UserNotifyEvent(final NotifyLevel level, final java.lang.String message, final Boolean closeable) { + this(level, "", message, closeable); + } + + public UserNotifyEvent(final NotifyLevel level, final java.lang.String title, + final java.lang.String message) { + this(level, title, message, false); + } + + public UserNotifyEvent(final NotifyLevel level, final java.lang.String title, + final java.lang.String message, final Boolean closeable) { + this.level = level; + this.title = title; + this.message = message; + this.closeable = closeable; + } + + public UserNotifyEvent(final String message) { + this(NotifyLevel.info, message); + } + + @Override + protected void dispatch(final UserNotifyHandler handler) { + handler.onUserNotify(this); + } + + @Override + public Type<UserNotifyHandler> getAssociatedType() { + return TYPE; + } + + public ClickHandler getClickHandler() { + return clickHandler; + } + + public Boolean getCloseable() { + return closeable; + } + + public UserNotifyCloser getCloser() { + return closer; + } + + public java.lang.String getId() { + return id; + } + + public NotifyLevel getLevel() { + return level; + } + + public java.lang.String getMessage() { + return message; + } + + public java.lang.String getTitle() { + return title; + } + + public void setClickHandler(final ClickHandler clickHandler) { + this.clickHandler = clickHandler; + } + + public void setCloser(final UserNotifyCloser closer) { + this.closer = closer; + } + + public void setId(final String id) { + this.id = id; + } + +} Modified: trunk/src/main/java/cc/kune/common/client/notify/NotifyLevelImages.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/notify/NotifyLevelImages.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/common/client/notify/NotifyLevelImages.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,31 +19,31 @@ */ package cc.kune.common.client.notify; -import cc.kune.core.client.resources.CoreResources; +import cc.kune.common.client.resources.CommonResources; import com.google.gwt.resources.client.ImageResource; import com.google.inject.Inject; public class NotifyLevelImages { - private final CoreResources images; + private final CommonResources res; - @Inject - public NotifyLevelImages(final CoreResources images) { - this.images = images; - } + @Inject + public NotifyLevelImages(final CommonResources res) { + this.res = res; + } - public ImageResource getImage(final NotifyLevel level) { - switch (level) { - case info: - return images.info(); - case important: - return images.important(); - case veryImportant: - return images.alert(); - case error: - default: - return images.error(); - } + public ImageResource getImage(final NotifyLevel level) { + switch (level) { + case info: + return res.info(); + case important: + return res.important(); + case veryImportant: + return res.alert(); + case error: + default: + return res.error(); } + } } Modified: trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,12 +19,12 @@ */ package cc.kune.common.client.notify; +import cc.kune.common.client.events.ProgressHideEvent; +import cc.kune.common.client.events.ProgressShowEvent; +import cc.kune.common.client.events.UserNotifyEvent; import cc.kune.common.client.utils.SimpleResponseCallback; import cc.kune.common.client.utils.TextUtils; -import cc.kune.core.client.notify.msgs.UserNotifyEvent; -import cc.kune.core.client.notify.spiner.ProgressHideEvent; -import cc.kune.core.client.notify.spiner.ProgressShowEvent; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.shared.EventBus; Deleted: trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -1,56 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.common.client.resources; - -import com.google.gwt.core.client.GWT; -import com.google.gwt.resources.client.ClientBundle; -import com.google.gwt.resources.client.ImageResource; - -public interface CommonIconResources extends ClientBundle { - - public static final CommonIconResources INSTANCE = GWT.create(CommonIconResources.class); - - @Source("checked.png") - ImageResource checked(); - - @Source("clear.png") - ImageResource clear(); - - @Source("kune-close.png") - ImageResource kuneClose(); - - @Source("kune-close-grey.png") - ImageResource kuneCloseGrey(); - - @Source("kune-close-greylight.png") - ImageResource kuneCloseGreylight(); - - @Source("radiochecked.png") - ImageResource radioChecked(); - - @Source("radiounchecked.png") - ImageResource radioUnChecked(); - - @Source("cross.png") - ImageResource redCross(); - - @Source("unchecked.png") - ImageResource unChecked(); -} Copied: trunk/src/main/java/cc/kune/common/client/resources/CommonResources.java (from rev 1630, trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java) =================================================================== --- trunk/src/main/java/cc/kune/common/client/resources/CommonResources.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/resources/CommonResources.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -0,0 +1,77 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.common.client.resources; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.resources.client.ImageResource; + +public interface CommonResources extends ClientBundle { + + public static final CommonResources INSTANCE = GWT.create(CommonResources.class); + + @Source("alert.png") + ImageResource alert(); + + @Source("checked.png") + ImageResource checked(); + + @Source("clear.png") + ImageResource clear(); + + @Source("error.png") + ImageResource error(); + + @Source("important.png") + ImageResource important(); + + @Source("important-32.png") + ImageResource important32(); + + @Source("info.png") + ImageResource info(); + + @Source("kune-anim.gif") + ImageResource kuneAnim(); + + @Source("kune-anim-g.gif") + ImageResource kuneAnimG(); + + @Source("kune-close.png") + ImageResource kuneClose(); + + @Source("kune-close-grey.png") + ImageResource kuneCloseGrey(); + + @Source("kune-close-greylight.png") + ImageResource kuneCloseGreylight(); + + @Source("radiochecked.png") + ImageResource radioChecked(); + + @Source("radiounchecked.png") + ImageResource radioUnChecked(); + + @Source("cross.png") + ImageResource redCross(); + + @Source("unchecked.png") + ImageResource unChecked(); +} Copied: trunk/src/main/java/cc/kune/common/client/resources/alert.png (from rev 1630, trunk/src/main/java/cc/kune/core/client/resources/alert.png) =================================================================== (Binary files differ) Copied: trunk/src/main/java/cc/kune/common/client/resources/error.png (from rev 1630, trunk/src/main/java/cc/kune/core/client/resources/error.png) =================================================================== (Binary files differ) Copied: trunk/src/main/java/cc/kune/common/client/resources/important-32.png (from rev 1630, trunk/src/main/java/cc/kune/core/client/resources/important-32.png) =================================================================== (Binary files differ) Copied: trunk/src/main/java/cc/kune/common/client/resources/important.png (from rev 1630, trunk/src/main/java/cc/kune/core/client/resources/important.png) =================================================================== (Binary files differ) Copied: trunk/src/main/java/cc/kune/common/client/resources/info.png (from rev 1630, trunk/src/main/java/cc/kune/core/client/resources/info.png) =================================================================== (Binary files differ) Copied: trunk/src/main/java/cc/kune/common/client/resources/kune-anim-g.gif (from rev 1630, trunk/src/main/java/cc/kune/core/client/resources/kune-anim-g.gif) =================================================================== (Binary files differ) Copied: trunk/src/main/java/cc/kune/common/client/resources/kune-anim.gif (from rev 1630, trunk/src/main/java/cc/kune/core/client/resources/kune-anim.gif) =================================================================== (Binary files differ) Modified: trunk/src/main/java/cc/kune/common/client/ui/DottedTab.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/DottedTab.ui.xml 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/common/client/ui/DottedTab.ui.xml 2011-12-19 21:49:18 UTC (rev 1639) @@ -2,7 +2,7 @@ <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui"> <ui:with field='res' - type='cc.kune.common.client.resources.CommonIconResources'/> + type='cc.kune.common.client.resources.CommonResources'/> <ui:style> </ui:style> Modified: trunk/src/main/java/cc/kune/common/client/ui/MaskWidget.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/MaskWidget.ui.xml 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/common/client/ui/MaskWidget.ui.xml 2011-12-19 21:49:18 UTC (rev 1639) @@ -1,7 +1,7 @@ <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui"> - <ui:with field='img' type='cc.kune.core.client.resources.CoreResources' /> + <ui:with field='img' type='cc.kune.common.client.resources.CommonResources' /> <ui:style> .main { Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.ui.xml 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.ui.xml 2011-12-19 21:49:18 UTC (rev 1639) @@ -1,7 +1,7 @@ <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:k="urn:import:cc.kune.common.client.ui" xmlns:g="urn:import:com.google.gwt.user.client.ui"> - <ui:with field='res' type='cc.kune.common.client.resources.CommonIconResources'/> + <ui:with field='res' type='cc.kune.common.client.resources.CommonResources'/> <g:VerticalPanel addStyleNames="k-dialog-outerp, k-bottom-10corners"> <g:FlowPanel> <g:PushButton visible="false" ui:field="closeBtn" Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialog.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialog.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialog.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -23,8 +23,7 @@ import cc.kune.common.client.ui.MaskWidget; import cc.kune.common.client.ui.dialogs.BasicTopDialog; import cc.kune.common.client.ui.dialogs.BasicTopDialog.Builder; -import cc.kune.core.client.ui.DefaultForm; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; @@ -40,7 +39,7 @@ public class WizardDialog implements WizardDialogView { private final Button backButton; - private final DeckPanel deck; + protected final DeckPanel deck; private final BasicTopDialog dialog; private final I18nTranslationService i18n; private WizardListener listener; @@ -130,11 +129,9 @@ public void clear() { } - private int getWidgetCount(final IsWidget view) { + protected int getWidgetCount(final IsWidget view) { if (view instanceof Widget) { return deck.getWidgetIndex((Widget) view); - } else if (view instanceof DefaultForm) { - return deck.getWidgetIndex(((DefaultForm) view).getFormPanel()); } return -1; } @@ -261,11 +258,9 @@ } - private Widget toWidget(final IsWidget view) { + protected Widget toWidget(final IsWidget view) { if (view instanceof Widget) { return (Widget) view; - } else if (view instanceof DefaultForm) { - return ((DefaultForm) view).getFormPanel(); } else { NotifyUser.error("Trying to add a unknown element in WizardDialog"); return null; Copied: trunk/src/main/java/cc/kune/common/shared/i18n (from rev 1630, trunk/src/main/java/cc/kune/core/shared/i18n) Added: trunk/src/main/java/cc/kune/common/shared/i18n/HasRTL.java =================================================================== --- trunk/src/main/java/cc/kune/common/shared/i18n/HasRTL.java (rev 0) +++ trunk/src/main/java/cc/kune/common/shared/i18n/HasRTL.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -0,0 +1,11 @@ +package cc.kune.common.shared.i18n; + +public interface HasRTL { + + /** + * Describe if the current language is Right to Left (RTL) + * + * @return true, if is the current language is RTL + */ + boolean isRTL(); +} Modified: trunk/src/main/java/cc/kune/common/shared/i18n/I18nTranslationService.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/i18n/I18nTranslationService.java 2011-11-28 16:19:48 UTC (rev 1630) +++ trunk/src/main/java/cc/kune/common/shared/i18n/I18nTranslationService.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -17,13 +17,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.core.shared.i18n; +package cc.kune.common.shared.i18n; import cc.kune.common.client.utils.Pair; import com.google.gwt.i18n.client.HasDirection.Direction; -public abstract class I18nTranslationService { +public abstract class I18nTranslationService implements HasRTL { protected static final String RTL = "rtl"; @@ -40,6 +40,7 @@ return isRTL() ? Direction.RTL : Direction.LTR; } + @Override public abstract boolean isRTL(); /** Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,7 +19,6 @@ */ package cc.kune.core.client; -import cc.kune.common.client.ExtendedGinModule; import cc.kune.common.client.actions.gxtui.GxtGuiProvider; import cc.kune.common.client.actions.ui.bind.DefaultGuiProvider; import cc.kune.common.client.actions.ui.bind.GuiProvider; @@ -28,6 +27,8 @@ import cc.kune.common.client.shortcuts.GlobalShortcutRegister; import cc.kune.common.client.ui.MaskWidget; import cc.kune.common.client.ui.MaskWidgetView; +import cc.kune.common.shared.i18n.HasRTL; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.ActionRegistryByType; import cc.kune.core.client.actions.xml.XMLActionsParser; import cc.kune.core.client.auth.AnonUsersManager; @@ -110,7 +111,6 @@ import cc.kune.core.client.ws.entheader.EntityHeaderPanel; import cc.kune.core.client.ws.entheader.EntityHeaderPresenter; import cc.kune.core.shared.dto.ReservedWordsRegistryDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.msgs.client.UserMessagesPanel; import cc.kune.msgs.client.UserMessagesPresenter; @@ -138,6 +138,7 @@ bind(RootPresenter.class).asEagerSingleton(); bind(ProxyFailureHandler.class).to(DefaultProxyFailureHandler.class).in(Singleton.class); s(I18nUITranslationService.class); + bind(HasRTL.class).to(I18nUITranslationService.class); bind(I18nTranslationService.class).to(I18nUITranslationService.class).in(Singleton.class); bind(GlobalShortcutRegister.class).to(DefaultGlobalShortcutRegister.class).in(Singleton.class); s(AnonUsersManager.class); @@ -191,6 +192,8 @@ // UI bind(GuiProvider.class).to(DefaultGuiProvider.class).in(Singleton.class); + + // FIXME: revise this! s(GxtGuiProvider.class); // s(GwtGuiProvider.class); Copied: trunk/src/main/java/cc/kune/core/client/ExtendedGinModule.java (from rev 1630, trunk/src/main/java/cc/kune/common/client/ExtendedGinModule.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/ExtendedGinModule.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/ExtendedGinModule.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -0,0 +1,39 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.core.client; + +import com.google.inject.Singleton; +import com.gwtplatform.mvp.client.gin.AbstractPresenterModule; + +public abstract class ExtendedGinModule extends AbstractPresenterModule { + + protected void eagle(final Class<?> type) { + bind(type).asEagerSingleton(); + } + + protected void s(final Class<?> type) { + bind(type).in(Singleton.class); + } + + protected <V, W> void s(final Class<V> type, final Class<? extends V> typeImpl) { + bind(type).to(typeImpl).in(Singleton.class); + } + +} Modified: trunk/src/main/java/cc/kune/core/client/actions/xml/AddGadgetAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/actions/xml/AddGadgetAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/actions/xml/AddGadgetAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,13 +22,13 @@ import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.RolAction; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/core/client/actions/xml/NewGadgetAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/actions/xml/NewGadgetAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/actions/xml/NewGadgetAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,6 +22,7 @@ import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.RolAction; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; @@ -32,7 +33,6 @@ import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.viewers.ContentViewerPresenter; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -28,13 +28,13 @@ import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.actions.ui.descrip.SubMenuDescriptor; import cc.kune.common.client.utils.TextUtils; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.ActionRegistryByType; import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.registry.NewMenusForTypeIdsRegistry; 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 cc.kune.gspace.client.actions.ActionGroups; import cc.kune.gspace.client.viewers.ContentViewerPresenter; Modified: trunk/src/main/java/cc/kune/core/client/auth/AnonUsersManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/AnonUsersManager.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/auth/AnonUsersManager.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,13 +19,13 @@ */ package cc.kune.core.client.auth; +import cc.kune.common.client.events.UserNotifyEvent; import cc.kune.common.client.notify.NotifyLevel; import cc.kune.common.client.utils.TextUtils; import cc.kune.core.client.cookies.CookiesManager; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.init.AppStartEvent.AppStartHandler; -import cc.kune.core.client.notify.msgs.UserNotifyEvent; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.SiteTokens; import cc.kune.core.client.state.UserSignInEvent; Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterForm.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/RegisterForm.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/auth/RegisterForm.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,9 +19,9 @@ \*/ package cc.kune.core.client.auth; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.state.Session; import cc.kune.core.client.ui.DefaultForm; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.extjs.gxt.ui.client.widget.form.Field; import com.extjs.gxt.ui.client.widget.form.TextField; Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,11 +22,11 @@ import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.common.client.ui.MaskWidgetView; import cc.kune.common.client.ui.dialogs.MessageToolbar; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.auth.RegisterPresenter.RegisterView; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.state.Session; import cc.kune.core.client.ui.KuneUiUtils; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -25,7 +25,7 @@ import cc.kune.common.client.ui.dialogs.BasicTopDialog; import cc.kune.common.client.ui.dialogs.BasicTopDialog.Builder; import cc.kune.common.client.ui.dialogs.MessageToolbar; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.event.logical.shared.HasCloseHandlers; Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInForm.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInForm.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInForm.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.core.client.auth; import cc.kune.common.client.utils.OnAcceptCallback; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.ui.DefaultForm; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.extjs.gxt.ui.client.event.Events; import com.extjs.gxt.ui.client.event.FieldEvent; Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInNewForm.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInNewForm.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInNewForm.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,7 +19,7 @@ */ package cc.kune.core.client.auth; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import com.extjs.gxt.ui.client.widget.form.FormPanel; import com.extjs.gxt.ui.client.widget.form.TextField; Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -23,10 +23,10 @@ import cc.kune.common.client.ui.MaskWidgetView; import cc.kune.common.client.ui.dialogs.MessageToolbar; import cc.kune.common.client.utils.OnAcceptCallback; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.auth.SignInPresenter.SignInView; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.ui.KuneUiUtils; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.extjs.gxt.ui.client.widget.VerticalPanel; import com.extjs.gxt.ui.client.widget.form.Field; Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,6 +19,8 @@ */ package cc.kune.core.client.auth; +import cc.kune.common.client.events.ProgressHideEvent; +import cc.kune.common.client.events.ProgressShowEvent; import cc.kune.common.client.log.Log; import cc.kune.common.client.notify.NotifyLevel; import cc.kune.common.client.utils.OnAcceptCallback; @@ -29,8 +31,6 @@ 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.notify.spiner.ProgressHideEvent; -import cc.kune.core.client.notify.spiner.ProgressShowEvent; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.rpcservices.UserServiceAsync; import cc.kune.core.client.state.Session; Modified: trunk/src/main/java/cc/kune/core/client/auth/UserFieldFactory.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/UserFieldFactory.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/auth/UserFieldFactory.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,9 +20,9 @@ package cc.kune.core.client.auth; import cc.kune.common.client.utils.TextUtils; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.ui.DefaultForm; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.extjs.gxt.ui.client.widget.form.TextField; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarImpl.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarImpl.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,7 +21,7 @@ import cc.kune.common.client.actions.ui.ActionFlowPanel; import cc.kune.common.client.actions.ui.bind.GuiProvider; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget; Modified: trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,9 +21,9 @@ import org.waveprotocol.wave.model.waveref.WaveRef; +import cc.kune.common.client.resources.CommonResources; import cc.kune.common.client.ui.IconLabel; -import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import cc.kune.wave.client.WaveClientManager; @@ -45,7 +45,7 @@ private final FlowPanel messagePanel; public FoldableContentPanel(final GSpaceArmor ws, final I18nTranslationService i18n, - final CoreResources res, final WaveClientManager waveClientManager) { + final CommonResources res, final WaveClientManager waveClientManager) { super(ws); this.i18n = i18n; messageLabel = new IconLabel(""); Modified: trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,6 +21,7 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.services.ImageSize; import cc.kune.core.client.services.MediaUtils; @@ -33,7 +34,6 @@ import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Provider; Deleted: trunk/src/main/java/cc/kune/core/client/dnd/DropTarget.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/dnd/DropTarget.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/dnd/DropTarget.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -1,28 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.core.client.dnd; - -import com.google.gwt.user.client.ui.Widget; - -public interface DropTarget { - - void init(Widget dropTarget); - -} Modified: trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,10 @@ */ package cc.kune.core.client.dnd; +import cc.kune.common.client.actions.ui.descrip.DropTarget; import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.TextUtils; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.state.ContentCache; @@ -28,7 +30,6 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateContainerDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.viewers.FolderItemWidget; import com.allen_sauer.gwt.dnd.client.DragContext; Modified: trunk/src/main/java/cc/kune/core/client/dnd/NotAllowedDropController.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/dnd/NotAllowedDropController.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/dnd/NotAllowedDropController.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,7 +19,7 @@ */ package cc.kune.core.client.dnd; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import com.allen_sauer.gwt.dnd.client.DragContext; import com.allen_sauer.gwt.dnd.client.VetoDragException; Modified: trunk/src/main/java/cc/kune/core/client/dnd/NotImplementedDropController.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/dnd/NotImplementedDropController.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/dnd/NotImplementedDropController.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,7 +21,7 @@ import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.TextUtils; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import com.allen_sauer.gwt.dnd.client.DragContext; import com.allen_sauer.gwt.dnd.client.VetoDragException; Modified: trunk/src/main/java/cc/kune/core/client/dnd/NotImplementedDropManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/dnd/NotImplementedDropManager.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/dnd/NotImplementedDropManager.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,7 +19,7 @@ */ package cc.kune.core.client.dnd; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import com.google.gwt.event.logical.shared.AttachEvent; Modified: trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,15 +22,15 @@ import org.waveprotocol.wave.client.common.safehtml.SafeHtml; import org.waveprotocol.wave.client.common.util.AsyncHolder.Accessor; +import cc.kune.common.client.events.ProgressHideEvent; +import cc.kune.common.client.events.UserNotifyEvent; import cc.kune.common.client.log.Log; import cc.kune.common.client.notify.NotifyLevel; import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.TextUtils; -import cc.kune.core.client.notify.msgs.UserNotifyEvent; -import cc.kune.core.client.notify.spiner.ProgressHideEvent; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.wave.client.WaveClientProvider; import com.google.gwt.event.shared.EventBus; Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/GroupFieldFactory.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/GroupFieldFactory.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/GroupFieldFactory.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,9 +19,9 @@ */ package cc.kune.core.client.groups.newgroup; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.ui.DefaultForm; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.extjs.gxt.ui.client.widget.form.TextField; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -26,9 +26,9 @@ import cc.kune.common.client.ui.dialogs.BasicTopDialog; import cc.kune.common.client.ui.dialogs.BasicTopDialog.Builder; import cc.kune.common.client.ui.dialogs.MessageToolbar; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.ui.DefaultForm; import cc.kune.core.client.ui.DefaultFormUtils; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.extjs.gxt.ui.client.Style.HorizontalAlignment; import com.extjs.gxt.ui.client.widget.form.FieldSet; Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,6 +22,7 @@ import cc.kune.common.client.errors.UIException; import cc.kune.common.client.notify.NotifyLevel; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.auth.SignIn; import cc.kune.core.client.errors.GroupLongNameInUseException; import cc.kune.core.client.errors.GroupShortNameInUseException; @@ -37,7 +38,6 @@ import cc.kune.core.shared.dto.LicenseDTO; import cc.kune.core.shared.dto.ReservedWordsRegistryDTO; import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.options.GroupOptions; import com.google.gwt.core.client.Scheduler; Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,7 +20,7 @@ package cc.kune.core.client.i18n; import cc.kune.common.client.utils.TextUtils; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; public class I18nTranslationServiceMocked extends I18nTranslationService { @Override Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -34,12 +34,12 @@ import cc.kune.common.client.utils.SimpleResponseCallback; import cc.kune.common.client.utils.TextUtils; import cc.kune.common.client.utils.WindowUtils; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.rpcservices.I18nServiceAsync; 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.shared.dto.I18nLanguageDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.RepeatingCommand; Modified: trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,13 +19,13 @@ */ package cc.kune.core.client.init; +import cc.kune.common.client.events.ProgressHideEvent; +import cc.kune.common.client.events.UserNotifyEvent; import cc.kune.common.client.log.Log; import cc.kune.common.client.notify.NotifyLevel; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.client.resources.CommonResources; import cc.kune.common.client.utils.SimpleResponseCallback; -import cc.kune.core.client.notify.msgs.UserNotifyEvent; -import cc.kune.core.client.notify.spiner.ProgressHideEvent; -import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.SiteServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.shared.dto.InitDataDTO; @@ -45,13 +45,13 @@ public class AppStarterDefault implements AppStarter { private final EventBus eventBus; private final PrefetchUtilities prefetchUtilities; - private final CoreResources res; + private final CommonResources res; private final Session session; private final SiteServiceAsync siteService; @Inject public AppStarterDefault(final Session session, final SiteServiceAsync siteService, - final EventBus eventBus, final PrefetchUtilities prefetchUtilities, final CoreResources res) { + final EventBus eventBus, final PrefetchUtilities prefetchUtilities, final CommonResources res) { this.session = session; this.siteService = siteService; this.eventBus = eventBus; Modified: trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,8 +21,8 @@ import cc.kune.common.client.notify.ConfirmAskEvent; import cc.kune.common.client.ui.dialogs.BasicTopDialog; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.notify.confirm.UserConfirmPresenter.UserConfirmView; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; Modified: trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierPresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,6 +19,7 @@ */ package cc.kune.core.client.notify.msgs; +import cc.kune.common.client.events.UserNotifyEvent; import cc.kune.common.client.notify.NotifyLevel; import cc.kune.core.client.notify.msgs.UserNotifierPresenter.UserNotifierProxy; import cc.kune.core.client.notify.msgs.UserNotifierPresenter.UserNotifierView; 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-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierViewImpl.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,6 +19,7 @@ */ package cc.kune.core.client.notify.msgs; +import cc.kune.common.client.events.UserNotifyEvent; import cc.kune.common.client.ui.PopupBottomPanel; import cc.kune.core.client.notify.msgs.UserNotifierPresenter.UserNotifierView; import cc.kune.msgs.client.CloseCallback; Deleted: trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifyEvent.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifyEvent.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifyEvent.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -1,155 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.core.client.notify.msgs; - -import cc.kune.common.client.notify.NotifyLevel; - -import com.google.gwt.event.dom.client.ClickHandler; -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 UserNotifyEvent extends GwtEvent<UserNotifyEvent.UserNotifyHandler> { - - public interface HasUserNotifyHandlers extends HasHandlers { - HandlerRegistration addUserNotifyHandler(UserNotifyHandler handler); - } - - public interface UserNotifyCloser { - public void close(); - } - - public interface UserNotifyHandler extends EventHandler { - public void onUserNotify(UserNotifyEvent event); - } - - private static final Type<UserNotifyHandler> TYPE = new Type<UserNotifyHandler>(); - - public static void fire(final HasHandlers source, final NotifyLevel level, - final java.lang.String message) { - source.fireEvent(new UserNotifyEvent(level, "", message)); - } - - public static void fire(final HasHandlers source, final NotifyLevel level, - final java.lang.String message, final Boolean closeable) { - source.fireEvent(new UserNotifyEvent(level, "", message, closeable)); - } - - public static void fire(final HasHandlers source, final NotifyLevel level, - final java.lang.String title, final java.lang.String message) { - source.fireEvent(new UserNotifyEvent(level, title, message)); - } - - public static UserNotifyEvent fire(final HasHandlers source, final NotifyLevel level, - final java.lang.String title, final java.lang.String message, final Boolean closeable) { - final UserNotifyEvent event = new UserNotifyEvent(level, title, message, closeable); - source.fireEvent(event); - return event; - } - - public static Type<UserNotifyHandler> getType() { - return TYPE; - } - - private ClickHandler clickHandler; - private final Boolean closeable; - private UserNotifyCloser closer; - private java.lang.String id; - private final NotifyLevel level; - private final java.lang.String message; - private final java.lang.String title; - - public UserNotifyEvent(final NotifyLevel level, final java.lang.String message) { - this(level, "", message, false); - } - - public UserNotifyEvent(final NotifyLevel level, final java.lang.String message, final Boolean closeable) { - this(level, "", message, closeable); - } - - public UserNotifyEvent(final NotifyLevel level, final java.lang.String title, - final java.lang.String message) { - this(level, title, message, false); - } - - public UserNotifyEvent(final NotifyLevel level, final java.lang.String title, - final java.lang.String message, final Boolean closeable) { - this.level = level; - this.title = title; - this.message = message; - this.closeable = closeable; - } - - public UserNotifyEvent(final String message) { - this(NotifyLevel.info, message); - } - - @Override - protected void dispatch(final UserNotifyHandler handler) { - handler.onUserNotify(this); - } - - @Override - public Type<UserNotifyHandler> getAssociatedType() { - return TYPE; - } - - public ClickHandler getClickHandler() { - return clickHandler; - } - - public Boolean getCloseable() { - return closeable; - } - - public UserNotifyCloser getCloser() { - return closer; - } - - public java.lang.String getId() { - return id; - } - - public NotifyLevel getLevel() { - return level; - } - - public java.lang.String getMessage() { - return message; - } - - public java.lang.String getTitle() { - return title; - } - - public void setClickHandler(final ClickHandler clickHandler) { - this.clickHandler = clickHandler; - } - - public void setCloser(final UserNotifyCloser closer) { - this.closer = closer; - } - - public void setId(final String id) { - this.id = id; - } - -} Deleted: trunk/src/main/java/cc/kune/core/client/notify/spiner/ProgressHideEvent.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/spiner/ProgressHideEvent.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/notify/spiner/ProgressHideEvent.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -1,85 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.core.client.notify.spiner; - -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; -import com.gwtplatform.mvp.client.HasEventBus; - -public class ProgressHideEvent extends GwtEvent<ProgressHideEvent.ProgressHideHandler> { - - public interface HasProgressHideHandlers extends HasHandlers { - HandlerRegistration addProgressHideHandler(ProgressHideHandler handler); - } - - public interface ProgressHideHandler extends EventHandler { - public void onProgressHide(ProgressHideEvent event); - } - - private static final Type<ProgressHideHandler> TYPE = new Type<ProgressHideHandler>(); - - public static void fire(HasEventBus source) { - source.fireEvent(new ProgressHideEvent()); - } - - public static Type<ProgressHideHandler> getType() { - return TYPE; - } - - - public ProgressHideEvent() { - } - - @Override - public Type<ProgressHideHandler> getAssociatedType() { - return TYPE; - } - - @Override - protected void dispatch(ProgressHideHandler handler) { - handler.onProgressHide(this); - } - - @Override - public boolean equals(Object other) { - if (other != null && other.getClass().equals(this.getClass())) { - ProgressHideEvent o = (ProgressHideEvent) other; - return true - ; - } - return false; - } - - @Override - public int hashCode() { - int hashCode = 23; - hashCode = (hashCode * 37) + getClass().hashCode(); - return hashCode; - } - - @Override - public String toString() { - return "ProgressHideEvent[" - + "]"; - } - -} Deleted: trunk/src/main/java/cc/kune/core/client/notify/spiner/ProgressShowEvent.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/spiner/ProgressShowEvent.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/notify/spiner/ProgressShowEvent.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -1,94 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.core.client.notify.spiner; - -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; -import com.gwtplatform.mvp.client.HasEventBus; - -public class ProgressShowEvent extends GwtEvent<ProgressShowEvent.ProgressShowHandler> { - - public interface HasProgressShowHandlers extends HasHandlers { - HandlerRegistration addProgressShowHandler(ProgressShowHandler handler); - } - - public interface ProgressShowHandler extends EventHandler { - public void onProgressShow(ProgressShowEvent event); - } - - private static final Type<ProgressShowHandler> TYPE = new Type<ProgressShowHandler>(); - - public static void fire(final HasEventBus source, final java.lang.String message) { - source.fireEvent(new ProgressShowEvent(message)); - } - - public static Type<ProgressShowHandler> getType() { - return TYPE; - } - - private final java.lang.String message; - - public ProgressShowEvent() { - this(""); - } - - public ProgressShowEvent(final java.lang.String message) { - this.message = message; - } - - @Override - protected void dispatch(final ProgressShowHandler handler) { - handler.onProgressShow(this); - } - - @Override - public boolean equals(final Object other) { - if (other != null && other.getClass().equals(this.getClass())) { - final ProgressShowEvent o = (ProgressShowEvent) other; - return true && ((o.message == null && this.message == null) || (o.message != null && o.message.equals(this.message))); - } - return false; - } - - @Override - public Type<ProgressShowHandler> getAssociatedType() { - return TYPE; - } - - public java.lang.String getMessage() { - return message; - } - - @Override - public int hashCode() { - int hashCode = 23; - hashCode = (hashCode * 37) + getClass().hashCode(); - hashCode = (hashCode * 37) + (message == null ? 1 : message.hashCode()); - return hashCode; - } - - @Override - public String toString() { - return "ProgressShowEvent[" + message + "]"; - } - -} Modified: trunk/src/main/java/cc/kune/core/client/notify/spiner/SpinerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/spiner/SpinerPresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/notify/spiner/SpinerPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,10 @@ */ package cc.kune.core.client.notify.spiner; +import cc.kune.common.client.events.ProgressHideEvent; +import cc.kune.common.client.events.ProgressShowEvent; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.i18n.I18nReadyEvent; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -37,9 +37,6 @@ @Source("add-green.png") ImageResource addGreen(); - @Source("alert.png") - ImageResource alert(); - @Source("anybody.png") ImageResource anybody(); @@ -349,9 +346,6 @@ @Source("emite-room.png") ImageResource emiteRoom(); - @Source("error.png") - ImageResource error(); - @Source("everybody.png") ImageResource everybody(); @@ -376,24 +370,9 @@ @Source("group-home.png") ImageResource groupHome(); - @Source("important.png") - ImageResource important(); - - @Source("important-32.png") - ImageResource important32(); - - @Source("info.png") - ImageResource info(); - @Source("info-light.png") ImageResource infoLight(); - @Source("kune-anim.gif") - ImageResource kuneAnim(); - - @Source("kune-anim-g.gif") - ImageResource kuneAnimG(); - @Source("kune-close.png") ImageResource kuneClose(); Deleted: trunk/src/main/java/cc/kune/core/client/resources/IconConstants.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/IconConstants.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/resources/IconConstants.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -1,39 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.core.client.resources; - -import com.google.gwt.resources.client.ImageResource; - -@Deprecated -public final class IconConstants { - - @Deprecated - public static final String CSS_SUFFIX = "k-icon-"; - - private static final String PATH_PREFIX = "images/"; - - @Deprecated - public static String toPath(final ImageResource img) { - return PATH_PREFIX + img.getName() + ".png"; - } - - private IconConstants() { - } -} Deleted: trunk/src/main/java/cc/kune/core/client/resources/alert.png =================================================================== (Binary files differ) Modified: trunk/src/main/java/cc/kune/core/client/resources/core.css =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/core.css 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/resources/core.css 2011-12-19 21:49:18 UTC (rev 1639) @@ -9,9 +9,9 @@ margin-top: 2px; } -@sprite div .k-icon-info { - gwt-image: "info"; -} +/* @sprite div .k-icon-info { */ +/* gwt-image: "info"; */ +/* } */ @sprite div .k-icon-language { gwt-image: "language"; Deleted: trunk/src/main/java/cc/kune/core/client/resources/error.png =================================================================== (Binary files differ) Deleted: trunk/src/main/java/cc/kune/core/client/resources/important-32.png =================================================================== (Binary files differ) Deleted: trunk/src/main/java/cc/kune/core/client/resources/important.png =================================================================== (Binary files differ) Deleted: trunk/src/main/java/cc/kune/core/client/resources/info.png =================================================================== (Binary files differ) Deleted: trunk/src/main/java/cc/kune/core/client/resources/kune-anim-g.gif =================================================================== (Binary files differ) Deleted: trunk/src/main/java/cc/kune/core/client/resources/kune-anim.gif =================================================================== (Binary files differ) Modified: trunk/src/main/java/cc/kune/core/client/services/ImageUtils.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/services/ImageUtils.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/services/ImageUtils.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,6 +19,7 @@ \*/ package cc.kune.core.client.services; +import cc.kune.common.client.resources.CommonResources; import cc.kune.core.client.resources.CoreResources; import com.google.gwt.resources.client.ImageResource; @@ -27,405 +28,407 @@ public class ImageUtils { - private final CoreResources img; + private final CommonResources commonRes; + private final CoreResources img; - @Inject - public ImageUtils(final CoreResources img) { - this.img = img; - } + @Inject + public ImageUtils(final CoreResources img, final CommonResources commonRes) { + this.img = img; + this.commonRes = commonRes; + } - public ImageResource getImage(final ImageDescriptor imageDescriptor) { - switch (imageDescriptor) { - case accept: { - return img.accept(); - } - case add: { - return img.add(); - } - case addGreen: { - return img.addGreen(); - } - case alert: { - return img.alert(); - } - case anybody: { - return img.anybody(); - } - case arrowDownBlack: { - return img.arrowDownBlack(); - } - case arrowDownGreen: { - return img.arrowDownGreen(); - } - case arrowDownWhite: { - return img.arrowDownWhite(); - } - case arrowLeftGreen: { - return img.arrowLeftGreen(); - } - case arrowRightBlack: { - return img.arrowRightBlack(); - } - case arrowRightGreen: { - return img.arrowRightGreen(); - } - case arrowRightWhite: { - return img.arrowRightWhite(); - } - case arrowUpGreen: { - return img.arrowUpGreen(); - } - case bulletAdd: { - return img.bulletAdd(); - } - case bulletBlack: { - return img.bulletBlack(); - } - case bulletBlue: { - return img.bulletBlue(); - } - case bulletDelete: { - return img.bulletDelete(); - } - case bulletGreen: { - return img.bulletGreen(); - } - case bulletPink: { - return img.bulletPink(); - } - case bulletPurple: { - return img.bulletPurple(); - } - case bulletRed: { - return img.bulletRed(); - } - case bulletStar: { - return img.bulletStar(); - } - case bulletToggleMinus: { - return img.bulletToggleMinus(); - } - case bulletTogglePlus: { - return img.bulletTogglePlus(); - } - case bulletYellow: { - return img.bulletYellow(); - } - case button15cblue: { - return img.button15cblue(); - } - case button15cdark: { - return img.button15cdark(); - } - case button15clight: { - return img.button15clight(); - } - case button15cxlight: { - return img.button15cxlight(); - } - case button15lblue: { - return img.button15lblue(); - } - case button15ldark: { - return img.button15ldark(); - } - case button15llight: { - return img.button15llight(); - } - case button15lxlight: { - return img.button15lxlight(); - } - case button15rblue: { - return img.button15rblue(); - } - case button15rdark: { - return img.button15rdark(); - } - case button15rlight: { - return img.button15rlight(); - } - case button15rxlight: { - return img.button15rxlight(); - } - case button17cblue: { - return img.button17cblue(); - } - case button17cdark: { - return img.button17cdark(); - } - case button17clight: { - return img.button17clight(); - } - case button17cxlight: { - return img.button17cxlight(); - } - case button17lblue: { - return img.button17lblue(); - } - case button17ldark: { - return img.button17ldark(); - } - case button17llight: { - return img.button17llight(); - } - case button17lxlight: { - return img.button17lxlight(); - } - case button17rblue: { - return img.button17rblue(); - } - case button17rdark: { - return img.button17rdark(); - } - case button17rlight: { - return img.button17rlight(); - } - case button17rxlight: { - return img.button17rxlight(); - } - case button20cblue: { - return img.button20cblue(); - } - case button20cdark: { - return img.button20cdark(); - } - case button20clight: { - return img.button20clight(); - } - case button20cxlight: { - return img.button20cxlight(); - } - case button20lblue: { - return img.button20lblue(); - } - case button20ldark: { - return img.button20ldark(); - } - case button20llight: { - return img.button20llight(); - } - case button20lxlight: { - return img.button20lxlight(); - } - case button20rblue: { - return img.button20rblue(); - } - case button20rdark: { - return img.button20rdark(); - } - case button20rlight: { - return img.button20rlight(); - } - case button20rxlight: { - return img.button20rxlight(); - } - case buttonArrowDown: { - return img.buttonArrowDown(); - } - case buttonHelpBlue: { - return img.buttonHelpBlue(); - } - case buttonHelpDark: { - return img.buttonHelpDark(); - } - case buttonHelpLight: { - return img.buttonHelpLight(); - } - case buttonSitebarArrowDown: { - return img.arrowdownsquarewhite(); - } - case by80x15: { - return img.by80x15(); - } - case bync80x15: { - return img.bync80x15(); - } - case byncnd80x15: { - return img.byncnd80x15(); - } - case byncsa80x15: { - return img.byncsa80x15(); - } - case bynd80x15: { - return img.bynd80x15(); - } - case bysa80x15: { - return img.bysa80x15(); - } - case cancel: { - return img.cancel(); - } - case clear: { - return img.clear(); - } - case copyleft: { - return img.copyleft(); - } - case cross: { - return img.cross(); - } - case crossDark: { - return img.crossDark(); - } - case del: { - return img.del(); - } - case emblemImportant: { - return img.emblemImportant(); - } - case emblemSystem: { - return img.emblemSystem(); - } - case error: { - return img.error(); - } - case everybody: { - return img.everybody(); - } - case fullscreen: { - return img.fullscreen(); - } - case gnuFdl: { - return img.gnuFdl(); - } - case groupDefIcon: { - return img.groupDefIcon(); - } - case groupHome: { - return img.groupHome(); - } - case important: { - return img.important(); - } - case info: { - return img.info(); - } - case infoLight: { - return img.infoLight(); - } - case kuneClose: { - return img.kuneClose(); - } - case kuneExternalWindow: { - return img.kuneExternalWindow(); - } - case kuneHelpTranslationIcon: { - return img.kuneHelpTranslationIcon(); - } - case kuneIcon16: { - return img.kuneIcon16(); - } - case kuneLogo16px: { - return img.kuneLogo16px(); - } - case kunePreferences: { - return img.kunePreferences(); - } - case kuneSearchIco: { - return img.kuneSearchIco(); - } - case kuneSearchIcoPush: { - return img.kuneSearchIcoPush(); - } - case language: { - return img.language(); - } - case nobody: { - return img.nobody(); - } - case noCopyleft: { - return img.noCopyleft(); - } - case nt: { - return img.nt(); - } - case opentriangle: { - return img.opentriangle(); - } - case personDef: { - return img.personDef(); - } - case remove: { - return img.remove(); - } - case rssIcon: { - return img.rssIcon(); - } - case searchIco: { - return img.searchIco(); - } - case spinKuneThundGreen: { - return img.spinKuneThundGreen(); - } - case splitterVertBar: { - return img.splitterVertBar(); - } - case star10: { - return img.star10(); - } - case star20: { - return img.star20(); - } - case star30: { - return img.star30(); - } - case star40: { - return img.star40(); - } - case star50: { - return img.star50(); - } - case star60: { - return img.star60(); - } - case star70: { - return img.star70(); - } - case star80: { - return img.star80(); - } - case star90: { - return img.star90(); - } - case starGrey: { - return img.starGrey(); - } - case starSmallYellow: { - return img.starSmallYellow(); - } - case starVsmallYellow: { - return img.starVsmallYellow(); - } - case starYellow: { - return img.starYellow(); - } - case step1: { - return img.step1(); - } - case step2: { - return img.step2(); - } - case step3: { - return img.step3(); - } - case step4: { - return img.step4(); - } - case step5: { - return img.step5(); - } - case themeChoose: { - return img.themeChoose(); - } - case triangle: { - return img.triangle(); - } - default: - return null; - } + public ImageResource getImage(final ImageDescriptor imageDescriptor) { + switch (imageDescriptor) { + case accept: { + return img.accept(); } + case add: { + return img.add(); + } + case addGreen: { + return img.addGreen(); + } + case alert: { + return commonRes.alert(); + } + case anybody: { + return img.anybody(); + } + case arrowDownBlack: { + return img.arrowDownBlack(); + } + case arrowDownGreen: { + return img.arrowDownGreen(); + } + case arrowDownWhite: { + return img.arrowDownWhite(); + } + case arrowLeftGreen: { + return img.arrowLeftGreen(); + } + case arrowRightBlack: { + return img.arrowRightBlack(); + } + case arrowRightGreen: { + return img.arrowRightGreen(); + } + case arrowRightWhite: { + return img.arrowRightWhite(); + } + case arrowUpGreen: { + return img.arrowUpGreen(); + } + case bulletAdd: { + return img.bulletAdd(); + } + case bulletBlack: { + return img.bulletBlack(); + } + case bulletBlue: { + return img.bulletBlue(); + } + case bulletDelete: { + return img.bulletDelete(); + } + case bulletGreen: { + return img.bulletGreen(); + } + case bulletPink: { + return img.bulletPink(); + } + case bulletPurple: { + return img.bulletPurple(); + } + case bulletRed: { + return img.bulletRed(); + } + case bulletStar: { + return img.bulletStar(); + } + case bulletToggleMinus: { + return img.bulletToggleMinus(); + } + case bulletTogglePlus: { + return img.bulletTogglePlus(); + } + case bulletYellow: { + return img.bulletYellow(); + } + case button15cblue: { + return img.button15cblue(); + } + case button15cdark: { + return img.button15cdark(); + } + case button15clight: { + return img.button15clight(); + } + case button15cxlight: { + return img.button15cxlight(); + } + case button15lblue: { + return img.button15lblue(); + } + case button15ldark: { + return img.button15ldark(); + } + case button15llight: { + return img.button15llight(); + } + case button15lxlight: { + return img.button15lxlight(); + } + case button15rblue: { + return img.button15rblue(); + } + case button15rdark: { + return img.button15rdark(); + } + case button15rlight: { + return img.button15rlight(); + } + case button15rxlight: { + return img.button15rxlight(); + } + case button17cblue: { + return img.button17cblue(); + } + case button17cdark: { + return img.button17cdark(); + } + case button17clight: { + return img.button17clight(); + } + case button17cxlight: { + return img.button17cxlight(); + } + case button17lblue: { + return img.button17lblue(); + } + case button17ldark: { + return img.button17ldark(); + } + case button17llight: { + return img.button17llight(); + } + case button17lxlight: { + return img.button17lxlight(); + } + case button17rblue: { + return img.button17rblue(); + } + case button17rdark: { + return img.button17rdark(); + } + case button17rlight: { + return img.button17rlight(); + } + case button17rxlight: { + return img.button17rxlight(); + } + case button20cblue: { + return img.button20cblue(); + } + case button20cdark: { + return img.button20cdark(); + } + case button20clight: { + return img.button20clight(); + } + case button20cxlight: { + return img.button20cxlight(); + } + case button20lblue: { + return img.button20lblue(); + } + case button20ldark: { + return img.button20ldark(); + } + case button20llight: { + return img.button20llight(); + } + case button20lxlight: { + return img.button20lxlight(); + } + case button20rblue: { + return img.button20rblue(); + } + case button20rdark: { + return img.button20rdark(); + } + case button20rlight: { + return img.button20rlight(); + } + case button20rxlight: { + return img.button20rxlight(); + } + case buttonArrowDown: { + return img.buttonArrowDown(); + } + case buttonHelpBlue: { + return img.buttonHelpBlue(); + } + case buttonHelpDark: { + return img.buttonHelpDark(); + } + case buttonHelpLight: { + return img.buttonHelpLight(); + } + case buttonSitebarArrowDown: { + return img.arrowdownsquarewhite(); + } + case by80x15: { + return img.by80x15(); + } + case bync80x15: { + return img.bync80x15(); + } + case byncnd80x15: { + return img.byncnd80x15(); + } + case byncsa80x15: { + return img.byncsa80x15(); + } + case bynd80x15: { + return img.bynd80x15(); + } + case bysa80x15: { + return img.bysa80x15(); + } + case cancel: { + return img.cancel(); + } + case clear: { + return img.clear(); + } + case copyleft: { + return img.copyleft(); + } + case cross: { + return img.cross(); + } + case crossDark: { + return img.crossDark(); + } + case del: { + return img.del(); + } + case emblemImportant: { + return img.emblemImportant(); + } + case emblemSystem: { + return img.emblemSystem(); + } + case error: { + return commonRes.error(); + } + case everybody: { + return img.everybody(); + } + case fullscreen: { + return img.fullscreen(); + } + case gnuFdl: { + return img.gnuFdl(); + } + case groupDefIcon: { + return img.groupDefIcon(); + } + case groupHome: { + return img.groupHome(); + } + case important: { + return commonRes.important(); + } + case info: { + return commonRes.info(); + } + case infoLight: { + return img.infoLight(); + } + case kuneClose: { + return img.kuneClose(); + } + case kuneExternalWindow: { + return img.kuneExternalWindow(); + } + case kuneHelpTranslationIcon: { + return img.kuneHelpTranslationIcon(); + } + case kuneIcon16: { + return img.kuneIcon16(); + } + case kuneLogo16px: { + return img.kuneLogo16px(); + } + case kunePreferences: { + return img.kunePreferences(); + } + case kuneSearchIco: { + return img.kuneSearchIco(); + } + case kuneSearchIcoPush: { + return img.kuneSearchIcoPush(); + } + case language: { + return img.language(); + } + case nobody: { + return img.nobody(); + } + case noCopyleft: { + return img.noCopyleft(); + } + case nt: { + return img.nt(); + } + case opentriangle: { + return img.opentriangle(); + } + case personDef: { + return img.personDef(); + } + case remove: { + return img.remove(); + } + case rssIcon: { + return img.rssIcon(); + } + case searchIco: { + return img.searchIco(); + } + case spinKuneThundGreen: { + return img.spinKuneThundGreen(); + } + case splitterVertBar: { + return img.splitterVertBar(); + } + case star10: { + return img.star10(); + } + case star20: { + return img.star20(); + } + case star30: { + return img.star30(); + } + case star40: { + return img.star40(); + } + case star50: { + return img.star50(); + } + case star60: { + return img.star60(); + } + case star70: { + return img.star70(); + } + case star80: { + return img.star80(); + } + case star90: { + return img.star90(); + } + case starGrey: { + return img.starGrey(); + } + case starSmallYellow: { + return img.starSmallYellow(); + } + case starVsmallYellow: { + return img.starVsmallYellow(); + } + case starYellow: { + return img.starYellow(); + } + case step1: { + return img.step1(); + } + case step2: { + return img.step2(); + } + case step3: { + return img.step3(); + } + case step4: { + return img.step4(); + } + case step5: { + return img.step5(); + } + case themeChoose: { + return img.themeChoose(); + } + case triangle: { + return img.triangle(); + } + default: + return null; + } + } - public String getImageHtml(final ImageDescriptor imageDescriptor) { - return AbstractImagePrototype.create(getImage(imageDescriptor)).getHTML(); - } + public String getImageHtml(final ImageDescriptor imageDescriptor) { + return AbstractImagePrototype.create(getImage(imageDescriptor)).getHTML(); + } } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,7 +20,7 @@ package cc.kune.core.client.sitebar; import cc.kune.common.client.ui.dialogs.BasicTopDialog; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; Modified: trunk/src/main/java/cc/kune/core/client/sitebar/ErrorsDialog.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/ErrorsDialog.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sitebar/ErrorsDialog.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,11 +19,11 @@ */ package cc.kune.core.client.sitebar; +import cc.kune.common.client.events.UserNotifyEvent; import cc.kune.common.client.notify.NotifyLevel; import cc.kune.common.client.ui.IconLabel; import cc.kune.common.client.ui.dialogs.BasicTopDialog; -import cc.kune.core.client.notify.msgs.UserNotifyEvent; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.msgs.client.resources.UserMessageImagesUtil; import com.google.gwt.core.client.GWT; Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -30,6 +30,7 @@ import cc.kune.common.client.actions.ui.descrip.SubMenuDescriptor; import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor; import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor.Type; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.services.FileDownloadUtils; @@ -42,7 +43,6 @@ import cc.kune.core.client.state.UserSignOutEvent.UserSignOutHandler; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.UserInfoDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,9 +21,9 @@ import cc.kune.common.client.actions.ui.ActionSimplePanel; import cc.kune.common.client.actions.ui.IsActionExtensible; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.sitebar.SitebarActionsPresenter.SitebarActionsView; import cc.kune.core.client.sitebar.logo.SiteLogo; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import com.google.gwt.user.client.ui.Widget; Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -30,10 +30,11 @@ 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.common.client.resources.CommonResources; import cc.kune.common.client.ui.KuneWindowUtils; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; @@ -67,8 +68,8 @@ private static final MenuDescriptor OPTIONS_MENU = new MenuDescriptor(); private static final ToolbarDescriptor RIGHT_TOOLBAR = new ToolbarDescriptor(); public static final String SITE_OPTIONS_MENU = "kune-sop-om"; + private final CommonResources commonRes; private final I18nTranslationService i18n; - private final CoreResources icons; private final Provider<SitebarNewGroupLink> newGroupLink; private final CoreResources res; private final Provider<SitebarSignInLink> signInLink; @@ -78,14 +79,15 @@ public SitebarActionsPresenter(final EventBus eventBus, final SitebarActionsView view, final SitebarActionsProxy proxy, final I18nTranslationService i18n, final Provider<SitebarNewGroupLink> newGroupLink, final Provider<SitebarSignOutLink> signOutLink, - final Provider<SitebarSignInLink> signInLink, final CoreResources res, final CoreResources icons) { + final Provider<SitebarSignInLink> signInLink, final CoreResources res, + final CommonResources commonRes) { super(eventBus, view, proxy); this.i18n = i18n; this.newGroupLink = newGroupLink; this.signOutLink = signOutLink; this.signInLink = signInLink; this.res = res; - this.icons = icons; + this.commonRes = commonRes; init(); } @@ -98,7 +100,7 @@ } }); gotoKuneDevSite.putValue(Action.NAME, i18n.t("kune development site")); - gotoKuneDevSite.putValue(Action.SMALL_ICON, icons.kuneIcon16()); + gotoKuneDevSite.putValue(Action.SMALL_ICON, res.kuneIcon16()); return gotoKuneDevSite; } @@ -135,7 +137,7 @@ } }; bugsAction.putValue(Action.NAME, i18n.t("Report Kune issues/problems")); - bugsAction.putValue(Action.SMALL_ICON, icons.bug()); + bugsAction.putValue(Action.SMALL_ICON, res.bug()); final AbstractExtendedAction errorAction = new AbstractExtendedAction() { @Override @@ -161,9 +163,9 @@ wavePowered.putValue(Action.NAME, i18n.t("Apache Wave powered")); wavePowered.putValue(Action.SMALL_ICON, res.waveIcon()); aboutAction.putValue(Action.NAME, i18n.t("About kune")); - aboutAction.putValue(Action.SMALL_ICON, res.info()); + aboutAction.putValue(Action.SMALL_ICON, commonRes.info()); errorAction.putValue(Action.NAME, i18n.t("Errors info")); - errorAction.putValue(Action.SMALL_ICON, res.important()); + errorAction.putValue(Action.SMALL_ICON, commonRes.important()); // aboutAction.setShortcut(shortcut); // shortcutReg.put(shortcut, aboutAction); Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -23,9 +23,9 @@ import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.state.SiteTokens; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -25,20 +25,20 @@ import cc.kune.common.client.actions.BeforeActionCollection; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.common.client.errors.UIException; +import cc.kune.common.client.events.ProgressHideEvent; +import cc.kune.common.client.events.ProgressShowEvent; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.auth.WaveClientSimpleAuthenticator; import cc.kune.core.client.cookies.CookiesManager; import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.errors.SessionExpiredException; import cc.kune.core.client.errors.UserMustBeLoggedException; -import cc.kune.core.client.notify.spiner.ProgressHideEvent; -import cc.kune.core.client.notify.spiner.ProgressShowEvent; import cc.kune.core.client.rpcservices.UserServiceAsync; 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.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.rpc.AsyncCallback; Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,7 +19,7 @@ \*/ package cc.kune.core.client.sitebar.search; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import com.google.gwt.event.dom.client.BlurEvent; import com.google.gwt.event.dom.client.BlurHandler; Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,6 +22,7 @@ import cc.kune.common.client.log.Log; import cc.kune.common.client.notify.NotifyLevel; import cc.kune.common.client.ui.MaskWidgetView; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.auth.SignIn; import cc.kune.core.client.events.WindowFocusEvent; import cc.kune.core.client.init.AppStartEvent; @@ -30,7 +31,6 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.client.state.TokenUtils; import cc.kune.core.client.state.UserSignOutEvent; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import cc.kune.gspace.client.style.GSpaceBackManager; Modified: trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -29,10 +29,10 @@ import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.ui.BasicThumb; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.avatar.SmallAvatarDecorator; import cc.kune.core.client.dnd.KuneDragController; import cc.kune.core.client.dnd.NotImplementedDropManager; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import com.google.gwt.core.client.GWT; Modified: trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -24,12 +24,12 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.ui.BasicThumb; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.avatar.SmallAvatarDecorator; import cc.kune.core.client.dnd.KuneDragController; import cc.kune.core.client.dnd.NotImplementedDropManager; import cc.kune.core.client.sn.GroupSNPresenter.GroupSNView; import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import com.google.gwt.user.client.ui.Widget; Modified: trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -23,6 +23,7 @@ import cc.kune.common.client.actions.ui.bind.GuiProvider; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.common.client.ui.BasicThumb; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.avatar.SmallAvatarDecorator; import cc.kune.core.client.dnd.KuneDragController; import cc.kune.core.client.dnd.NotImplementedDropManager; @@ -30,7 +31,6 @@ import cc.kune.core.client.sn.UserSNPresenter.UserSNView; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.UserSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import com.google.gwt.user.client.ui.Label; Modified: trunk/src/main/java/cc/kune/core/client/sn/UserSNPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/UserSNPresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/UserSNPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -23,6 +23,7 @@ import cc.kune.common.client.actions.ui.IsActionExtensible; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.sn.UserSNPresenter.UserSNProxy; import cc.kune.core.client.sn.UserSNPresenter.UserSNView; @@ -41,7 +42,6 @@ import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.UserBuddiesDataDTO; import cc.kune.core.shared.dto.UserSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -23,6 +23,7 @@ import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; @@ -30,7 +31,6 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.SocialNetworkDataDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/AddEntityToThisGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/AddEntityToThisGroupAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/AddEntityToThisGroupAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -23,6 +23,7 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.SimpleResponseCallback; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; @@ -32,7 +33,6 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.SocialNetworkDataDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -24,11 +24,11 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.SimpleResponseCallback; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.sitebar.search.EntitySearchPanel; import cc.kune.core.client.sitebar.search.OnEntitySelectedInSearch; import cc.kune.core.client.sn.SimpleContactManager; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -23,6 +23,7 @@ import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; @@ -30,7 +31,6 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.SocialNetworkDataDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -23,6 +23,7 @@ import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; @@ -30,7 +31,6 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.SocialNetworkDataDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -23,6 +23,7 @@ import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; @@ -30,7 +31,6 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.SocialNetworkDataDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,9 +22,9 @@ 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.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,9 +19,9 @@ */ package cc.kune.core.client.sn.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/GotoPersonAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/GotoPersonAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/GotoPersonAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,9 +19,9 @@ */ package cc.kune.core.client.sn.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/GotoYourHomePageAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/GotoYourHomePageAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/GotoYourHomePageAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,9 +19,9 @@ */ package cc.kune.core.client.sn.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -24,6 +24,7 @@ import cc.kune.common.client.notify.NotifyLevel; import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.SimpleResponseCallback; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.auth.SignIn; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; @@ -35,7 +36,6 @@ import cc.kune.core.client.state.TokenUtils; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.SocialNetworkRequestResult; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/MembersModerationAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/MembersModerationAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/MembersModerationAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,11 +22,11 @@ import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.shared.domain.AdmissionType; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/MembersVisibilityAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/MembersVisibilityAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/MembersVisibilityAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,11 +22,11 @@ import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.shared.domain.SocialNetworkVisibility; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -23,6 +23,7 @@ import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; @@ -30,7 +31,6 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.SocialNetworkDataDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/SNRolAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/SNRolAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/SNRolAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,6 +19,7 @@ */ package cc.kune.core.client.sn.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.RolActionAutoUpdated; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; @@ -26,7 +27,6 @@ import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -23,6 +23,7 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.OnAcceptCallback; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; @@ -30,7 +31,6 @@ import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -23,6 +23,7 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.OnAcceptCallback; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.RolAction; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; @@ -32,7 +33,6 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/UserSNVisibilityAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/UserSNVisibilityAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/UserSNVisibilityAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,12 +22,12 @@ import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.UserServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.UserSNetVisibility; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -24,13 +24,13 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.SimpleResponseCallback; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAdmins.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAdmins.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAdmins.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.core.client.sn.actions; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.sn.actions.registry.GroupSNConfActions; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToMembers.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToMembers.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToMembers.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.core.client.sn.actions; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.sn.actions.registry.GroupSNConfActions; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNAdminsMenuItemsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNAdminsMenuItemsRegistry.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNAdminsMenuItemsRegistry.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,6 +20,7 @@ package cc.kune.core.client.sn.actions.registry; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.sn.actions.AcceptJoinGroupAction; import cc.kune.core.client.sn.actions.ChangeToAdminAction; import cc.kune.core.client.sn.actions.ChangeToCollabAction; @@ -37,7 +38,6 @@ import cc.kune.core.client.sn.actions.conditions.IsNotMeCondition; import cc.kune.core.client.sn.actions.conditions.IsPersonCondition; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNCollabsMenuItemsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNCollabsMenuItemsRegistry.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNCollabsMenuItemsRegistry.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,6 +20,7 @@ package cc.kune.core.client.sn.actions.registry; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.sn.actions.AcceptJoinGroupAction; import cc.kune.core.client.sn.actions.ChangeToAdminAction; import cc.kune.core.client.sn.actions.ChangeToCollabAction; @@ -37,7 +38,6 @@ import cc.kune.core.client.sn.actions.conditions.IsNotMeCondition; import cc.kune.core.client.sn.actions.conditions.IsPersonCondition; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -26,6 +26,7 @@ import cc.kune.common.client.actions.ui.descrip.MenuRadioItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuTitleItemDescriptor; import cc.kune.common.client.actions.ui.descrip.SubMenuDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.sn.GroupSNPresenter; import cc.kune.core.client.sn.actions.AddEntityToThisGroupAction; @@ -45,7 +46,6 @@ import cc.kune.core.shared.domain.SocialNetworkVisibility; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -24,6 +24,7 @@ import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuRadioItemDescriptor; import cc.kune.common.client.actions.ui.descrip.SubMenuDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.sn.UserSNPresenter; import cc.kune.core.client.sn.actions.AddNewBuddiesAction; @@ -35,7 +36,6 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.UserSNetVisibility; import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNMenuItemsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNMenuItemsRegistry.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNMenuItemsRegistry.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,6 +20,7 @@ package cc.kune.core.client.sn.actions.registry; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.sn.actions.AcceptJoinGroupAction; import cc.kune.core.client.sn.actions.ChangeToAdminAction; import cc.kune.core.client.sn.actions.ChangeToCollabAction; @@ -39,7 +40,6 @@ import cc.kune.core.client.sn.actions.conditions.IsNotMeCondition; import cc.kune.core.client.sn.actions.conditions.IsPersonCondition; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,9 +22,9 @@ import java.util.HashMap; import java.util.Map; +import cc.kune.common.client.events.ProgressShowEvent; import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.init.AppStartEvent.AppStartHandler; -import cc.kune.core.client.notify.spiner.ProgressShowEvent; import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.state.UserSignInOrSignOutEvent.UserSignInOrSignOutHandler; import cc.kune.core.shared.domain.utils.StateToken; Modified: trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -27,11 +27,11 @@ import cc.kune.common.client.actions.BeforeActionCollection; import cc.kune.common.client.actions.BeforeActionListener; +import cc.kune.common.client.events.ProgressHideEvent; import cc.kune.common.client.log.Log; import cc.kune.common.client.utils.Pair; import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.init.AppStartEvent.AppStartHandler; -import cc.kune.core.client.notify.spiner.ProgressHideEvent; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.sitebar.spaces.Space; import cc.kune.core.client.sitebar.spaces.SpaceConfEvent; Modified: trunk/src/main/java/cc/kune/core/client/ui/ContentPosition.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/ContentPosition.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/ui/ContentPosition.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,7 +21,7 @@ import org.cobogw.gwt.user.client.CSS; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import com.google.gwt.dom.client.Element; import com.google.gwt.user.client.DOM; Added: trunk/src/main/java/cc/kune/core/client/ui/dialogs/WizardFormDialog.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/dialogs/WizardFormDialog.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/WizardFormDialog.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -0,0 +1,62 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.core.client.ui.dialogs; + +import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.client.ui.MaskWidget; +import cc.kune.common.client.ui.dialogs.wizard.WizardDialog; +import cc.kune.common.shared.i18n.I18nTranslationService; +import cc.kune.core.client.ui.DefaultForm; + +import com.google.gwt.user.client.ui.IsWidget; +import com.google.gwt.user.client.ui.Widget; + +public class WizardFormDialog extends WizardDialog { + + public WizardFormDialog(final String dialogId, final String header, final boolean modal, + final boolean minimizable, final String width, final String height, final String backId, + final String nextId, final String finishId, final String cancelId, final String closeId, + final I18nTranslationService i18n, final MaskWidget maskWidget) { + super(dialogId, header, modal, minimizable, width, height, backId, nextId, finishId, cancelId, + closeId, i18n, maskWidget); + } + + @Override + protected int getWidgetCount(final IsWidget view) { + if (view instanceof Widget) { + return deck.getWidgetIndex((Widget) view); + } else if (view instanceof DefaultForm) { + return deck.getWidgetIndex(((DefaultForm) view).getFormPanel()); + } + return -1; + } + + @Override + protected Widget toWidget(final IsWidget view) { + if (view instanceof Widget) { + return (Widget) view; + } else if (view instanceof DefaultForm) { + return ((DefaultForm) view).getFormPanel(); + } else { + NotifyUser.error("Trying to add a unknown element in WizardDialog"); + return null; + } + } +} Modified: trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -23,13 +23,13 @@ import cc.kune.common.client.actions.ui.bind.GuiProvider; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.utils.UrlParam; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.ws.entheader.EntityHeaderPresenter.EntityHeaderView; import cc.kune.core.shared.FileConstants; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import com.google.gwt.user.client.ui.AbstractImagePrototype; Modified: trunk/src/main/java/cc/kune/core/server/AbstractServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/AbstractServerTool.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/server/AbstractServerTool.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,6 +22,7 @@ import java.util.Date; import java.util.List; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.errors.ContainerNotPermittedException; import cc.kune.core.client.errors.ContentNotPermittedException; import cc.kune.core.server.content.ContainerManager; @@ -32,7 +33,6 @@ import cc.kune.core.server.tool.ServerToolRegistry; import cc.kune.core.server.tool.ServerToolTarget; import cc.kune.core.shared.domain.ContentStatus; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.AccessLists; import cc.kune.domain.Container; import cc.kune.domain.Content; Modified: trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,6 +22,7 @@ import static cc.kune.core.server.OutermostCallInterceptor.outermostCall; import cc.kune.chat.server.ChatManager; import cc.kune.chat.server.ChatManagerDefault; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.rpcservices.ContentService; import cc.kune.core.client.rpcservices.GroupService; import cc.kune.core.client.rpcservices.I18nService; @@ -101,7 +102,6 @@ import cc.kune.core.server.users.UserInfoServiceDefault; import cc.kune.core.server.xmpp.XmppManager; import cc.kune.core.server.xmpp.XmppManagerDefault; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.SocialNetwork; import cc.kune.hspace.client.ClientStatsService; import cc.kune.lists.client.rpc.ListsService; Modified: trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,9 +20,9 @@ package cc.kune.core.server.i18n; import cc.kune.common.client.utils.TextUtils; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.server.UserSessionManager; import cc.kune.core.server.manager.I18nTranslationManager; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.I18nTranslation; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/core/server/manager/file/EntityBackgroundUploadManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/file/EntityBackgroundUploadManager.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/server/manager/file/EntityBackgroundUploadManager.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -25,6 +25,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.server.auth.ActionLevel; import cc.kune.core.server.auth.Authenticated; import cc.kune.core.server.auth.Authorizated; @@ -33,7 +34,6 @@ import cc.kune.core.server.properties.KuneProperties; import cc.kune.core.shared.domain.AccessRol; import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.BasicMimeType; import cc.kune.domain.Group; Modified: trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoUploadManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoUploadManager.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoUploadManager.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -29,6 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.server.auth.ActionLevel; import cc.kune.core.server.auth.Authenticated; import cc.kune.core.server.auth.Authorizated; @@ -37,7 +38,6 @@ import cc.kune.core.shared.FileConstants; import cc.kune.core.shared.domain.AccessRol; import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.BasicMimeType; import cc.kune.domain.Group; Modified: trunk/src/main/java/cc/kune/core/server/manager/file/FileJsonUploadManagerAbstract.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/file/FileJsonUploadManagerAbstract.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/server/manager/file/FileJsonUploadManagerAbstract.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse; import net.sf.json.JSONObject; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/core/server/manager/file/FileUploadManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/file/FileUploadManager.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/server/manager/file/FileUploadManager.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -25,6 +25,7 @@ import org.apache.commons.fileupload.FileItem; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.server.UserSessionManager; import cc.kune.core.server.access.AccessService; import cc.kune.core.server.auth.ActionLevel; @@ -37,7 +38,6 @@ import cc.kune.core.server.utils.StringW; import cc.kune.core.shared.domain.AccessRol; import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.BasicMimeType; import cc.kune.domain.Container; import cc.kune.domain.Content; Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -32,6 +32,7 @@ import org.apache.lucene.search.Query; import org.hibernate.exception.ConstraintViolationException; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.errors.EmailAddressInUseException; @@ -52,7 +53,6 @@ import cc.kune.core.shared.domain.SocialNetworkVisibility; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.GroupType; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.AccessLists; import cc.kune.domain.Content; import cc.kune.domain.Group; Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -44,6 +44,7 @@ import org.waveprotocol.wave.model.waveref.WaveRef; import cc.kune.common.client.utils.TextUtils; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.errors.EmailAddressInUseException; import cc.kune.core.client.errors.GroupLongNameInUseException; @@ -65,7 +66,6 @@ import cc.kune.core.shared.domain.UserSNetVisibility; import cc.kune.core.shared.dto.I18nLanguageSimpleDTO; import cc.kune.core.shared.dto.UserDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.Group; import cc.kune.domain.I18nCountry; import cc.kune.domain.I18nLanguage; Modified: trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,13 +22,13 @@ import org.waveprotocol.wave.model.waveref.InvalidWaveRefException; import org.waveprotocol.wave.util.escapers.jvm.JavaWaverefEncoder; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.errors.DefaultException; import cc.kune.core.server.access.AccessRightsService; import cc.kune.core.server.content.ContentManager; import cc.kune.core.server.manager.GroupManager; import cc.kune.core.server.manager.SocialNetworkManager; import cc.kune.core.server.manager.TagUserContentManager; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.Container; import cc.kune.domain.Content; import cc.kune.domain.Group; Modified: trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -24,9 +24,9 @@ import static cc.kune.docs.shared.DocsConstants.TYPE_FOLDER; import static cc.kune.docs.shared.DocsConstants.TYPE_ROOT; import static cc.kune.docs.shared.DocsConstants.TYPE_UPLOADEDFILE; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.docs.shared.DocsConstants; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; Modified: trunk/src/main/java/cc/kune/docs/client/DocsGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/DocsGinModule.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/docs/client/DocsGinModule.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,7 +19,7 @@ */ package cc.kune.docs.client; -import cc.kune.common.client.ExtendedGinModule; +import cc.kune.core.client.ExtendedGinModule; import cc.kune.docs.client.actions.DocsClientActions; import cc.kune.docs.client.actions.DocsFolderNewMenu; import cc.kune.docs.client.actions.DocsNewMenu; Modified: trunk/src/main/java/cc/kune/docs/client/actions/DelDocMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/DelDocMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/docs/client/actions/DelDocMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.docs.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.DelContentMenuItem; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/docs/client/actions/DelFolderMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/DelFolderMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/docs/client/actions/DelFolderMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.docs.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.DelContainerMenuItem; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/docs/client/actions/GoParentFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/GoParentFolderBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/docs/client/actions/GoParentFolderBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,9 +19,9 @@ */ package cc.kune.docs.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.docs.shared.DocsConstants; import cc.kune.gspace.client.actions.GoParentContainerBtn; Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewDocIconBtn.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/NewDocIconBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/docs/client/actions/NewDocIconBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.docs.client.actions; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.docs.shared.DocsConstants; import cc.kune.gspace.client.actions.NewContentAction; import cc.kune.gspace.client.actions.NewContentBtn; Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewDocMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/NewDocMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/docs/client/actions/NewDocMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.docs.client.actions; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.docs.shared.DocsConstants; import cc.kune.gspace.client.actions.NewContentAction; import cc.kune.gspace.client.actions.NewContentMenuItem; Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/NewFolderBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/docs/client/actions/NewFolderBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.docs.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.docs.shared.DocsConstants; import cc.kune.gspace.client.actions.NewContainerBtn; Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewFolderMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/NewFolderMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/docs/client/actions/NewFolderMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.docs.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.docs.shared.DocsConstants; import cc.kune.gspace.client.actions.NewContainerMenuItem; Modified: trunk/src/main/java/cc/kune/docs/client/actions/OpenDocMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/OpenDocMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/docs/client/actions/OpenDocMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.docs.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.OpenContentMenuItem; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -28,13 +28,13 @@ import java.util.Arrays; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.server.AbstractServerTool; import cc.kune.core.server.content.ContainerManager; import cc.kune.core.server.content.ContentManager; import cc.kune.core.server.content.CreationService; import cc.kune.core.server.manager.ToolConfigurationManager; import cc.kune.core.server.tool.ServerToolTarget; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.docs.shared.DocsConstants; import cc.kune.domain.Container; import cc.kune.domain.Content; Modified: trunk/src/main/java/cc/kune/events/client/EventsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/EventsClientTool.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/events/client/EventsClientTool.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -23,9 +23,9 @@ import static cc.kune.events.shared.EventsConstants.ROOT_NAME; import static cc.kune.events.shared.EventsConstants.TYPE_MEETING; import static cc.kune.events.shared.EventsConstants.TYPE_ROOT; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; Modified: trunk/src/main/java/cc/kune/events/client/EventsGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/EventsGinModule.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/events/client/EventsGinModule.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,7 +19,7 @@ */ package cc.kune.events.client; -import cc.kune.common.client.ExtendedGinModule; +import cc.kune.core.client.ExtendedGinModule; import cc.kune.events.client.actions.Calendar1DayViewSelectBtn; import cc.kune.events.client.actions.Calendar3DaysViewSelectBtn; import cc.kune.events.client.actions.Calendar7DaysViewSelectBtn; Modified: trunk/src/main/java/cc/kune/events/client/actions/Calendar1DayViewSelectBtn.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/Calendar1DayViewSelectBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/events/client/actions/Calendar1DayViewSelectBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -1,6 +1,6 @@ package cc.kune.events.client.actions; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import com.bradrydzewski.gwt.calendar.client.CalendarViews; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/events/client/actions/Calendar3DaysViewSelectBtn.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/Calendar3DaysViewSelectBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/events/client/actions/Calendar3DaysViewSelectBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -1,6 +1,6 @@ package cc.kune.events.client.actions; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import com.bradrydzewski.gwt.calendar.client.CalendarViews; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/events/client/actions/Calendar7DaysViewSelectBtn.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/Calendar7DaysViewSelectBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/events/client/actions/Calendar7DaysViewSelectBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -1,6 +1,6 @@ package cc.kune.events.client.actions; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import com.bradrydzewski.gwt.calendar.client.CalendarViews; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/events/client/actions/CalendarGoNextBtn.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/CalendarGoNextBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/events/client/actions/CalendarGoNextBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -1,7 +1,7 @@ package cc.kune.events.client.actions; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.viewers.ToolbarStyles; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/events/client/actions/CalendarGoPrevBtn.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/CalendarGoPrevBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/events/client/actions/CalendarGoPrevBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -1,7 +1,7 @@ package cc.kune.events.client.actions; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.viewers.ToolbarStyles; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/events/client/actions/CalendarGoTodayBtn.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/CalendarGoTodayBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/events/client/actions/CalendarGoTodayBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -1,7 +1,7 @@ package cc.kune.events.client.actions; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.viewers.ToolbarStyles; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/events/client/actions/CalendarMonthViewSelectBtn.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/CalendarMonthViewSelectBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/events/client/actions/CalendarMonthViewSelectBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -1,6 +1,6 @@ package cc.kune.events.client.actions; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import com.bradrydzewski.gwt.calendar.client.CalendarViews; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/events/client/actions/DelMeetingMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/DelMeetingMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/events/client/actions/DelMeetingMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.events.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.DelContentMenuItem; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/events/client/actions/GoParentFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/GoParentFolderBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/events/client/actions/GoParentFolderBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,9 +19,9 @@ */ package cc.kune.events.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.events.shared.EventsConstants; import cc.kune.gspace.client.actions.GoParentContainerBtn; Modified: trunk/src/main/java/cc/kune/events/client/actions/NewMeetingBtn.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/NewMeetingBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/events/client/actions/NewMeetingBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.events.client.actions; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.events.shared.EventsConstants; import cc.kune.gspace.client.actions.NewContentAction; import cc.kune.gspace.client.actions.NewContentBtn; Modified: trunk/src/main/java/cc/kune/events/client/actions/OpenMeetingMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/OpenMeetingMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/events/client/actions/OpenMeetingMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.events.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.OpenContentMenuItem; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPanel.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -4,11 +4,11 @@ import java.util.Date; import cc.kune.common.client.actions.ui.bind.GuiProvider; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.dnd.FolderViewerDropController; import cc.kune.core.client.dnd.KuneDragController; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.events.client.viewer.CalendarViewerPresenter.CalendarViewerView; import cc.kune.gspace.client.GSpaceArmor; import cc.kune.gspace.client.viewers.AbstractFolderViewerPanel; Modified: trunk/src/main/java/cc/kune/events/server/EventsServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/events/server/EventsServerTool.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/events/server/EventsServerTool.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -29,6 +29,7 @@ import java.util.Collections; import java.util.Date; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.server.AbstractServerTool; import cc.kune.core.server.content.ContainerManager; import cc.kune.core.server.content.ContentManager; @@ -39,7 +40,6 @@ import cc.kune.core.server.utils.UrlUtils; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.domain.GroupListMode; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.AccessLists; import cc.kune.domain.Container; import cc.kune.domain.Content; Modified: trunk/src/main/java/cc/kune/gallery/server/GalleryServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/gallery/server/GalleryServerTool.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gallery/server/GalleryServerTool.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -27,13 +27,13 @@ import java.util.Arrays; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.server.AbstractServerTool; import cc.kune.core.server.content.ContainerManager; import cc.kune.core.server.content.ContentManager; import cc.kune.core.server.content.CreationService; import cc.kune.core.server.manager.ToolConfigurationManager; import cc.kune.core.server.tool.ServerToolTarget; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.Container; import cc.kune.domain.Group; import cc.kune.domain.User; Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,7 +19,7 @@ */ package cc.kune.gspace.client; -import cc.kune.common.client.ExtendedGinModule; +import cc.kune.core.client.ExtendedGinModule; import cc.kune.core.client.sitebar.search.SitebarSearchPanel; import cc.kune.core.client.sitebar.search.SitebarSearchPresenter; import cc.kune.core.client.sn.actions.WriteToBuddyHeaderButton; Modified: trunk/src/main/java/cc/kune/gspace/client/actions/AbstractNewMenu.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/AbstractNewMenu.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/actions/AbstractNewMenu.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,11 +20,11 @@ package cc.kune.gspace.client.actions; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.AccessRightsChangedEvent; import cc.kune.core.client.state.AccessRightsChangedEvent.AccessRightsChangedHandler; import cc.kune.core.client.state.AccessRightsClientManager; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -24,6 +24,7 @@ import cc.kune.common.client.notify.ConfirmAskEvent; import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.OnAcceptCallback; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.RolAction; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.ContentServiceAsync; @@ -32,7 +33,6 @@ import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.AbstractContentSimpleDTO; import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.viewers.FolderViewerPresenter; import com.google.gwt.event.shared.EventBus; Modified: trunk/src/main/java/cc/kune/gspace/client/actions/DelContentMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/DelContentMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/actions/DelContentMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -24,6 +24,7 @@ import cc.kune.common.client.notify.ConfirmAskEvent; import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.OnAcceptCallback; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.RolAction; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; @@ -34,7 +35,6 @@ import cc.kune.core.shared.dto.AbstractContentSimpleDTO; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.viewers.FolderViewerPresenter; import com.google.gwt.event.shared.EventBus; Modified: trunk/src/main/java/cc/kune/gspace/client/actions/GoParentContainerBtn.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/GoParentContainerBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/actions/GoParentContainerBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -23,6 +23,7 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; @@ -31,7 +32,6 @@ import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,6 +22,7 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.RolAction; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.ContentServiceAsync; @@ -31,7 +32,6 @@ import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.HasContent; import cc.kune.core.shared.dto.StateContainerDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.viewers.FolderViewerPresenter; import com.google.gwt.resources.client.ImageResource; Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -25,6 +25,7 @@ import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.RolAction; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.ContentServiceAsync; @@ -35,7 +36,6 @@ import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.HasContent; import cc.kune.core.shared.dto.StateContainerDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.viewers.FolderViewerPresenter; import com.google.gwt.resources.client.ImageResource; Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContentAction.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/NewContentAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContentAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,6 +21,7 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.RolAction; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.ContentServiceAsync; @@ -29,7 +30,6 @@ import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.viewers.ContentViewerPresenter; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContentBtn.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/NewContentBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContentBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,7 +21,7 @@ import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import com.google.gwt.resources.client.ImageResource; Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContentMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/NewContentMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContentMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -24,7 +24,7 @@ import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import com.google.gwt.resources.client.ImageResource; Modified: trunk/src/main/java/cc/kune/gspace/client/actions/OpenContentMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/OpenContentMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/actions/OpenContentMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,10 +22,10 @@ import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.AbstractContentSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/gspace/client/actions/ParticipateInContentBtn.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/ParticipateInContentBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/actions/ParticipateInContentBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,6 +22,7 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.RolAction; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; @@ -32,7 +33,6 @@ import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/gspace/client/actions/RefreshContentMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/RefreshContentMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/actions/RefreshContentMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.gspace.client.actions; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/gspace/client/actions/RenameAction.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/RenameAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/actions/RenameAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,6 +20,7 @@ package cc.kune.gspace.client.actions; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.errors.NameInUseException; import cc.kune.core.client.errors.NameNotPermittedException; @@ -32,7 +33,6 @@ import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.rpc.AsyncCallback; Modified: trunk/src/main/java/cc/kune/gspace/client/actions/SetAsHomePageMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/SetAsHomePageMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/actions/SetAsHomePageMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,6 +22,7 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.RolAction; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; @@ -31,7 +32,6 @@ import cc.kune.core.shared.dto.AbstractContentSimpleDTO; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.ContentSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/gspace/client/actions/SetContentStatusAsAdminMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/SetContentStatusAsAdminMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/actions/SetContentStatusAsAdminMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -24,6 +24,7 @@ import cc.kune.common.client.notify.ConfirmAskEvent; import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.OnAcceptCallback; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.RolAction; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.ContentServiceAsync; @@ -34,7 +35,6 @@ import cc.kune.core.shared.dto.AbstractContentSimpleDTO; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.viewers.FolderViewerPresenter; import com.google.gwt.event.shared.EventBus; Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/AbstractLanguageSelectorPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/AbstractLanguageSelectorPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/AbstractLanguageSelectorPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,10 +21,10 @@ import cc.kune.common.client.errors.UIException; import cc.kune.common.client.utils.SimpleCallback; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.state.Session; import cc.kune.core.client.ui.DefaultForm; import cc.kune.core.shared.dto.I18nLanguageSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.extjs.gxt.ui.client.data.BaseModel; import com.extjs.gxt.ui.client.event.BaseEvent; Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nToTranslateGridPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nToTranslateGridPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nToTranslateGridPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.gspace.client.i18n; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.shared.dto.I18nLanguageSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.IsWidget; Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslateRecomendPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslateRecomendPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslateRecomendPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,7 +19,7 @@ */ package cc.kune.gspace.client.i18n; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Frame; Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatedGridPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatedGridPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatedGridPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.gspace.client.i18n; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.shared.dto.I18nLanguageSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.IsWidget; Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -17,9 +17,9 @@ import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.utils.TextUtils; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.shared.dto.I18nLanguageSimpleDTO; import cc.kune.core.shared.dto.I18nTranslationDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.BlurEvent; Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,9 +22,9 @@ import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; import cc.kune.common.client.utils.SimpleCallback; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.dto.I18nLanguageSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.i18n.I18nTranslatorPresenter.I18nTranslatorView; import com.extjs.gxt.ui.client.widget.form.FormPanel.LabelAlign; Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.gspace.client.i18n; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorWithoutEnglishPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorWithoutEnglishPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorWithoutEnglishPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.gspace.client.i18n; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/SiteOptionsI18nTranslatorAction.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/SiteOptionsI18nTranslatorAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/SiteOptionsI18nTranslatorAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -23,6 +23,7 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.RolActionAutoUpdated; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.sitebar.SitebarActionsPresenter; @@ -30,7 +31,6 @@ import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseChangeAction.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseChangeAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseChangeAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,13 +21,13 @@ import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.SimpleResponseCallback; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.LicenseDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.ui.footer.license.LicenseChangedEvent; import com.google.gwt.event.shared.EventBus; Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,15 +20,15 @@ package cc.kune.gspace.client.licensewizard; import cc.kune.common.client.ui.MaskWidget; -import cc.kune.common.client.ui.dialogs.wizard.WizardDialog; import cc.kune.common.client.ui.dialogs.wizard.WizardListener; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.core.client.ui.dialogs.WizardFormDialog; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; -public class LicenseWizardPanel extends WizardDialog implements LicenseWizardView { +public class LicenseWizardPanel extends WizardFormDialog implements LicenseWizardView { public static final String BACK_BTN_ID = "k-lwp-back-btn"; public static final String CANCEL_BTN_ID = "k-lwp-cancel-btn"; Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFirstForm.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFirstForm.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFirstForm.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,9 +21,9 @@ import cc.kune.common.client.utils.SimpleCallback; import cc.kune.common.client.utils.TextUtils; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.ui.DefaultForm; import cc.kune.core.client.ui.DefaultFormUtils; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.extjs.gxt.ui.client.Style.Orientation; import com.extjs.gxt.ui.client.event.BaseEvent; Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFlags.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFlags.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFlags.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,10 +19,11 @@ */ package cc.kune.gspace.client.licensewizard.pages; +import cc.kune.common.client.resources.CommonResources; import cc.kune.common.client.ui.IconLabel; import cc.kune.common.client.ui.KuneWindowUtils; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; @@ -35,13 +36,15 @@ private final IconLabel nonCopyleft; private final IconLabel nonCulturalWorks; - public LicenseWizardFlags(final CoreResources images, final I18nTranslationService i18n) { + public LicenseWizardFlags(final CoreResources images, final CommonResources commonRes, + final I18nTranslationService i18n) { copyleft = new IconLabel(images.copyleft(), i18n.t("This is a copyleft license.")); nonCopyleft = new IconLabel(images.noCopyleft(), i18n.t("This is not a copyleft license.")); - culturalWorks = new IconLabel(images.info(), i18n.t("This is appropriate for free cultural works.")); - nonCulturalWorks = new IconLabel(images.alert(), + culturalWorks = new IconLabel(commonRes.info(), + i18n.t("This is appropriate for free cultural works.")); + nonCulturalWorks = new IconLabel(commonRes.alert(), i18n.t("This is not appropriate for free cultural works.")); - nonCommercialReasons = new IconLabel(images.alert(), + nonCommercialReasons = new IconLabel(commonRes.alert(), i18n.t("Reasons not to use a non commercial license.")); addLink(copyleft, "http://en.wikipedia.org/wiki/Copyleft"); addLink(nonCopyleft, "http://en.wikipedia.org/wiki/Copyleft"); Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFrdForm.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFrdForm.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFrdForm.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,10 +20,10 @@ package cc.kune.gspace.client.licensewizard.pages; import cc.kune.common.client.utils.SimpleCallback; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.state.Session; import cc.kune.core.client.ui.DefaultForm; import cc.kune.core.shared.dto.LicenseDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.extjs.gxt.ui.client.data.BaseModel; import com.extjs.gxt.ui.client.event.BaseEvent; Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardSndForm.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardSndForm.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardSndForm.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,9 +19,9 @@ */ package cc.kune.gspace.client.licensewizard.pages; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.ui.DefaultForm; import cc.kune.core.client.ui.DefaultFormUtils; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.extjs.gxt.ui.client.widget.form.FieldSet; import com.extjs.gxt.ui.client.widget.form.Radio; Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardTrdForm.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardTrdForm.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardTrdForm.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,11 +19,12 @@ */ package cc.kune.gspace.client.licensewizard.pages; +import cc.kune.common.client.resources.CommonResources; import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.utils.SimpleCallback; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.ui.DefaultForm; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.extjs.gxt.ui.client.Style.Orientation; import com.extjs.gxt.ui.client.event.BaseEvent; @@ -56,7 +57,8 @@ private Radio permitModSaRadio; @Inject - public LicenseWizardTrdForm(final I18nTranslationService i18n, final CoreResources res) { + public LicenseWizardTrdForm(final I18nTranslationService i18n, final CoreResources res, + final CommonResources commonRes) { super.setFrame(true); super.setPadding(10); super.setAutoHeight(true); @@ -77,7 +79,7 @@ createRadios(i18n, commercialfieldSet, modificationsfieldSet); createRadioListeners(); - info = new LicenseWizardFlags(res, i18n); + info = new LicenseWizardFlags(res, commonRes, i18n); add(intro); add(commercialfieldSet); Modified: trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,9 +22,9 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.ws.entheader.EntityHeader; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.options.GroupOptionsPresenter.GroupOptionsView; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -25,6 +25,7 @@ import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateChangedEvent; @@ -33,7 +34,6 @@ import cc.kune.core.client.state.UserSignOutEvent; import cc.kune.core.client.state.UserSignOutEvent.UserSignOutHandler; import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.options.GroupOptionsPresenter.GroupOptionsView; import com.google.gwt.event.shared.EventBus; Modified: trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,9 +21,9 @@ import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.ws.entheader.EntityHeader; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.options.UserOptionsPresenter.UserOptionsView; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -24,6 +24,7 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.sitebar.SiteUserOptions; import cc.kune.core.client.state.Session; @@ -32,7 +33,6 @@ 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 cc.kune.gspace.client.options.UserOptionsPresenter.UserOptionsView; import com.google.gwt.event.shared.EventBus; Modified: trunk/src/main/java/cc/kune/gspace/client/options/general/GroupOptGeneralPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/general/GroupOptGeneralPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/general/GroupOptGeneralPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,9 +20,9 @@ package cc.kune.gspace.client.options.general; import cc.kune.common.client.ui.MaskWidget; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.groups.newgroup.GroupFieldFactory; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.extjs.gxt.ui.client.widget.form.TextField; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptGeneralPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptGeneralPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptGeneralPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,10 +20,10 @@ package cc.kune.gspace.client.options.general; import cc.kune.common.client.ui.MaskWidget; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.auth.UserFieldFactory; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.dto.I18nLanguageSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.i18n.LanguageSelectorPanel; import com.extjs.gxt.ui.client.widget.form.FormPanel.LabelAlign; Modified: trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptPassPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptPassPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptPassPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,9 +20,9 @@ package cc.kune.gspace.client.options.general; import cc.kune.common.client.ui.MaskWidget; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.auth.UserFieldFactory; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.extjs.gxt.ui.client.widget.form.TextField; import com.google.gwt.event.dom.client.HasClickHandlers; Modified: trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptPassPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptPassPresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptPassPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,10 +20,10 @@ package cc.kune.gspace.client.options.general; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.errors.WrongCurrentPasswordException; import cc.kune.core.client.rpcservices.UserServiceAsync; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.options.UserOptions; import com.google.gwt.event.dom.client.ClickEvent; Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -23,9 +23,9 @@ import cc.kune.common.client.ui.IconLabel; import cc.kune.common.client.ui.KuneWindowUtils; import cc.kune.common.client.ui.dialogs.tabbed.TabTitleGenerator; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.dto.LicenseDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.options.EntityOptionsView; import com.google.gwt.core.client.GWT; Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicensePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicensePanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicensePanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.gspace.client.options.license; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicensePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicensePanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicensePanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.gspace.client.options.license; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -26,10 +26,10 @@ import cc.kune.common.client.ui.IconLabel; import cc.kune.common.client.ui.dialogs.tabbed.TabTitleGenerator; import cc.kune.common.client.utils.OnAcceptCallback; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.core.shared.FileConstants; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.options.EntityOptionsView; import com.google.gwt.core.client.GWT; Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -24,9 +24,9 @@ import gwtupload.client.IUploader.OnFinishUploaderHandler; import gwtupload.client.IUploader.OnStartUploaderHandler; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.rpcservices.UserServiceAsync; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.options.EntityOptions; import com.google.gwt.event.shared.EventBus; Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,9 +19,9 @@ */ package cc.kune.gspace.client.options.logo; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.core.shared.FileConstants; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoPresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,12 +19,12 @@ */ package cc.kune.gspace.client.options.logo; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.rpcservices.UserServiceAsync; import cc.kune.core.client.state.GroupChangedEvent; import cc.kune.core.client.state.GroupChangedEvent.GroupChangedHandler; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.options.GroupOptions; import com.google.gwt.event.shared.EventBus; Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,9 +19,9 @@ */ package cc.kune.gspace.client.options.logo; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.core.shared.FileConstants; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoPresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,6 +20,7 @@ package cc.kune.gspace.client.options.logo; import gwtupload.client.IUploader; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.events.AvatarChangedEvent; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.UserServiceAsync; @@ -28,7 +29,6 @@ import cc.kune.core.client.state.UserSignInEvent; import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.options.UserOptions; import com.google.gwt.event.shared.EventBus; Modified: trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -26,8 +26,8 @@ import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.ui.IconLabel; import cc.kune.common.client.ui.dialogs.tabbed.TabTitleGenerator; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.options.EntityOptionsView; import cc.kune.gspace.client.options.logo.EntityUploaderForm; import cc.kune.gspace.client.themes.GSpaceThemeSelectorPanel; Modified: trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -25,6 +25,7 @@ import gwtupload.client.IUploader.OnStartUploaderHandler; import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.TextUtils; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.services.FileDownloadUtils; @@ -36,7 +37,6 @@ import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.options.EntityOptions; import cc.kune.gspace.client.style.ClearBackImageEvent; import cc.kune.gspace.client.style.GSpaceBackManager; Modified: trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.gspace.client.options.style; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.themes.GSpaceThemeSelectorPanel; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,11 +19,11 @@ */ package cc.kune.gspace.client.options.style; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.options.GroupOptions; import cc.kune.gspace.client.style.GSpaceBackManager; import cc.kune.gspace.client.themes.GSpaceThemeSelectorPresenter; Modified: trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.gspace.client.options.style; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.themes.GSpaceThemeSelectorPanel; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,11 +19,11 @@ */ package cc.kune.gspace.client.options.style; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.options.UserOptions; import cc.kune.gspace.client.style.GSpaceBackManager; import cc.kune.gspace.client.themes.GSpaceThemeSelectorPresenter; Modified: trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -26,10 +26,10 @@ import cc.kune.common.client.ui.IconLabel; import cc.kune.common.client.ui.MaskWidget; import cc.kune.common.client.ui.dialogs.tabbed.TabTitleGenerator; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.ui.DefaultForm; import cc.kune.core.shared.dto.ToolSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.options.EntityOptionsView; import com.extjs.gxt.ui.client.event.BaseEvent; Modified: trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -24,12 +24,12 @@ import cc.kune.common.client.notify.NotifyLevel; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.ToolSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.options.EntityOptions; import com.google.gwt.event.dom.client.ClickEvent; Modified: trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.gspace.client.options.tools; import cc.kune.common.client.ui.MaskWidget; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.state.GroupChangedEvent; import cc.kune.core.client.state.GroupChangedEvent.GroupChangedHandler; @@ -30,7 +31,6 @@ import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.ContentSimpleDTO; import cc.kune.core.shared.dto.ToolSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.options.GroupOptions; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.gspace.client.options.tools; import cc.kune.common.client.ui.MaskWidget; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; @@ -29,7 +30,6 @@ import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.ToolSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.options.UserOptions; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,7 +19,7 @@ */ package cc.kune.gspace.client.tags; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import cc.kune.gspace.client.tags.TagsSummaryPresenter.TagsSummaryView; Modified: trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,7 +22,7 @@ import cc.kune.common.client.actions.ui.ActionExtensibleView; import cc.kune.common.client.actions.ui.ActionFlowPanel; import cc.kune.common.client.actions.ui.bind.GuiProvider; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -27,13 +27,13 @@ import cc.kune.common.client.actions.ui.ActionExtensibleView; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuRadioItemDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.init.AppStartEvent.AppStartHandler; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; import cc.kune.core.shared.dto.GSpaceTheme; import cc.kune.core.shared.dto.InitDataDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.themes.GSpaceThemeChangeEvent.GSpaceThemeChangeHandler; import com.google.gwt.event.shared.EventBus; Modified: trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,11 +20,11 @@ package cc.kune.gspace.client.tool; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.dto.BasicMimeTypeDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.tool.selector.ToolSelector; import com.google.gwt.resources.client.ImageResource; Modified: trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,8 +21,8 @@ import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.ui.KuneWindowUtils; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.shared.dto.LicenseDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import cc.kune.gspace.client.ui.footer.license.EntityLicensePresenter.EntityLicenseView; Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -23,11 +23,11 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.common.client.ui.HasEditHandler; import cc.kune.common.client.ui.UiUtils; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.dnd.FolderViewerDropController; import cc.kune.core.client.dnd.KuneDragController; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.shared.dto.StateContainerDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import cc.kune.gspace.client.viewers.FolderViewerPresenter.FolderViewerView; Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/ContentTitleWidget.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/ContentTitleWidget.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/ContentTitleWidget.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,9 +22,9 @@ import cc.kune.common.client.ui.EditableLabel; import cc.kune.common.client.ui.HasEditHandler; import cc.kune.common.client.ui.UiUtils; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.IconsRegistry; import cc.kune.core.shared.dto.BasicMimeTypeDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import com.google.gwt.resources.client.ImageResource; Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -30,21 +30,21 @@ import org.waveprotocol.wave.model.waveref.WaveRef; import org.waveprotocol.wave.util.escapers.GwtWaverefEncoder; -import cc.kune.common.client.actions.BeforeActionListener; import cc.kune.common.client.actions.ui.IsActionExtensible; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.common.client.errors.UIException; import cc.kune.common.client.ui.HasEditHandler; import cc.kune.common.client.ui.UiUtils; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import cc.kune.gspace.client.viewers.ContentViewerPresenter.ContentViewerView; import cc.kune.wave.client.KuneStagesProvider; import cc.kune.wave.client.WaveClientClearEvent; import cc.kune.wave.client.WaveClientProvider; +import cc.kune.wave.client.WaveClientUtils; import cc.kune.wave.client.WaveClientView; import cc.kune.wave.client.WebClientMock; @@ -84,6 +84,8 @@ @UiField InlineHTML onlyViewPanel; private ProfileManager profiles; + private final StateManager stateManager; + /** The wave panel, if a wave is open. */ private KuneStagesProvider wave; @@ -93,9 +95,7 @@ @UiField ImplPanel waveHolderParent; - private final WaveStore waveStore = new SimpleWaveStore(); - private final Widget widget; @Inject @@ -106,6 +106,7 @@ this.waveClientProv = waveClient; this.capabilitiesRegistry = capabilitiesRegistry; this.i18n = i18n; + this.stateManager = stateManager; widget = uiBinder.createAndBindUi(this); contentTitle = new ContentTitleWidget(i18n, gsArmor, capabilitiesRegistry.getIconsRegistry()); eventBus.addHandler(WaveClientClearEvent.getType(), @@ -115,15 +116,6 @@ waveClear(); } }); - stateManager.addBeforeStateChangeListener(new BeforeActionListener() { - @Override - public boolean beforeAction() { - // This fix lot of problems when you are editing and move to other - // location (without stop editing) - waveClear(); - return true; - } - }); } @Override @@ -178,6 +170,7 @@ channel = webClient.getChannel(); profiles = webClient.getProfiles(); idGenerator = ClientIdGenerator.create(); + WaveClientUtils.addListener(stateManager, wave, waveHolder, waveHolderParent); } } @@ -266,18 +259,7 @@ } private void waveClear() { - if (wave != null) { - // try { - wave.destroy(); - // } catch (final RuntimeException e) { - // When editing: java.lang.RuntimeException: Component not found: MENU - // } - wave = null; - } - if (waveHolder != null && waveHolder.isAttached()) { - waveHolder.removeFromParent(); - waveHolderParent.remove(waveHolder); - } + WaveClientUtils.clear(wave, waveHolder, waveHolderParent); } } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -24,11 +24,11 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.client.ui.BasicThumb; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.dnd.FolderViewerDropController; import cc.kune.core.client.dnd.KuneDragController; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.shared.dto.StateContainerDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import com.google.gwt.core.client.GWT; Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -27,13 +27,13 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.client.tooltip.Tooltip; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.dnd.FolderViewerDropController; import cc.kune.core.client.dnd.KuneDragController; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.dto.StateContainerDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import cc.kune.gspace.client.viewers.FolderViewerPresenter.FolderViewerView; Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerUtils.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerUtils.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerUtils.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -4,6 +4,7 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.common.client.utils.TextUtils; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.ActionRegistryByType; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.registry.IconsRegistry; @@ -21,7 +22,6 @@ import cc.kune.core.shared.dto.ContentSimpleDTO; import cc.kune.core.shared.dto.HasContent; import cc.kune.core.shared.dto.StateContainerDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.ActionGroups; import cc.kune.gspace.client.viewers.FolderViewerPresenter.FolderViewerView; Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/NoHomePageViewer.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/NoHomePageViewer.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/NoHomePageViewer.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,10 +20,10 @@ package cc.kune.gspace.client.viewers; import cc.kune.common.client.ui.UiUtils; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.shared.dto.HasContent; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import cc.kune.gspace.client.tool.ContentViewer; Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,13 +22,13 @@ import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.common.client.utils.TextUtils; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.dnd.FolderViewerDropController; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.registry.IconsRegistry; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.ContainerDTO; import cc.kune.core.shared.dto.ContainerSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.GotoTokenAction; import com.google.gwt.event.shared.EventBus; Modified: trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java =================================================================== --- trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -24,12 +24,12 @@ import org.waveprotocol.wave.client.common.util.DateUtils; import cc.kune.common.client.ui.DottedTabPanel; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.SiteTokens; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.ContentSimpleDTO; import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import cc.kune.hspace.client.HSpacePresenter.HSpaceView; Modified: trunk/src/main/java/cc/kune/hspace/client/HSpacePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/hspace/client/HSpacePresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/hspace/client/HSpacePresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,6 +21,7 @@ import java.util.List; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.events.InboxUnreadUpdatedEvent; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.state.Session; @@ -29,7 +30,6 @@ import cc.kune.core.shared.dto.ContentSimpleDTO; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.HomeStatsDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.ui.HasText; Modified: trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -24,9 +24,9 @@ import static cc.kune.lists.shared.ListsConstants.TYPE_LIST; import static cc.kune.lists.shared.ListsConstants.TYPE_POST; import static cc.kune.lists.shared.ListsConstants.TYPE_ROOT; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; Modified: trunk/src/main/java/cc/kune/lists/client/ListsGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/ListsGinModule.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/lists/client/ListsGinModule.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,7 +19,7 @@ */ package cc.kune.lists.client; -import cc.kune.common.client.ExtendedGinModule; +import cc.kune.core.client.ExtendedGinModule; import cc.kune.lists.client.actions.ListsClientActions; import cc.kune.lists.client.actions.ListsNewMenu; import cc.kune.lists.client.actions.OptionsListMenu; Modified: trunk/src/main/java/cc/kune/lists/client/actions/DelListMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/DelListMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/lists/client/actions/DelListMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.lists.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.DelContainerMenuItem; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/lists/client/actions/DelPostMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/DelPostMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/lists/client/actions/DelPostMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.lists.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.DelContentMenuItem; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/lists/client/actions/GoParentFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/GoParentFolderBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/lists/client/actions/GoParentFolderBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,9 +19,9 @@ */ package cc.kune.lists.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.GoParentContainerBtn; import cc.kune.lists.shared.ListsConstants; Modified: trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -23,6 +23,7 @@ import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.ui.dialogs.PromptTopDialog; import cc.kune.common.client.ui.dialogs.PromptTopDialog.Builder; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.RolAction; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.state.ContentCache; @@ -30,7 +31,6 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.StateContainerDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.viewers.FolderViewerPresenter; import cc.kune.lists.client.rpc.ListsServiceAsync; import cc.kune.lists.shared.ListsConstants; Modified: trunk/src/main/java/cc/kune/lists/client/actions/NewListBtn.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/NewListBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/lists/client/actions/NewListBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.lists.client.actions; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/lists/client/actions/NewListMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/NewListMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/lists/client/actions/NewListMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.lists.client.actions; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -24,6 +24,7 @@ import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.ui.dialogs.PromptTopDialog; import cc.kune.common.client.ui.dialogs.PromptTopDialog.Builder; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.RolAction; import cc.kune.core.client.auth.SignIn; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; @@ -34,7 +35,6 @@ import cc.kune.core.client.state.TokenUtils; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.viewers.FolderViewerPresenter; import cc.kune.lists.client.rpc.ListsServiceAsync; Modified: trunk/src/main/java/cc/kune/lists/client/actions/NewListPostIconBtn.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/NewListPostIconBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/lists/client/actions/NewListPostIconBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,8 +21,8 @@ import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/lists/client/actions/NewListPostIconMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/NewListPostIconMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/lists/client/actions/NewListPostIconMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,8 +21,8 @@ import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/lists/client/actions/OpenFolderMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/OpenFolderMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/lists/client/actions/OpenFolderMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.lists.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.OpenContentMenuItem; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/lists/client/actions/RefreshListMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/RefreshListMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/lists/client/actions/RefreshListMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.lists.client.actions; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.RefreshCurrentStateAction; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/lists/client/actions/SetListOpenessAction.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/SetListOpenessAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/lists/client/actions/SetListOpenessAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,13 +21,13 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.RolAction; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.StateContainerDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.lists.client.rpc.ListsServiceAsync; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/lists/client/actions/SetListOpenessMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/SetListOpenessMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/lists/client/actions/SetListOpenessMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,10 +20,10 @@ package cc.kune.lists.client.actions; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; import cc.kune.core.shared.dto.GroupListDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/lists/client/actions/ShowSubscribersOfListBtn.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/ShowSubscribersOfListBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/lists/client/actions/ShowSubscribersOfListBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,9 +21,9 @@ import cc.kune.common.client.actions.AbstractAction; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/lists/client/actions/SubscribeToListBtn.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/SubscribeToListBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/lists/client/actions/SubscribeToListBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,9 +20,9 @@ package cc.kune.lists.client.actions; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/lists/client/actions/SubscriteToListAction.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/SubscriteToListAction.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/lists/client/actions/SubscriteToListAction.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -24,6 +24,7 @@ import cc.kune.common.client.notify.NotifyLevel; import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.OnAcceptCallback; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.RolAction; import cc.kune.core.client.auth.SignIn; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; @@ -33,7 +34,6 @@ import cc.kune.core.client.state.TokenUtils; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.StateContainerDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.lists.client.rpc.ListsServiceAsync; import com.google.gwt.event.shared.EventBus; Modified: trunk/src/main/java/cc/kune/lists/server/ListsServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/lists/server/ListsServerTool.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/lists/server/ListsServerTool.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -31,6 +31,7 @@ import java.util.Date; import java.util.Set; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.server.AbstractServerTool; import cc.kune.core.server.UserSessionManager; import cc.kune.core.server.content.ContainerManager; @@ -39,7 +40,6 @@ import cc.kune.core.server.manager.ToolConfigurationManager; import cc.kune.core.server.tool.ServerToolTarget; import cc.kune.core.shared.domain.ContentStatus; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.Container; import cc.kune.domain.Content; import cc.kune.domain.Group; Modified: trunk/src/main/java/cc/kune/pspace/client/PSpaceInDevelopment.java =================================================================== --- trunk/src/main/java/cc/kune/pspace/client/PSpaceInDevelopment.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/pspace/client/PSpaceInDevelopment.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,6 +21,7 @@ import cc.kune.common.client.utils.TextUtils; import cc.kune.common.client.utils.UrlParam; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.GroupChangedEvent; @@ -29,7 +30,6 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.options.logo.CurrentEntityChangedEvent; import cc.kune.gspace.client.options.logo.CurrentEntityChangedEvent.CurrentEntityChangedHandler; Modified: trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java =================================================================== --- trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -22,8 +22,8 @@ import cc.kune.common.client.actions.ui.ActionFlowPanel; import cc.kune.common.client.actions.ui.IsActionExtensible; import cc.kune.common.client.actions.ui.bind.GuiProvider; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import cc.kune.pspace.client.PSpacePresenter.PSpaceView; Modified: trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,6 +21,7 @@ import cc.kune.common.client.actions.ui.IsActionExtensible; import cc.kune.common.client.utils.TextUtils; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateChangedEvent; @@ -33,7 +34,6 @@ import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.core.shared.dto.StateTokenUtils; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.ui.HasText; Modified: trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -24,10 +24,10 @@ import static cc.kune.tasks.shared.TasksConstants.TYPE_FOLDER; import static cc.kune.tasks.shared.TasksConstants.TYPE_ROOT; import static cc.kune.tasks.shared.TasksConstants.TYPE_TASK; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.core.shared.domain.ContentStatus; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; Modified: trunk/src/main/java/cc/kune/tasks/client/TasksGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/TasksGinModule.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/tasks/client/TasksGinModule.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,7 +19,7 @@ */ package cc.kune.tasks.client; -import cc.kune.common.client.ExtendedGinModule; +import cc.kune.core.client.ExtendedGinModule; import cc.kune.tasks.client.actions.TasksClientActions; import cc.kune.tasks.client.actions.TasksFolderNewMenu; import cc.kune.tasks.client.actions.TasksNewMenu; Modified: trunk/src/main/java/cc/kune/tasks/client/actions/DelFolderMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/DelFolderMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/tasks/client/actions/DelFolderMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.tasks.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.DelContainerMenuItem; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/tasks/client/actions/GoParentFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/GoParentFolderBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/tasks/client/actions/GoParentFolderBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,9 +19,9 @@ */ package cc.kune.tasks.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.GoParentContainerBtn; import cc.kune.tasks.shared.TasksConstants; Modified: trunk/src/main/java/cc/kune/tasks/client/actions/MarkAsDoneTaskMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/MarkAsDoneTaskMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/tasks/client/actions/MarkAsDoneTaskMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,9 +19,9 @@ */ package cc.kune.tasks.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.core.shared.domain.ContentStatus; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.SetContentStatusAsAdminMenuItem; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/tasks/client/actions/MarkAsNotDoneTaskMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/MarkAsNotDoneTaskMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/tasks/client/actions/MarkAsNotDoneTaskMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,9 +19,9 @@ */ package cc.kune.tasks.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.core.shared.domain.ContentStatus; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.SetContentStatusAsAdminMenuItem; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/tasks/client/actions/NewFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/NewFolderBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/tasks/client/actions/NewFolderBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.tasks.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.NewContainerBtn; import cc.kune.tasks.shared.TasksConstants; Modified: trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskIconBtn.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskIconBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskIconBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.tasks.client.actions; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.NewContentAction; import cc.kune.gspace.client.actions.NewContentBtn; import cc.kune.tasks.shared.TasksConstants; Modified: trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.tasks.client.actions; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.NewContentAction; import cc.kune.gspace.client.actions.NewContentMenuItem; import cc.kune.tasks.shared.TasksConstants; Modified: trunk/src/main/java/cc/kune/tasks/client/actions/OpenFolderMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/OpenFolderMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/tasks/client/actions/OpenFolderMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.tasks.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.OpenContentMenuItem; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/tasks/server/TaskServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/server/TaskServerTool.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/tasks/server/TaskServerTool.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -28,6 +28,7 @@ import java.util.Arrays; import java.util.Date; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.server.AbstractServerTool; import cc.kune.core.server.content.ContainerManager; import cc.kune.core.server.content.ContentManager; @@ -35,7 +36,6 @@ import cc.kune.core.server.manager.ToolConfigurationManager; import cc.kune.core.server.tool.ServerToolTarget; import cc.kune.core.shared.domain.ContentStatus; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.Container; import cc.kune.domain.Content; import cc.kune.domain.Group; Modified: trunk/src/main/java/cc/kune/wave/client/KuneParticipantController.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/KuneParticipantController.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/wave/client/KuneParticipantController.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -36,7 +36,7 @@ import org.waveprotocol.wave.model.wave.ParticipantId; import cc.kune.common.client.notify.NotifyUser; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.i18n.I18nTranslationService; import com.google.gwt.dom.client.Element; import com.google.gwt.event.dom.client.ClickEvent; Modified: trunk/src/main/java/cc/kune/wave/client/KuneStagesProvider.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/KuneStagesProvider.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/wave/client/KuneStagesProvider.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -54,7 +54,8 @@ import org.waveprotocol.wave.model.wave.ParticipantId; import org.waveprotocol.wave.model.waveref.WaveRef; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.common.client.log.Log; +import cc.kune.common.shared.i18n.I18nTranslationService; import com.google.gwt.dom.client.Element; @@ -209,15 +210,27 @@ wave = null; } if (three != null) { - three.getEditActions().stopEditing(); + try { + three.getEditActions().stopEditing(); + } catch (final Exception e) { + Log.info("Some exception stoping editing", e); + } three = null; } if (two != null) { + try { two.getConnector().close(); + } catch (final Exception e) { + Log.info("Some exception closing connector", e); + } two = null; } if (one != null) { + try { one.getWavePanel().destroy(); + } catch (final Exception e) { + Log.info("Some exception destroying panel", e); + } one = null; } closed = true; Added: trunk/src/main/java/cc/kune/wave/client/WaveClientUtils.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WaveClientUtils.java (rev 0) +++ trunk/src/main/java/cc/kune/wave/client/WaveClientUtils.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -0,0 +1,40 @@ +package cc.kune.wave.client; + +import org.waveprotocol.wave.client.widget.common.ImplPanel; + +import cc.kune.common.client.actions.BeforeActionListener; +import cc.kune.common.client.log.Log; +import cc.kune.core.client.state.StateManager; + +import com.google.gwt.user.client.ui.HasWidgets; + +public class WaveClientUtils { + public static void addListener(final StateManager stateManager, final KuneStagesProvider wave, + final ImplPanel waveHolder, final HasWidgets parent) { + stateManager.addBeforeStateChangeListener(new BeforeActionListener() { + @Override + public boolean beforeAction() { + // This fix lot of problems when you are editing and move to other + // location (without stop editing) + clear(wave, waveHolder, parent); + return true; + } + }); + } + + public static void clear(KuneStagesProvider wave, final ImplPanel waveHolder, final HasWidgets parent) { + if (wave != null) { + try { + wave.destroy(); + } catch (final RuntimeException e) { + // When editing: java.lang.RuntimeException: Component not found: MENU + Log.error("Error clearing wave panel", e); + } + wave = null; + } + if (waveHolder != null && waveHolder.isAttached()) { + waveHolder.removeFromParent(); + parent.remove(waveHolder); + } + } +} Modified: trunk/src/main/java/cc/kune/wave/client/WaveGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WaveGinModule.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/wave/client/WaveGinModule.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,7 +19,7 @@ */ package cc.kune.wave.client; -import cc.kune.common.client.ExtendedGinModule; +import cc.kune.core.client.ExtendedGinModule; import cc.kune.wave.client.inboxcount.InboxCountPanel; import cc.kune.wave.client.inboxcount.InboxCountPresenter; import cc.kune.wave.client.inboxcount.InboxCountPresenter.InboxCountView; Modified: trunk/src/main/java/cc/kune/wave/client/WaveStatusIndicator.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WaveStatusIndicator.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/wave/client/WaveStatusIndicator.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -28,11 +28,11 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.IconLabelDescriptor; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.sitebar.SitebarActionsPresenter; import cc.kune.core.client.sn.actions.SessionAction; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/wave/client/WebClient.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -69,12 +69,12 @@ import org.waveprotocol.wave.util.escapers.GwtWaverefEncoder; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.sitebar.spaces.Space; import cc.kune.core.client.sitebar.spaces.SpaceConfEvent; import cc.kune.core.client.state.SiteTokens; import cc.kune.core.client.state.TokenMatcher; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.wave.client.inboxcount.InboxCountPresenter; import com.google.gwt.core.client.GWT; @@ -248,6 +248,7 @@ @UiField SplitLayoutPanel splitPanel; + @UiField Style style; @@ -260,7 +261,6 @@ FramedPanel waveFrame; ImplPanel waveHolder; - private final WaveStore waveStore = new SimpleWaveStore(); /** * Create a remote websocket to talk to the server-side FedOne service. @@ -272,7 +272,6 @@ */ @Inject public WebClient(final EventBus eventBus, final KuneWaveProfileManager profiles, final InboxCountPresenter inboxCount, final TokenMatcher tokenMatcher, final cc.kune.core.client.state.Session session, final I18nTranslationService i18n) { - // Window.alert("webclient! " + new Date()); this.eventBus = eventBus; this.profiles = profiles; this.inboxCount = inboxCount; @@ -315,6 +314,8 @@ setupUi(); + //WaveClientUtils.addListener(stateManager, wave, waveHolder, waveFrame); + if (tokenMatcher.isWaveToken(History.getToken())) { History.fireCurrentHistoryState(); } @@ -323,14 +324,8 @@ @Override public void clear() { - // Duplicate below - if (wave != null) { - wave.destroy(); - wave = null; - } - if (waveHolder.isAttached()) { - waveHolder.removeFromParent(); - } + WaveClientUtils.clear(wave, waveHolder, waveFrame); + waveFrame.clear(); } private void createWebSocket() { @@ -416,15 +411,7 @@ LOG.info("WebClient.openWave()"); WaveClientClearEvent.fire(eventBus); - if (wave != null) { - wave.destroy(); - wave = null; - } - if (waveHolder.isAttached()) { - waveHolder.removeFromParent(); - } - waveFrame.remove(waveHolder); - waveFrame.clear(); + clear(); waveFrame.add(waveHolder); // Release the display:none. Modified: trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPanel.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPanel.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPanel.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -21,9 +21,9 @@ import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.ui.BlinkAnimation; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.sitebar.spaces.Space; import cc.kune.core.client.sitebar.spaces.SpaceSelectEvent; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.wave.client.inboxcount.InboxCountPresenter.InboxCountView; import com.google.gwt.event.dom.client.ClickEvent; Modified: trunk/src/main/java/cc/kune/wave/server/KuneAgent.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/KuneAgent.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/wave/server/KuneAgent.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -172,6 +172,13 @@ } @Override + public void setGadgetProperty(final WaveRef waveletName, final String author, final URL gadgetUrl, + final String someProperty, final String someValue) { + // TODO Auto-generated method stub + + } + + @Override public void setTitle(final WaveRef waveName, final String title, final String author) { // TODO Auto-generated method stub Modified: trunk/src/main/java/cc/kune/wave/server/KuneWaveService.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/KuneWaveService.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/wave/server/KuneWaveService.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -58,6 +58,9 @@ String render(WaveRef waveRef, String author); + void setGadgetProperty(WaveRef waveletName, String author, URL gadgetUrl, String someProperty, + String someValue); + void setTitle(WaveRef waveName, String title, String author); } Modified: trunk/src/main/java/cc/kune/wave/server/KuneWaveServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/KuneWaveServiceDefault.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/wave/server/KuneWaveServiceDefault.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -51,6 +51,7 @@ import cc.kune.common.client.utils.TextUtils; import cc.kune.core.client.errors.DefaultException; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.inject.Inject; @@ -80,6 +81,7 @@ import com.google.wave.api.impl.DocumentModifyAction; import com.google.wave.api.impl.DocumentModifyAction.BundledAnnotation; import com.google.wave.api.impl.DocumentModifyAction.ModifyHow; +import com.google.wave.api.impl.DocumentModifyQuery; import com.google.wave.api.impl.WaveletData; import com.google.wave.splash.rpc.ClientAction; import com.google.wave.splash.web.template.WaveRenderer; @@ -178,10 +180,10 @@ final OperationQueue opQueue = new OperationQueue(); final Blip rootBlip = wavelet.getRootBlip(); - opQueue.modifyDocument(rootBlip).addParameter( - Parameter.of(ParamsProperty.MODIFY_ACTION, new DocumentModifyAction(ModifyHow.INSERT, NO_VALUES, - NO_ANNOTATION_KEY, elementsIn, NO_BUNDLED_ANNOTATIONS, false))); - opQueue.modifyDocument(rootBlip).addParameter(Parameter.of(ParamsProperty.INDEX, 1)); + final OperationRequest operationRequest = opQueue.modifyDocument(rootBlip); + operationRequest.addParameter(Parameter.of(ParamsProperty.MODIFY_ACTION, new DocumentModifyAction( + ModifyHow.INSERT, NO_VALUES, NO_ANNOTATION_KEY, elementsIn, NO_BUNDLED_ANNOTATIONS, false))); + operationRequest.addParameter(Parameter.of(ParamsProperty.INDEX, 1)); doOperation(author, opQueue, "add gadget"); } @@ -326,26 +328,29 @@ } private void doOperation(final String author, final OperationQueue opQueue, final String logComment) { + // FIXME: do here a callback!!! final OperationContextImpl context = new OperationContextImpl(waveletProvider, converterManager.getEventDataConverter(ProtocolVersion.DEFAULT), conversationUtil); - final OperationRequest request = opQueue.getPendingOperations().get(0); - OperationUtil.executeOperation(request, operationRegistry, context, participantUtils.of(author)); - final String reqId = request.getId(); - final JsonRpcResponse response = context.getResponse(reqId); - if (response != null && response.isError()) { - onFailure(context.getResponse(reqId).getErrorMessage()); - } - OperationUtil.submitDeltas(context, waveletProvider, new SubmitRequestListener() { - @Override - public void onFailure(final String arg0) { - KuneWaveServiceDefault.this.onFailure("Wave " + logComment + " failed, onFailure: " + arg0); + for (final OperationRequest request : opQueue.getPendingOperations()) { + // final OperationRequest request = opQueue.getPendingOperations().get(0); + OperationUtil.executeOperation(request, operationRegistry, context, participantUtils.of(author)); + final String reqId = request.getId(); + final JsonRpcResponse response = context.getResponse(reqId); + if (response != null && response.isError()) { + onFailure(context.getResponse(reqId).getErrorMessage()); } + OperationUtil.submitDeltas(context, waveletProvider, new SubmitRequestListener() { + @Override + public void onFailure(final String arg0) { + KuneWaveServiceDefault.this.onFailure("Wave " + logComment + " failed, onFailure: " + arg0); + } - @Override - public void onSuccess(final int arg0, final HashedVersion arg1, final long arg2) { - LOG.info("Wave " + logComment + " success: " + arg1); - } - }); + @Override + public void onSuccess(final int arg0, final HashedVersion arg1, final long arg2) { + LOG.info("Wave " + logComment + " success: " + arg1); + } + }); + } } public void doOperations(final WaveRef waveName, final String author, final OperationQueue opQueue, @@ -358,17 +363,6 @@ OperationUtil.submitDeltas(context, waveletProvider, listener); } - // public void appendGadget(final WaveRef waveName, URL gadgetUrl, final - // String author, boolean toRoot) { - // final Wavelet wavelet = fetchWave(waveName, author); - // final OperationQueue opQueue = new OperationQueue(); - // opQueue. - // final Gadget gadget = new Gadget(gadgetUrl.toString()); - // Blip blip = toRoot? wavelet.getRootBlip(): - // opQueue.appendBlipToWavelet(wavelet, author); - // blip.append(gadget); - // } - @Override public Wavelet fetchWave(final WaveId waveId, final WaveletId waveletId, final String author) { final OperationQueue opQueue = new OperationQueue(); @@ -442,6 +436,41 @@ } @Override + public void setGadgetProperty(final WaveRef waveletName, final String author, final URL gadgetUrl, + final String someProperty, final String someValue) { + // See BlipContentRefs DocumentModifyService + final Wavelet wavelet = fetchWave(waveletName, author); + // FIXME + final OperationQueue opQueue = new OperationQueue(); + final Blip rootBlip = wavelet.getRootBlip(); + for (final Element elem : rootBlip.getElements().values()) { + if (elem.isGadget()) { + final Map<String, String> properties = elem.getProperties(); + if (properties.get(Gadget.URL).equals(gadgetUrl.toString())) { + // This is the gadget we want to modify (the first of that type) + final List<Element> updatedElementsIn = Lists.newArrayListWithCapacity(1); + properties.put(someProperty, someValue); + // properties.put(propertyNameToDelete, null); + final Gadget gadget = (Gadget) elem; + gadget.setProperty(someProperty, someValue); + // updatedElementsIn.add(new Gadget(properties)); + updatedElementsIn.add(gadget); + final OperationRequest operationRequest = opQueue.modifyDocument(rootBlip); + operationRequest.addParameter(Parameter.of(ParamsProperty.MODIFY_ACTION, + new DocumentModifyAction(ModifyHow.UPDATE_ELEMENT, NO_VALUES, NO_ANNOTATION_KEY, + updatedElementsIn, NO_BUNDLED_ANNOTATIONS, false))); + operationRequest.addParameter(Parameter.of( + ParamsProperty.MODIFY_QUERY, + new DocumentModifyQuery(ElementType.GADGET, ImmutableMap.of(Gadget.URL, + gadgetUrl.toString()), 1))); + doOperation(author, opQueue, "set gadget property"); + break; + } + } + } + } + + @Override public void setTitle(final WaveRef waveName, final String title, final String author) { final Wavelet wavelet = fetchWave(waveName, author); final OperationQueue opQueue = new OperationQueue(); @@ -454,5 +483,4 @@ set.addAll(Arrays.asList(array)); return set; } - } Modified: trunk/src/main/java/cc/kune/wiki/client/WikiGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/WikiGinModule.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/wiki/client/WikiGinModule.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,7 +19,7 @@ */ package cc.kune.wiki.client; -import cc.kune.common.client.ExtendedGinModule; +import cc.kune.core.client.ExtendedGinModule; import cc.kune.wiki.client.actions.WikiClientActions; import cc.kune.wiki.client.actions.WikiFolderNewMenu; import cc.kune.wiki.client.actions.WikiPageNewMenu; Modified: trunk/src/main/java/cc/kune/wiki/client/actions/DelFolderMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/DelFolderMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/wiki/client/actions/DelFolderMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.wiki.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.DelContainerMenuItem; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/wiki/client/actions/DelWikiMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/DelWikiMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/wiki/client/actions/DelWikiMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.wiki.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.DelContentMenuItem; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/wiki/client/actions/GoParentFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/GoParentFolderBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/wiki/client/actions/GoParentFolderBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,9 +19,9 @@ */ package cc.kune.wiki.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.GoParentContainerBtn; import cc.kune.wiki.shared.WikiConstants; Modified: trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.wiki.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.NewContainerBtn; import cc.kune.wiki.shared.WikiConstants; Modified: trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.wiki.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.NewContainerMenuItem; import cc.kune.wiki.shared.WikiConstants; Modified: trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiIconBtn.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiIconBtn.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiIconBtn.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.wiki.client.actions; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.NewContentAction; import cc.kune.gspace.client.actions.NewContentBtn; import cc.kune.wiki.shared.WikiConstants; Modified: trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -20,8 +20,8 @@ package cc.kune.wiki.client.actions; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.NewContentAction; import cc.kune.gspace.client.actions.NewContentMenuItem; import cc.kune.wiki.shared.WikiConstants; Modified: trunk/src/main/java/cc/kune/wiki/client/actions/OpenWikiMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/OpenWikiMenuItem.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/wiki/client/actions/OpenWikiMenuItem.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -19,8 +19,8 @@ */ package cc.kune.wiki.client.actions; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.OpenContentMenuItem; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/wiki/server/WikiServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/server/WikiServerTool.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/cc/kune/wiki/server/WikiServerTool.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -29,6 +29,7 @@ import java.util.Arrays; import java.util.Date; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.server.AbstractServerTool; import cc.kune.core.server.content.ContainerManager; import cc.kune.core.server.content.ContentManager; @@ -37,7 +38,6 @@ import cc.kune.core.server.tool.ServerToolTarget; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.domain.GroupListMode; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.AccessLists; import cc.kune.domain.Container; import cc.kune.domain.Content; Modified: trunk/src/main/java/com/example/client/HelloWorldActions.java =================================================================== --- trunk/src/main/java/com/example/client/HelloWorldActions.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/java/com/example/client/HelloWorldActions.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -5,7 +5,7 @@ import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.notify.NotifyUser; -import cc.kune.core.client.resources.CoreResources; +import cc.kune.common.client.resources.CommonResources; import cc.kune.core.client.sitebar.SiteUserOptions; import cc.kune.core.client.sitebar.SitebarActions; @@ -23,7 +23,7 @@ } @Inject - public HelloWorldActions(final CoreResources coreResources, final SitebarActions sitebarActions, + public HelloWorldActions(final CommonResources res, final SitebarActions sitebarActions, final SiteUserOptions siteUserOptions) { // We can share the action if we don't want to create several (and for @@ -32,14 +32,14 @@ // An action in the sitebar final ButtonDescriptor siteBarBtn = new ButtonDescriptor(sharedAction); - siteBarBtn.withText("HWorld!").withIcon(coreResources.info()); + siteBarBtn.withText("HWorld!").withIcon(res.info()); siteBarBtn.setParent(sitebarActions.getLeftToolbar()); // Other action in the sitebar options menu // An action in the user options menu final MenuItemDescriptor menuItem = new MenuItemDescriptor(sharedAction); - menuItem.withText("HWorld!").withIcon(coreResources.alert()); + menuItem.withText("HWorld!").withIcon(res.alert()); siteUserOptions.addAction(menuItem); // Another action in the SocialNet menu Modified: trunk/src/main/resources/wave-server.properties =================================================================== --- trunk/src/main/resources/wave-server.properties 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/main/resources/wave-server.properties 2011-12-19 21:49:18 UTC (rev 1639) @@ -79,10 +79,10 @@ # Thread counts #The number of threads to listen on wavelet updates. Default value: 1 listener_executor_thread_count = 1 -#The number of threads for loading wavelets. Default value: 2 -wavelet_load_executor_thread_count = 2 -#The number of threads to persist deltas. Default value: 2 -delta_persist_executor_thread_count = 2 +#The number of threads for loading wavelets. Default value: 1 +wavelet_load_executor_thread_count = 1 +#The number of threads to persist deltas. Default value: 1 +delta_persist_executor_thread_count = 1 # To enable federation, edit the server.federation.config file and include it here. #include = server.federation.config Modified: trunk/src/test/java/cc/kune/core/server/manager/I18nManagerDefaultTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/I18nManagerDefaultTest.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/test/java/cc/kune/core/server/manager/I18nManagerDefaultTest.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -29,8 +29,8 @@ import org.junit.Before; import org.junit.Test; +import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.server.PersistenceTest; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.I18nCountry; import cc.kune.domain.I18nLanguage; import cc.kune.domain.I18nTranslation; Modified: trunk/src/test/java/cc/kune/selenium/spaces/UserSpacePageObject.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/spaces/UserSpacePageObject.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/test/java/cc/kune/selenium/spaces/UserSpacePageObject.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -97,4 +97,72 @@ return rootBlipText; } + // public void testCreation() { + // selenium.setSpeed("200"); + // // selenium.while("index < 100"); + // selenium.click("//div[2]/div[2]/div[4]"); + // for (int second = 0;; second++) { + // if (second >= 60) { + // fail("timeout"); + // } + // try { + // if (selenium.isElementPresent("//ul/div")) { + // break; + // } + // } catch (final Exception e) { + // } + // Thread.sleep(1000); + // } + // + // selenium.click("//ul/div"); + // selenium.focus("//ul/div"); + // selenium.mouseDownAt("//ul/div", "5,5"); + // selenium.typeKeys("//ul/div", selenium.getEval("index")); + // selenium.clickAt("//div[3]/div/div/div/div/div/div/span", "5,5"); + // selenium.clickAt("//div[10]/div/div/div/div[3]/div/div[2]", "5,5"); + // selenium.click("//div[3]/div/div/div[2]/div/div/div/span"); + // selenium.typeKeys("//div[2]/div/div[2]/div/div/ul/div", + // selenium.getEval("index + 'áñç|«@#|ð€Ω]'")); + // selenium.click("//div[@id='app']/div/div[2]/div/div[2]/div/div/div[10]/div/div[3]/div[2]/div/div"); + // selenium.click("//div[@id='app']/div/div[2]/div/div[2]/div/div/div[10]/div/div[3]/div/div/div"); + // for (int second = 0;; second++) { + // if (second >= 60) { + // fail("timeout"); + // } + // try { + // if (selenium.isTextPresent("@#|")) { + // break; + // } + // } catch (final Exception e) { + // } + // Thread.sleep(1000); + // } + // + // for (int second = 0;; second++) { + // if (second >= 60) { + // fail("timeout"); + // } + // try { + // if (selenium.isElementPresent("//div[3]/div/div/div[2]/div/div/div[3]")) { + // break; + // } + // } catch (final Exception e) { + // } + // Thread.sleep(1000); + // } + // + // selenium.clickAt("//div[3]/div/div/div[2]/div/div/div[3]", "1,1"); + // selenium.clickAt("//div[3]/div/div/div/div/div/div/span[2]", "5,5"); + // selenium.click("//div[2]/div/div/div/div[2]/div/div/ul/div"); + // selenium.focus("//div[2]/div/div/div/div[2]/div/div/ul/div"); + // selenium.mouseDownAt("//div[2]/div/div/div/div[2]/div/div/ul/div", "5,5"); + // selenium.typeKeys("//div[2]/div/div/div/div[2]/div/div/ul/div", + // selenium.getEval("index + 'áñç|«@#|ð€Ω] la la la '")); + // selenium.clickAt("//div[10]/div/div/div/div[3]/div/div[2]", "5,5"); + // selenium.clickAt("//div[3]/div/div[2]/div/div/ul/div", "5,5"); + // selenium.typeKeys("//div[3]/div/div[2]/div/div/ul/div", + // selenium.getEval("index + 'áñç|«@#|ð€Ω] la la la la la'")); + // // selenium.endWhile(); + // } + } Modified: trunk/src/test/java/cc/kune/wave/server/KuneWaveServiceDefaultTest.java =================================================================== --- trunk/src/test/java/cc/kune/wave/server/KuneWaveServiceDefaultTest.java 2011-12-12 21:47:20 UTC (rev 1638) +++ trunk/src/test/java/cc/kune/wave/server/KuneWaveServiceDefaultTest.java 2011-12-19 21:49:18 UTC (rev 1639) @@ -27,6 +27,7 @@ import java.io.IOException; import java.net.URL; import java.util.Arrays; +import java.util.Collection; import java.util.Iterator; import java.util.Set; import java.util.TreeSet; @@ -41,6 +42,8 @@ import cc.kune.core.server.integration.IntegrationTestHelper; import com.google.inject.Inject; +import com.google.wave.api.Element; +import com.google.wave.api.Gadget; import com.google.wave.api.Wavelet; public class KuneWaveServiceDefaultTest extends IntegrationTest { @@ -49,6 +52,8 @@ private static final String NEW_PARTICIPANT = "newparti"; private static final String NEW_PARTICIPANT2 = "newparti2"; private static final String RICHTEXT_MESSAGE = "" + MESSAGE + ""; + private static final String SOME_PROPERTY = "someProperty"; + private static final String SOME_VALUE = "someValue"; private static final String TEST_GADGET = "http://wave-api.appspot.com/public/gadgets/areyouin/gadget.xml"; private static final String TITLE = "title"; private static final String TITLENEW = "titleNew"; @@ -135,6 +140,27 @@ } @Test + public void addGadgetAndCheckProperties() throws DefaultException, IOException { + doLogin(); + final WaveRef waveletName = createTestWave(); + assertNotNull(waveletName); + final URL gadgetUrl = new URL(TEST_GADGET); + manager.addGadget(waveletName, getSiteAdminShortName(), gadgetUrl); + final Wavelet fetchWavelet = manager.fetchWave(waveletName, getSiteAdminShortName()); + final Gadget gadget = getFirstGadget(fetchWavelet, TEST_GADGET); + assertEquals(gadget.getUrl(), TEST_GADGET); + assertEquals(2, gadget.getProperties().size()); + assertEquals(3, fetchWavelet.getRootBlip().getElements().size()); + manager.setGadgetProperty(waveletName, getSiteAdminShortName(), gadgetUrl, SOME_PROPERTY, SOME_VALUE); + final Wavelet updatedWavelet = manager.fetchWave(waveletName, getSiteAdminShortName()); + final Gadget gadgetUpdated = getFirstGadget(updatedWavelet, TEST_GADGET); + assertEquals(gadgetUpdated.getUrl(), TEST_GADGET); + assertEquals(3, updatedWavelet.getRootBlip().getElements().size()); + assertEquals(3, gadgetUpdated.getProperties().size()); + assertEquals(SOME_VALUE, gadgetUpdated.getProperties().get(SOME_PROPERTY)); + } + + @Test public void addingToSetMaintainsOrder() throws IOException { final String[] array = new String[] { NEW_PARTICIPANT, NEW_PARTICIPANT, NEW_PARTICIPANT2, NEW_PARTICIPANT2 }; @@ -206,6 +232,17 @@ assertEquals(TITLE, fetchWavelet.getTitle()); } + private Gadget getFirstGadget(final Wavelet fetchWavelet, final String testGadget) { + final Collection<Element> elements = fetchWavelet.getRootBlip().getElements().values(); + // BlipContentRefs e = fetchWavelet.getRootBlip().first(ElementType.GADGET); + for (final Element e : elements) { + if (e.isGadget() && e.getProperty(Gadget.URL).equals(testGadget)) { + return (Gadget) e; + } + } + return null; + } + @Test public void otherMemberAddParticipant() throws DefaultException, IOException { final String whoAdds = "otherMember";

1 0

Jump to page: