kune-commits

Download

[email protected]

December 2011

1 participants
20 discussions

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

r1638 - in trunk: . src/main/java/cc/kune/core/client/errors src/main/java/cc/kune/core/client/sitebar/search src/main/java/cc/kune/core/client/state src/main/java/cc/kune/gspace/client/viewers src/main/java/cc/kune/wave/client src/main/java/cc/kune/wave/server src/main/resources src/test/java/cc/kune/core/server src/test/java/cc/kune/core/server/integration src/test/java/cc/kune/wave/server
by Vicente J. Ruiz Jurado 12 Dec '11

12 Dec '11

Author: vjrj_ Date: 2011-12-12 22:47:20 +0100 (Mon, 12 Dec 2011) New Revision: 1638 Added: trunk/src/main/java/cc/kune/wave/client/KuneParticipantController.java Modified: trunk/.classpath trunk/pom.xml trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java trunk/src/main/java/cc/kune/core/client/sitebar/search/EntitySearchPanel.java trunk/src/main/java/cc/kune/core/client/sitebar/search/MultivalueSuggestBox.java trunk/src/main/java/cc/kune/core/client/sitebar/search/SearchBoxFactory.java trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java trunk/src/main/java/cc/kune/wave/client/KuneStagesProvider.java trunk/src/main/java/cc/kune/wave/client/WebClient.java trunk/src/main/java/cc/kune/wave/server/WaveMain.java trunk/src/main/resources/wave-server.properties trunk/src/test/java/cc/kune/core/server/TestHelper.java trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java trunk/src/test/java/cc/kune/wave/server/KuneWaveServiceDefaultTest.java Log: Wave code updated (several bug fixed). Wave participants patched (now the creator cannot be deleted). Better Wave-Kune integration. Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2011-12-07 12:18:53 UTC (rev 1637) +++ trunk/.classpath 2011-12-12 21:47:20 UTC (rev 1638) @@ -13,19 +13,19 @@ <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/> <classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar" sourcepath="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box/0.3.7/box-0.3.7.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.7/box-src-0.3.7.jar" sourcepath="M2_REPO/org/waveprotocol/box-src/0.3.7/box-src-0.3.7-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box/0.3.8/box-0.3.8.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.8/box-src-0.3.8.jar" sourcepath="M2_REPO/org/waveprotocol/box-src/0.3.8/box-src-0.3.8-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/> <classpathentry kind="var" path="M2_REPO/c3p0/c3p0/0.9.1/c3p0-0.9.1.jar" sourcepath="M2_REPO/c3p0/c3p0/0.9.1/c3p0-0.9.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client/0.3.7/client-0.3.7.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common/0.3.7/client-common-0.3.7.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.7/client-common-src-0.3.7.jar" sourcepath="M2_REPO/org/waveprotocol/client-common-src/0.3.7/client-common-src-0.3.7-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.7/client-scheduler-src-0.3.7.jar" sourcepath="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.7/client-scheduler-src-0.3.7-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-src/0.3.7/client-src-0.3.7.jar" sourcepath="M2_REPO/org/waveprotocol/client-src/0.3.7/client-src-0.3.7-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client/0.3.8/client-0.3.8.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common/0.3.8/client-common-0.3.8.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.8/client-common-src-0.3.8.jar" sourcepath="M2_REPO/org/waveprotocol/client-common-src/0.3.8/client-common-src-0.3.8-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.8/client-scheduler-src-0.3.8.jar" sourcepath="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.8/client-scheduler-src-0.3.8-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-src/0.3.8/client-src-0.3.8.jar" sourcepath="M2_REPO/org/waveprotocol/client-src/0.3.8/client-src-0.3.8-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/cobogw/gwt/cobogw/1.3.1/cobogw-1.3.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/common-src/0.3.7/common-src-0.3.7.jar" sourcepath="M2_REPO/org/waveprotocol/common-src/0.3.7/common-src-0.3.7-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/common-src/0.3.8/common-src-0.3.8.jar" sourcepath="M2_REPO/org/waveprotocol/common-src/0.3.8/common-src-0.3.8-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar" sourcepath="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/> @@ -34,8 +34,8 @@ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar" sourcepath="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/communication-src/0.3.7/communication-src-0.3.7.jar" sourcepath="M2_REPO/org/waveprotocol/communication-src/0.3.7/communication-src-0.3.7-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.7/concurrencycontrol-src-0.3.7.jar" sourcepath="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.7/concurrencycontrol-src-0.3.7-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/communication-src/0.3.8/communication-src-0.3.8.jar" sourcepath="M2_REPO/org/waveprotocol/communication-src/0.3.8/communication-src-0.3.8-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.8/concurrencycontrol-src-0.3.8.jar" sourcepath="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.8/concurrencycontrol-src-0.3.8-sources.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5.jar" sourcepath="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0.jar" sourcepath="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0-sources.jar"/> @@ -57,7 +57,7 @@ <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/log/gwt-log/gwt-log/3.0.1/gwt-log-3.0.1.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/gwt-util-src/0.3.7/gwt-util-src-0.3.7.jar" sourcepath="M2_REPO/org/waveprotocol/gwt-util-src/0.3.7/gwt-util-src-0.3.7-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/gwt-util-src/0.3.8/gwt-util-src-0.3.8.jar" sourcepath="M2_REPO/org/waveprotocol/gwt-util-src/0.3.8/gwt-util-src-0.3.8-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/voices/gwt-voices/gwt-voices/2.0.0/gwt-voices-2.0.0.jar"/> <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-all/0.5/gwtp-all-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-all/0.5/gwtp-all-0.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-clients-common/0.5/gwtp-clients-common-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-clients-common/0.5/gwtp-clients-common-0.5-sources.jar"/> @@ -114,16 +114,16 @@ <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/media-src/0.3.7/media-src-0.3.7.jar" sourcepath="M2_REPO/org/waveprotocol/media-src/0.3.7/media-src-0.3.7-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/media-src/0.3.8/media-src-0.3.8.jar" sourcepath="M2_REPO/org/waveprotocol/media-src/0.3.8/media-src-0.3.8-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar" sourcepath="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model-src/0.3.7/model-src-0.3.7.jar" sourcepath="M2_REPO/org/waveprotocol/model-src/0.3.7/model-src-0.3.7-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model-src/0.3.8/model-src-0.3.8.jar" sourcepath="M2_REPO/org/waveprotocol/model-src/0.3.8/model-src-0.3.8-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.jar" sourcepath="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16-sources.jar"/> <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.13/mysql-connector-java-5.1.13.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.15/nekohtml-1.9.15.jar" sourcepath="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.15/nekohtml-1.9.15-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar" sourcepath="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-msg/0.3.7/proto-msg-0.3.7.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/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"/> @@ -147,9 +147,9 @@ <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/> <classpathentry kind="var" path="M2_REPO/org/testng/testng/6.2.1/testng-6.2.1.jar" sourcepath="M2_REPO/org/testng/testng/6.2.1/testng-6.2.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/tigase/tigase-xmltools/3.3.5/tigase-xmltools-3.3.5.jar" sourcepath="M2_REPO/tigase/tigase-xmltools/3.3.5/tigase-xmltools-3.3.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util-src/0.3.7/util-src-0.3.7.jar" sourcepath="M2_REPO/org/waveprotocol/util-src/0.3.7/util-src-0.3.7-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util-src/0.3.8/util-src-0.3.8.jar" sourcepath="M2_REPO/org/waveprotocol/util-src/0.3.8/util-src-0.3.8-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/waveinabox-server-0.3/0.3.7/waveinabox-server-0.3-0.3.7.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/waveinabox-server-0.3/0.3.8/waveinabox-server-0.3-0.3.8.jar"/> <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1.jar" sourcepath="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/> <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-07 12:18:53 UTC (rev 1637) +++ trunk/pom.xml 2011-12-12 21:47:20 UTC (rev 1638) @@ -19,7 +19,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <slf4j.version>1.6.1</slf4j.version> <openjpa.version>2.0.1</openjpa.version> - <wiab.version>0.3.7</wiab.version> + <wiab.version>0.3.8</wiab.version> <skipTests>true</skipTests> </properties> <repositories> 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-07 12:18:53 UTC (rev 1637) +++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-12-12 21:47:20 UTC (rev 1638) @@ -84,7 +84,7 @@ final String msg = caught.getMessage(); eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, i18n.t("You do not have rights to perform that action") - + (!TextUtils.empty(msg) && msg.length() > 1 ? ". " + i18n.t(msg) : ""))); + + (!TextUtils.empty(msg) && msg.length() > 2 ? ". " + i18n.t(msg) : ""))); goHome(); } else if (caught instanceof SessionExpiredException) { logException(caught); Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/EntitySearchPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/EntitySearchPanel.java 2011-12-07 12:18:53 UTC (rev 1637) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/EntitySearchPanel.java 2011-12-12 21:47:20 UTC (rev 1638) @@ -71,7 +71,7 @@ dialog.getTitleText().setText( i18n.t(searchOnlyUsers ? "Type the name of the user and select him/her:" : "Type the name of the user or group and select it:"), i18n.getDirection()); - final MultivalueSuggestBox multivalueSBox = SearchBoxFactory.create(i18n, searchOnlyUsers, id, + final MultivalueSuggestBox multivalueSBox = SearchBoxFactory.create(i18n, searchOnlyUsers, true, id, callback); suggestBox = multivalueSBox.getSuggestBox(); searchTextBox = suggestBox.getTextBox(); Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/MultivalueSuggestBox.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/MultivalueSuggestBox.java 2011-12-07 12:18:53 UTC (rev 1637) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/MultivalueSuggestBox.java 2011-12-12 21:47:20 UTC (rev 1638) @@ -311,9 +311,11 @@ if (totSize < 1) { // if there were no suggestions, then it's an invalid value updateFormFeedback(FormFeedback.ERROR, "Invalid: " + m_query); - final OptionSuggestion sugg = new OptionSuggestion(i18n.t("No results"), "#", - m_request.getQuery(), m_query); - suggs.add(sugg); + if (showNoResult) { + final OptionSuggestion sugg = new OptionSuggestion(i18n.t("No results"), "#", + m_request.getQuery(), m_query); + suggs.add(sugg); + } } else if (false && totSize == 1) { // Patch to show always the suggestions // it's an exact match, so do not bother with showing suggestions, @@ -497,6 +499,8 @@ private final Map<String, String> mvalueMap; + private final boolean showNoResult; + // private final OnExactMatch onExactMatch; /** @@ -510,10 +514,14 @@ * @param isMultivalued * - true for allowing multiple values * @param onExactMatch + * @param showNoResult + * if we have to show noResult message when the search is empty or + * not */ - public MultivalueSuggestBox(final I18nUITranslationService i18n, final String restEndpointUrl, - final boolean isMultivalued, final OnExactMatch onExactMatch) { + public MultivalueSuggestBox(final I18nUITranslationService i18n, final boolean showNoResult, + final String restEndpointUrl, final boolean isMultivalued, final OnExactMatch onExactMatch) { this.i18n = i18n; + this.showNoResult = showNoResult; mrestEndpointUrl = restEndpointUrl; misMultivalued = isMultivalued; // this.onExactMatch = onExactMatch; Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/SearchBoxFactory.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/SearchBoxFactory.java 2011-12-07 12:18:53 UTC (rev 1637) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SearchBoxFactory.java 2011-12-12 21:47:20 UTC (rev 1638) @@ -31,9 +31,11 @@ public class SearchBoxFactory { public static MultivalueSuggestBox create(final I18nUITranslationService i18n, - final boolean searchOnlyUsers, final String id, final OnEntitySelectedInSearch callback) { + final boolean searchOnlyUsers, final boolean showNoResult, final String id, + final OnEntitySelectedInSearch callback) { final MultivalueSuggestBox multivalueSBox = new MultivalueSuggestBox( i18n, + showNoResult, searchOnlyUsers ? SearcherConstants.USER_DATA_PROXY_URL : SearcherConstants.GROUP_DATA_PROXY_URL, false, new OnExactMatch() { Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java 2011-12-07 12:18:53 UTC (rev 1637) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java 2011-12-12 21:47:20 UTC (rev 1638) @@ -53,7 +53,7 @@ final StateManager stateManager, final I18nUITranslationService i18n) { searchButton = new PushButton(new Image(img.kuneSearchIco()), new Image(img.kuneSearchIcoPush())); searchButton.ensureDebugId(SITE_SEARCH_BUTTON); - final MultivalueSuggestBox multivalueSBox = SearchBoxFactory.create(i18n, false, + final MultivalueSuggestBox multivalueSBox = SearchBoxFactory.create(i18n, false, true, SITE_SEARCH_TEXTBOX, new OnEntitySelectedInSearch() { @Override public void onSeleted(final String shortName) { 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-07 12:18:53 UTC (rev 1637) +++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-12-12 21:47:20 UTC (rev 1638) @@ -21,8 +21,8 @@ package cc.kune.core.client.state; import org.waveprotocol.box.webclient.client.ClientEvents; -import org.waveprotocol.box.webclient.client.HistorySupport; import org.waveprotocol.box.webclient.client.events.WaveSelectionEvent; +import org.waveprotocol.wave.model.waveref.InvalidWaveRefException; import org.waveprotocol.wave.util.escapers.GwtWaverefEncoder; import cc.kune.common.client.actions.BeforeActionCollection; @@ -290,8 +290,12 @@ if (session.isLogged()) { SpaceConfEvent.fire(eventBus, Space.userSpace, newHistoryToken); SpaceSelectEvent.fire(eventBus, Space.userSpace); - ClientEvents.get().fireEvent( - new WaveSelectionEvent(HistorySupport.waveRefFromHistoryToken(newHistoryToken))); + try { + ClientEvents.get().fireEvent( + new WaveSelectionEvent(GwtWaverefEncoder.decodeWaveRefFromPath(newHistoryToken))); + } catch (final InvalidWaveRefException e) { + Log.error(nToken, e); + } } else { // Wave, but don't logged history.newItem(TokenUtils.addRedirect(SiteTokens.SIGNIN, newHistoryToken)); 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-07 12:18:53 UTC (rev 1637) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java 2011-12-12 21:47:20 UTC (rev 1638) @@ -78,6 +78,7 @@ @UiField DeckPanel deck; private final GSpaceArmor gsArmor; + private final I18nTranslationService i18n; private IdGenerator idGenerator; private Element loading; @UiField @@ -85,6 +86,7 @@ private ProfileManager profiles; /** The wave panel, if a wave is open. */ private KuneStagesProvider wave; + private final WaveClientProvider waveClientProv; private ImplPanel waveHolder; @@ -103,6 +105,7 @@ this.gsArmor = wsArmor; this.waveClientProv = waveClient; this.capabilitiesRegistry = capabilitiesRegistry; + this.i18n = i18n; widget = uiBinder.createAndBindUi(this); contentTitle = new ContentTitleWidget(i18n, gsArmor, capabilitiesRegistry.getIconsRegistry()); eventBus.addHandler(WaveClientClearEvent.getType(), @@ -219,7 +222,7 @@ final Element holder = waveHolder.getElement().appendChild(Document.get().createDivElement()); final KuneStagesProvider wave = new KuneStagesProvider(holder, waveHolder, waveRef, channel, idGenerator, profiles, waveStore, isNewWave, - org.waveprotocol.box.webclient.client.Session.get().getDomain(), true); + org.waveprotocol.box.webclient.client.Session.get().getDomain(), true, i18n); this.wave = wave; wave.load(new Command() { @Override Added: trunk/src/main/java/cc/kune/wave/client/KuneParticipantController.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/KuneParticipantController.java (rev 0) +++ trunk/src/main/java/cc/kune/wave/client/KuneParticipantController.java 2011-12-12 21:47:20 UTC (rev 1638) @@ -0,0 +1,156 @@ +/** + * Copyright 2010 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package cc.kune.wave.client; + +import org.waveprotocol.wave.client.account.Profile; +import org.waveprotocol.wave.client.account.ProfileManager; +import org.waveprotocol.wave.client.common.safehtml.EscapeUtils; +import org.waveprotocol.wave.client.wavepanel.WavePanel; +import org.waveprotocol.wave.client.wavepanel.event.EventHandlerRegistry; +import org.waveprotocol.wave.client.wavepanel.event.WaveClickHandler; +import org.waveprotocol.wave.client.wavepanel.view.ParticipantView; +import org.waveprotocol.wave.client.wavepanel.view.ParticipantsView; +import org.waveprotocol.wave.client.wavepanel.view.View.Type; +import org.waveprotocol.wave.client.wavepanel.view.dom.DomAsViewProvider; +import org.waveprotocol.wave.client.wavepanel.view.dom.ModelAsViewProvider; +import org.waveprotocol.wave.client.wavepanel.view.dom.full.TypeCodes; +import org.waveprotocol.wave.client.widget.profile.ProfilePopupPresenter; +import org.waveprotocol.wave.client.widget.profile.ProfilePopupView; +import org.waveprotocol.wave.model.conversation.Conversation; +import org.waveprotocol.wave.model.util.Pair; +import org.waveprotocol.wave.model.wave.InvalidParticipantAddress; +import org.waveprotocol.wave.model.wave.ParticipantId; + +import cc.kune.common.client.notify.NotifyUser; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.gwt.dom.client.Element; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.Window; + +/** + * Installs the add/remove participant controls. + * + */ +public final class KuneParticipantController { + private static I18nTranslationService i18n; + + /** + * Builds and installs the participant control feature. + */ + public static void install(final WavePanel panel, final ModelAsViewProvider models, + final ProfileManager profiles, final String localDomain, final I18nTranslationService i18n) { + KuneParticipantController.i18n = i18n; + final KuneParticipantController controller = new KuneParticipantController(panel.getViewProvider(), + models, profiles, localDomain); + controller.install(panel.getHandlers()); + } + private final String localDomain; + private final ModelAsViewProvider models; + private final ProfileManager profiles; + + private final DomAsViewProvider views; + + /** + * @param localDomain + * nullable. if provided, automatic suffixing will occur. + */ + KuneParticipantController(final DomAsViewProvider views, final ModelAsViewProvider models, + final ProfileManager profiles, final String localDomain) { + this.views = views; + this.models = models; + this.profiles = profiles; + this.localDomain = localDomain; + } + + /** + * Shows an add-participant popup. + */ + private void handleAddButtonClicked(final Element context) { + + ParticipantId p; + String address = Window.prompt("Add a participant: ", ""); + if (address == null) { + return; + } + address = address.trim(); + if (localDomain != null) { + if (!address.isEmpty() && address.indexOf("@") == -1) { + // If no domain was specified, assume that the participant is from the + // local domain. + address = address + "@" + localDomain; + } else if (address.equals("@")) { + // "@" is a shortcut for the shared domain participant. + address = address + localDomain; + } + } + + try { + p = ParticipantId.of(address); + } catch (final InvalidParticipantAddress e) { + NotifyUser.error(i18n.t("Invalid address: [%s]", address)); + return; + } + + final ParticipantsView participantsUi = views.fromAddButton(context); + final Conversation conversation = models.getParticipants(participantsUi); + conversation.addParticipant(p); + } + + /** + * Shows a participation popup for the clicked participant. + */ + private void handleParticipantClicked(final Element context) { + final ParticipantView participantView = views.asParticipant(context); + final Pair<Conversation, ParticipantId> participation = models.getParticipant(participantView); + final Profile profile = profiles.getProfile(participation.second); + + // Summon a popup view from a participant, and attach profile-popup logic to + // it. + final ProfilePopupView profileView = participantView.showParticipation(); + final ProfilePopupPresenter profileUi = ProfilePopupPresenter.create(profile, profileView, profiles); + if (!participation.first.getParticipantIds().iterator().next().equals(participation.getSecond())) { + profileUi.addControl(EscapeUtils.fromSafeConstant("Remove"), new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + participation.first.removeParticipant(participation.second); + // The presenter is configured to destroy itself on view hide. + profileView.hide(); + } + }); + } + profileUi.show(); + } + + private void install(final EventHandlerRegistry handlers) { + handlers.registerClickHandler(TypeCodes.kind(Type.ADD_PARTICIPANT), new WaveClickHandler() { + @Override + public boolean onClick(final ClickEvent event, final Element context) { + handleAddButtonClicked(context); + return true; + } + }); + handlers.registerClickHandler(TypeCodes.kind(Type.PARTICIPANT), new WaveClickHandler() { + @Override + public boolean onClick(final ClickEvent event, final Element context) { + handleParticipantClicked(context); + return true; + } + }); + } +} Modified: trunk/src/main/java/cc/kune/wave/client/KuneStagesProvider.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/KuneStagesProvider.java 2011-12-07 12:18:53 UTC (rev 1637) +++ trunk/src/main/java/cc/kune/wave/client/KuneStagesProvider.java 2011-12-12 21:47:20 UTC (rev 1638) @@ -32,14 +32,30 @@ import org.waveprotocol.wave.client.common.util.AsyncHolder; import org.waveprotocol.wave.client.common.util.AsyncHolder.Accessor; import org.waveprotocol.wave.client.common.util.LogicalPanel; +import org.waveprotocol.wave.client.editor.EditorStaticDeps; +import org.waveprotocol.wave.client.wavepanel.impl.WavePanelImpl; +import org.waveprotocol.wave.client.wavepanel.impl.edit.Actions; +import org.waveprotocol.wave.client.wavepanel.impl.edit.EditController; +import org.waveprotocol.wave.client.wavepanel.impl.edit.EditSession; +import org.waveprotocol.wave.client.wavepanel.impl.edit.KeepFocusInView; +import org.waveprotocol.wave.client.wavepanel.impl.focus.FocusFramePresenter; +import org.waveprotocol.wave.client.wavepanel.impl.indicator.ReplyIndicatorController; +import org.waveprotocol.wave.client.wavepanel.impl.menu.MenuController; +import org.waveprotocol.wave.client.wavepanel.impl.title.WaveTitleHandler; +import org.waveprotocol.wave.client.wavepanel.impl.toolbar.ToolbarSwitcher; import org.waveprotocol.wave.client.wavepanel.view.BlipView; import org.waveprotocol.wave.client.wavepanel.view.dom.ModelAsViewProvider; import org.waveprotocol.wave.client.wavepanel.view.dom.full.BlipQueueRenderer; import org.waveprotocol.wave.client.wavepanel.view.dom.full.DomRenderer; +import org.waveprotocol.wave.client.widget.popup.PopupChromeFactory; +import org.waveprotocol.wave.client.widget.popup.PopupFactory; import org.waveprotocol.wave.model.conversation.ConversationView; import org.waveprotocol.wave.model.id.IdGenerator; +import org.waveprotocol.wave.model.wave.ParticipantId; import org.waveprotocol.wave.model.waveref.WaveRef; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.gwt.dom.client.Element; /** @@ -51,28 +67,30 @@ private final static AsyncHolder<Object> HALT = new AsyncHolder<Object>() { @Override - public void call(Accessor<Object> accessor) { + public void call(final Accessor<Object> accessor) { // Never ready, so never notify the accessor. } }; - private final Element wavePanelElement; - private final LogicalPanel rootPanel; - private final WaveRef waveRef; private final RemoteViewServiceMultiplexer channel; + private boolean closed; + private final I18nTranslationService i18n; private final IdGenerator idGenerator; - private final ProfileManager profiles; - private final WaveStore waveStore; private final boolean isNewWave; private final String localDomain; + private StageOne one; + private final ProfileManager profiles; + private final LogicalPanel rootPanel; - private boolean closed; - private StageOne one; + private final boolean showParticipantsPanel; + private StageThree three; private StageTwo two; - private StageThree three; private WaveContext wave; - private boolean showParticipantsPanel; + private final Element wavePanelElement; + private final WaveRef waveRef; + private final WaveStore waveStore; + /** * @param wavePanelElement The dom element to become the wave panel * @param rootPanel A panel that this an ancestor of wavePanelElement. This is @@ -83,9 +101,9 @@ * @param isNewWave true if the wave is a new client-created wave * @param idGenerator */ - public KuneStagesProvider(Element wavePanelElement, LogicalPanel rootPanel, WaveRef waveRef, - RemoteViewServiceMultiplexer channel, IdGenerator idGenerator, ProfileManager profiles, - WaveStore store, boolean isNewWave, String localDomain, boolean showParticipantsPanel) { + public KuneStagesProvider(final Element wavePanelElement, final LogicalPanel rootPanel, final WaveRef waveRef, + final RemoteViewServiceMultiplexer channel, final IdGenerator idGenerator, final ProfileManager profiles, + final WaveStore store, final boolean isNewWave, final String localDomain, final boolean showParticipantsPanel, final I18nTranslationService i18n) { this.wavePanelElement = wavePanelElement; this.rootPanel = rootPanel; this.waveRef = waveRef; @@ -96,46 +114,21 @@ this.isNewWave = isNewWave; this.localDomain = localDomain; this.showParticipantsPanel = showParticipantsPanel; + this.i18n = i18n; } @Override - protected AsyncHolder<StageZero> createStageZeroLoader() { - return haltIfClosed(super.createStageZeroLoader()); - } - - @Override - protected AsyncHolder<StageOne> createStageOneLoader(StageZero zero) { + protected AsyncHolder<StageOne> createStageOneLoader(final StageZero zero) { return haltIfClosed(new StageOne.DefaultProvider(zero) { @Override - protected Element createWaveHolder() { - return wavePanelElement; - } - - @Override protected LogicalPanel createWaveContainer() { return rootPanel; } - }); - } - @Override - protected AsyncHolder<StageTwo> createStageTwoLoader(StageOne one) { - return haltIfClosed(new StageTwoProvider( - this.one = one, waveRef, channel, isNewWave, idGenerator, profiles) { - // Kune patch @Override - protected DomRenderer createRenderer() { - return KuneFullDomWaveRendererImpl.create(getConversations(), getProfileManager(), - getBlipDetailer(), getViewIdMapper(), getBlipQueue(), getThreadReadStateMonitor(), - createViewFactories(), showParticipantsPanel); + protected Element createWaveHolder() { + return wavePanelElement; } - - // Warning: this run into issue #73 - // @Override - // protected void installFeatures() { - // WavePanelResourceLoader.loadCss(); - // // KuneWavePanelResourceLoader.loadCss(); - // } }); } @@ -147,7 +140,7 @@ // Prepend an init wave flow onto the stage continuation. super.create(new Accessor<StageThree>() { @Override - public void use(StageThree x) { + public void use(final StageThree x) { onStageThreeLoaded(x, whenReady); } }); @@ -157,41 +150,57 @@ protected String getLocalDomain() { return localDomain; } + @Override + protected void install() { + EditorStaticDeps.setPopupProvider(PopupFactory.getProvider()); + EditorStaticDeps.setPopupChromeProvider(PopupChromeFactory.getProvider()); + + // Eagerly install some features. + final WavePanelImpl panel = stageTwo.getStageOne().getWavePanel(); + final FocusFramePresenter focus = stageTwo.getStageOne().getFocusFrame(); + final ParticipantId user = stageTwo.getSignedInUser(); + final ModelAsViewProvider models = stageTwo.getModelAsViewProvider(); + final ProfileManager profiles = stageTwo.getProfileManager(); + + final Actions actions = getEditActions(); + final EditSession edit = getEditSession(); + MenuController.install(actions, panel); + ToolbarSwitcher.install(stageTwo.getStageOne().getWavePanel(), getEditSession(), + getViewToolbar(), getEditToolbar()); + WaveTitleHandler.install(edit, models); + ReplyIndicatorController.install(actions, edit, panel); + EditController.install(focus, actions, panel); + KuneParticipantController.install(panel, models, profiles, getLocalDomain(), i18n); + KeepFocusInView.install(edit, panel); + stageTwo.getDiffController().upgrade(edit); + } }); } - private void onStageThreeLoaded(StageThree x, Accessor<StageThree> whenReady) { - if (closed) { - // Stop the loading process. - return; - } - three = x; - if (isNewWave) { - initNewWave(x); - } else { - handleExistingWave(x); - } - wave = new WaveContext( - two.getWave(), two.getConversations(), two.getSupplement(), two.getReadMonitor()); - waveStore.add(wave); - whenReady.use(x); - } + @Override + protected AsyncHolder<StageTwo> createStageTwoLoader(final StageOne one) { + return haltIfClosed(new StageTwoProvider( + this.one = one, waveRef, channel, isNewWave, idGenerator, profiles) { + // Kune patch + @Override + protected DomRenderer createRenderer() { + return KuneFullDomWaveRendererImpl.create(getConversations(), getProfileManager(), + getBlipDetailer(), getViewIdMapper(), getBlipQueue(), getThreadReadStateMonitor(), + createViewFactories(), showParticipantsPanel); + } - private void initNewWave(StageThree three) { - // Do the new-wave flow. - ModelAsViewProvider views = two.getModelAsViewProvider(); - BlipQueueRenderer blipQueue = two.getBlipQueue(); - ConversationView wave = two.getConversations(); - - // Force rendering to finish. - blipQueue.flush(); - BlipView blipUi = views.getBlipView(wave.getRoot().getRootThread().getFirstBlip()); - three.getEditActions().startEditing(blipUi); + // Warning: this run into issue #73 + // @Override + // protected void installFeatures() { + // WavePanelResourceLoader.loadCss(); + // // KuneWavePanelResourceLoader.loadCss(); + // } + }); } - private void handleExistingWave(StageThree three) { - BlipQueueRenderer blipQueue = two.getBlipQueue(); - blipQueue.flush(); + @Override + protected AsyncHolder<StageZero> createStageZeroLoader() { + return haltIfClosed(super.createStageZeroLoader()); } public void destroy() { @@ -219,7 +228,41 @@ * given provider. */ @SuppressWarnings("unchecked") // HALT is safe as a holder for any type - private <T> AsyncHolder<T> haltIfClosed(AsyncHolder<T> provider) { + private <T> AsyncHolder<T> haltIfClosed(final AsyncHolder<T> provider) { return closed ? (AsyncHolder<T>) HALT : provider; } + + private void handleExistingWave(final StageThree three) { + final BlipQueueRenderer blipQueue = two.getBlipQueue(); + blipQueue.flush(); + } + + private void initNewWave(final StageThree three) { + // Do the new-wave flow. + final ModelAsViewProvider views = two.getModelAsViewProvider(); + final BlipQueueRenderer blipQueue = two.getBlipQueue(); + final ConversationView wave = two.getConversations(); + + // Force rendering to finish. + blipQueue.flush(); + final BlipView blipUi = views.getBlipView(wave.getRoot().getRootThread().getFirstBlip()); + three.getEditActions().startEditing(blipUi); + } + + private void onStageThreeLoaded(final StageThree x, final Accessor<StageThree> whenReady) { + if (closed) { + // Stop the loading process. + return; + } + three = x; + if (isNewWave) { + initNewWave(x); + } else { + handleExistingWave(x); + } + wave = new WaveContext( + two.getWave(), two.getConversations(), two.getSupplement(), two.getReadMonitor()); + waveStore.add(wave); + whenReady.use(x); + } } Modified: trunk/src/main/java/cc/kune/wave/client/WebClient.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-12-07 12:18:53 UTC (rev 1637) +++ trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-12-12 21:47:20 UTC (rev 1638) @@ -64,7 +64,9 @@ import org.waveprotocol.wave.model.id.IdGenerator; import org.waveprotocol.wave.model.id.WaveId; import org.waveprotocol.wave.model.wave.ParticipantId; +import org.waveprotocol.wave.model.waveref.InvalidWaveRefException; import org.waveprotocol.wave.model.waveref.WaveRef; +import org.waveprotocol.wave.util.escapers.GwtWaverefEncoder; import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.errors.DefaultException; @@ -72,6 +74,7 @@ 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; @@ -225,13 +228,15 @@ private final EventBus eventBus; + private final I18nTranslationService i18n; + private IdGenerator idGenerator; private final InboxCountPresenter inboxCount; private final Element loading = new LoadingIndicator().getElement(); + private ParticipantId loggedInUser; - private ParticipantId loggedInUser; @UiField DebugMessagePanel logPanel; @@ -257,7 +262,6 @@ ImplPanel waveHolder; private final WaveStore waveStore = new SimpleWaveStore(); - /** * Create a remote websocket to talk to the server-side FedOne service. */ @@ -267,11 +271,12 @@ * This is the entry point method. */ @Inject - public WebClient(final EventBus eventBus, final KuneWaveProfileManager profiles, final InboxCountPresenter inboxCount, final TokenMatcher tokenMatcher, final cc.kune.core.client.state.Session session) { + 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; + this.i18n = i18n; searchPanel = new SearchPanelWidget(new SearchPanelRenderer(profiles)); ErrorHandler.install(); @@ -427,7 +432,7 @@ waveHolder.getElement().appendChild(loading); final Element holder = waveHolder.getElement().appendChild(Document.get().createDivElement()); final KuneStagesProvider wave = new KuneStagesProvider( - holder, waveHolder, waveRef, channel, idGenerator, profiles, waveStore, isNewWave, Session.get().getDomain(), true); + holder, waveHolder, waveRef, channel, idGenerator, profiles, waveStore, isNewWave, Session.get().getDomain(), true, i18n); this.wave = wave; wave.load(new Command() { @Override @@ -438,8 +443,10 @@ final String encodedToken = History.getToken(); // Kune patch if (encodedToken != null && !encodedToken.isEmpty() && !encodedToken.equals(SiteTokens.WAVEINBOX)) { - final WaveRef fromWaveRef = HistorySupport.waveRefFromHistoryToken(encodedToken); - if (waveRef == null) { + WaveRef fromWaveRef; + try { + fromWaveRef = GwtWaverefEncoder.decodeWaveRefFromPath(encodedToken); + } catch (final InvalidWaveRefException e) { LOG.info("History token contains invalid path: " + encodedToken); return; } @@ -450,7 +457,7 @@ return; } } - final String tokenFromWaveref = HistorySupport.historyTokenFromWaveref(waveRef); + final String tokenFromWaveref = GwtWaverefEncoder.encodeToUriPathSegment(waveRef); SpaceConfEvent.fire(eventBus, Space.userSpace, tokenFromWaveref); History.newItem(tokenFromWaveref, false); } Modified: trunk/src/main/java/cc/kune/wave/server/WaveMain.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/WaveMain.java 2011-12-07 12:18:53 UTC (rev 1637) +++ trunk/src/main/java/cc/kune/wave/server/WaveMain.java 2011-12-12 21:47:20 UTC (rev 1638) @@ -140,6 +140,13 @@ boolean enableFederation = settingsInjector.getInstance(Key.get(Boolean.class, Names.named(CoreSettings.ENABLE_FEDERATION))); + int listenerCount = settingsInjector.getInstance(Key.get(Integer.class, + Names.named(CoreSettings.LISTENER_EXECUTOR_THREAD_COUNT))); + int waveletLoadCount = settingsInjector.getInstance(Key.get(Integer.class, + Names.named(CoreSettings.WAVELET_LOAD_EXECUTOR_THREAD_COUNT))); + int deltaPersistCount = settingsInjector.getInstance(Key.get(Integer.class, + Names.named(CoreSettings.DELTA_PERSIST_EXECUTOR_THREAD_COUNT))); + if (enableFederation) { Module federationSettings = SettingsBinder.bindSettings(PROPERTIES_FILE_KEY, FederationSettings.class); @@ -150,7 +157,8 @@ Module federationModule = buildFederationModule(settingsInjector, enableFederation); PersistenceModule persistenceModule = settingsInjector.getInstance(PersistenceModule.class); Injector injector = - settingsInjector.createChildInjector(new ServerModule(enableFederation), + settingsInjector.createChildInjector(new ServerModule(enableFederation, listenerCount, + waveletLoadCount, deltaPersistCount), new RobotApiModule(), federationModule, persistenceModule); ServerRpcProvider server = injector.getInstance(ServerRpcProvider.class); Modified: trunk/src/main/resources/wave-server.properties =================================================================== --- trunk/src/main/resources/wave-server.properties 2011-12-07 12:18:53 UTC (rev 1637) +++ trunk/src/main/resources/wave-server.properties 2011-12-12 21:47:20 UTC (rev 1638) @@ -71,11 +71,19 @@ admin_user = @local.net # The wave id of the welcome template wave. (Without domain, for example: w+Fxjs_-ZPmmA). -# If filled in then a copy of this wave (actually only the root blip) will be +# If filled in then a copy of this wave (actually only the root blip) will be # automatically added to the inbox of every new user. # Default value: "" (empty) -welcome_wave_id = +welcome_wave_id = +# 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 + # 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/TestHelper.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/TestHelper.java 2011-12-07 12:18:53 UTC (rev 1637) +++ trunk/src/test/java/cc/kune/core/server/TestHelper.java 2011-12-12 21:47:20 UTC (rev 1638) @@ -59,16 +59,16 @@ final PersistenceModule wavePersistModule = injector.getInstance(PersistenceModule.class); final NoOpFederationModule federationModule = injector.getInstance(NoOpFederationModule.class); final Injector childInjector = injector.createChildInjector(wavePersistModule, new ServerModule( - false), new RobotApiModule(), federationModule, FinderRegistry.init(new JpaPersistModule( - persistenceUnit)), module, new Module() { - @Override - public void configure(final Binder binder) { - binder.bindScope(SessionScoped.class, Scopes.SINGLETON); - binder.bindScope(RequestScoped.class, Scopes.SINGLETON); - binder.bind(KuneProperties.class).toInstance(new KunePropertiesDefault(propetiesFileName)); - binder.bind(HttpServletRequest.class).to(HttpServletRequestMocked.class); - } - }); + false, 1, 2, 2), new RobotApiModule(), federationModule, + FinderRegistry.init(new JpaPersistModule(persistenceUnit)), module, new Module() { + @Override + public void configure(final Binder binder) { + binder.bindScope(SessionScoped.class, Scopes.SINGLETON); + binder.bindScope(RequestScoped.class, Scopes.SINGLETON); + binder.bind(KuneProperties.class).toInstance(new KunePropertiesDefault(propetiesFileName)); + binder.bind(HttpServletRequest.class).to(HttpServletRequestMocked.class); + } + }); try { childInjector.getInstance(WaveServerImpl.class).initialize(); } catch (final WaveServerException e) { Modified: trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java 2011-12-07 12:18:53 UTC (rev 1637) +++ trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java 2011-12-12 21:47:20 UTC (rev 1638) @@ -65,8 +65,8 @@ final Injector childInjector = injector.createChildInjector(wavePersistModule, FinderRegistry.init(new JpaPersistModule(TestConstants.PERSISTENCE_UNIT)), new ListsServerModule(), new RobotApiModule(), new PlatformServerModule(), - new DocumentServerModule(), new ChatServerModule(), new ServerModule(false), federationModule, - new WikiServerModule(), new TaskServerModule(), new BarterServerModule(), + new DocumentServerModule(), new ChatServerModule(), new ServerModule(false, 1, 2, 2), + federationModule, new WikiServerModule(), new TaskServerModule(), new BarterServerModule(), new EventsServerModule(), new AbstractModule() { @Override protected void configure() { Modified: trunk/src/test/java/cc/kune/wave/server/KuneWaveServiceDefaultTest.java =================================================================== --- trunk/src/test/java/cc/kune/wave/server/KuneWaveServiceDefaultTest.java 2011-12-07 12:18:53 UTC (rev 1637) +++ trunk/src/test/java/cc/kune/wave/server/KuneWaveServiceDefaultTest.java 2011-12-12 21:47:20 UTC (rev 1638) @@ -32,6 +32,7 @@ import java.util.TreeSet; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.waveprotocol.wave.model.waveref.WaveRef; @@ -57,6 +58,27 @@ ParticipantUtils participantUtils; @Test + @Ignore + public void addAndDelMainParticipant() throws IOException { + doLogin(); + final WaveRef waveletName = createTestWave(); + assertNotNull(waveletName); + manager.addParticipants(waveletName, getSiteAdminShortName(), NEW_PARTICIPANT); + + final Wavelet fetchWavelet = manager.fetchWave(waveletName, getSiteAdminShortName()); + assertNotNull(fetchWavelet); + assertEquals(2, fetchWavelet.getParticipants().size()); + assertTrue(manager.isParticipant(fetchWavelet, NEW_PARTICIPANT)); + assertTrue(manager.isParticipant(fetchWavelet, getSiteAdminShortName())); + // Del all + manager.delParticipants(waveletName, getSiteAdminShortName(), getSiteAdminShortName()); + // This fails because we don't have a way to access to than wave now ... + // @domain don't work neither + final Wavelet fetchedAfterDeleted = manager.fetchWave(waveletName, ""); + assertNotNull(fetchedAfterDeleted); + } + + @Test public void addAndDelParticipantTwice() throws IOException { doLogin(); final WaveRef waveletName = createTestWave(); @@ -72,7 +94,7 @@ assertEquals(2, fetchWavelet.getParticipants().size()); assertTrue(manager.isParticipant(fetchWavelet, NEW_PARTICIPANT)); assertTrue(manager.isParticipant(fetchWavelet, getSiteAdminShortName())); - // Del all + // Del main editor manager.delParticipants(waveletName, getSiteAdminShortName(), NEW_PARTICIPANT, NEW_PARTICIPANT, getSiteAdminShortName(), getSiteAdminShortName()); }

1 0

r1637 - in trunk/src: main/java/cc/kune/gspace/client main/java/cc/kune/wave/server test/java/cc/kune/wave/server
by Vicente J. Ruiz Jurado 07 Dec '11

07 Dec '11

Author: vjrj_ Date: 2011-12-07 13:18:53 +0100 (Wed, 07 Dec 2011) New Revision: 1637 Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java trunk/src/main/java/cc/kune/wave/server/KuneWaveServiceDefault.java trunk/src/test/java/cc/kune/wave/server/KuneWaveServiceDefaultTest.java Log: CLOSED - # 177: List posts don't add participants correctly http://kune.ourproject.org/issues/ticket/177 Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java 2011-12-06 19:55:44 UTC (rev 1636) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java 2011-12-07 12:18:53 UTC (rev 1637) @@ -127,7 +127,8 @@ @Override public void clearBackImage() { - DOM.setStyleAttribute(mainpanel.getElement(), CSS.A.BACKGROUND, "transparent"); + final String bodyProp = "#FFFFFF"; + DOM.setStyleAttribute(groupSpaceWrapper.getElement(), CSS.A.BACKGROUND, bodyProp); } @Override Modified: trunk/src/main/java/cc/kune/wave/server/KuneWaveServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/KuneWaveServiceDefault.java 2011-12-06 19:55:44 UTC (rev 1636) +++ trunk/src/main/java/cc/kune/wave/server/KuneWaveServiceDefault.java 2011-12-07 12:18:53 UTC (rev 1637) @@ -20,6 +20,7 @@ package cc.kune.wave.server; import java.net.URL; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -27,6 +28,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import java.util.TreeSet; import javax.annotation.Nonnull; @@ -70,6 +72,7 @@ import com.google.wave.api.OperationQueue; import com.google.wave.api.OperationRequest; import com.google.wave.api.OperationRequest.Parameter; +import com.google.wave.api.Participants; import com.google.wave.api.ProtocolVersion; import com.google.wave.api.Range; import com.google.wave.api.Wavelet; @@ -186,27 +189,22 @@ public void addParticipants(final WaveRef waveName, final String author, final String userWhoAdds, final String... newLocalParticipants) { final Wavelet wavelet = fetchWave(waveName, author); - final OperationQueue opQueue = new OperationQueue(); - - for (final String newLocalParticipant : newLocalParticipants) { - final String newPartWithDomain = participantUtils.of(newLocalParticipant).toString(); - boolean mustAdd = true; - for (final String current : wavelet.getParticipants()) { - if (current.equals(newPartWithDomain)) { - // Current user is a participant already (issue #73) - mustAdd = false; - break; - } - } - if (mustAdd) { + final Participants currentParticipants = wavelet.getParticipants(); + // Removing duplicates + for (final String participant : toSet(newLocalParticipants)) { + final String newPartWithDomain = participantUtils.of(participant).toString(); + if (!currentParticipants.contains(newPartWithDomain)) { + // FIXME This is very costly. Seems like only one participant per + // opQueue is added (try to + // fix this in WAVE) + final OperationQueue opQueue = new OperationQueue(); + LOG.debug("Adding as participant: " + newPartWithDomain); opQueue.addParticipantToWavelet(wavelet, newPartWithDomain); + final String whoAdd = wavelet.getParticipants().contains(participantUtils.of(userWhoAdds)) ? userWhoAdds + : author; + doOperation(whoAdd, opQueue, "add participant"); } } - if (opQueue.getPendingOperations().size() > 0) { - final String whoAdd = wavelet.getParticipants().contains(participantUtils.of(userWhoAdds)) ? userWhoAdds - : author; - doOperation(whoAdd, opQueue, "add participant"); - } } @Override @@ -307,38 +305,24 @@ return createWave(title, message, NO_WAVE_TO_COPY, gadgetUrl, participantsArray); } - // 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 void delParticipants(final WaveRef waveName, final String whoDel, final String... participants) { + public void delParticipants(final WaveRef waveName, final String whoDel, + final String... participantsToDel) { final Wavelet wavelet = fetchWave(waveName, whoDel); - final OperationQueue opQueue = new OperationQueue(); - - for (final String participant : participants) { + final Participants currentParticipants = wavelet.getParticipants(); + final Set<String> set = toSet(participantsToDel); + LOG.debug("Removing participants: " + set.toString()); + for (final String participant : set) { + // FIXME Seems like only one participant per opQueue is added (try to fix + // this in WAVE) final String partWithDomain = participantUtils.of(participant).toString(); - boolean mustDel = false; - for (final String current : wavelet.getParticipants()) { - if (current.equals(partWithDomain)) { - mustDel = true; - break; - } - } - if (mustDel) { + if (currentParticipants.contains(partWithDomain)) { + final OperationQueue opQueue = new OperationQueue(); + LOG.debug("Removing as participant: " + partWithDomain); opQueue.removeParticipantFromWavelet(wavelet, partWithDomain); + doOperation(whoDel, opQueue, "del participant"); } } - if (opQueue.getPendingOperations().size() > 0) { - doOperation(whoDel, opQueue, "add participant"); - } } private void doOperation(final String author, final OperationQueue opQueue, final String logComment) { @@ -374,6 +358,17 @@ 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(); @@ -389,6 +384,7 @@ onFailure(context.getResponse(reqId).getErrorMessage()); } else { // Duplicate code from WaveService + assert response != null; final WaveletData waveletData = (WaveletData) response.getData().get(ParamsProperty.WAVELET_DATA); final Map<String, Blip> blips = new HashMap<String, Blip>(); final Map<String, BlipThread> threads = new HashMap<String, BlipThread>(); @@ -453,4 +449,10 @@ doOperation(author, opQueue, "set title"); } + private Set<String> toSet(final String[] array) { + final Set<String> set = new TreeSet<String>(Collections.reverseOrder()); + set.addAll(Arrays.asList(array)); + return set; + } + } Modified: trunk/src/test/java/cc/kune/wave/server/KuneWaveServiceDefaultTest.java =================================================================== --- trunk/src/test/java/cc/kune/wave/server/KuneWaveServiceDefaultTest.java 2011-12-06 19:55:44 UTC (rev 1636) +++ trunk/src/test/java/cc/kune/wave/server/KuneWaveServiceDefaultTest.java 2011-12-07 12:18:53 UTC (rev 1637) @@ -26,6 +26,10 @@ import java.io.IOException; import java.net.URL; +import java.util.Arrays; +import java.util.Iterator; +import java.util.Set; +import java.util.TreeSet; import org.junit.Before; import org.junit.Test; @@ -42,6 +46,7 @@ private static final String MESSAGE = "testing"; 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 TEST_GADGET = "http://wave-api.appspot.com/public/gadgets/areyouin/gadget.xml"; private static final String TITLE = "title"; @@ -52,26 +57,51 @@ ParticipantUtils participantUtils; @Test + public void addAndDelParticipantTwice() throws IOException { + doLogin(); + final WaveRef waveletName = createTestWave(); + assertNotNull(waveletName); + manager.addParticipants(waveletName, getSiteAdminShortName(), getSiteAdminShortName(), + NEW_PARTICIPANT); + manager.addParticipants(waveletName, getSiteAdminShortName(), getSiteAdminShortName(), + NEW_PARTICIPANT, NEW_PARTICIPANT); + manager.addParticipants(waveletName, getSiteAdminShortName(), getSiteAdminShortName(), + NEW_PARTICIPANT, NEW_PARTICIPANT, NEW_PARTICIPANT); + final Wavelet fetchWavelet = manager.fetchWave(waveletName, getSiteAdminShortName()); + assertNotNull(fetchWavelet); + assertEquals(2, fetchWavelet.getParticipants().size()); + assertTrue(manager.isParticipant(fetchWavelet, NEW_PARTICIPANT)); + assertTrue(manager.isParticipant(fetchWavelet, getSiteAdminShortName())); + // Del all + manager.delParticipants(waveletName, getSiteAdminShortName(), NEW_PARTICIPANT, NEW_PARTICIPANT, + getSiteAdminShortName(), getSiteAdminShortName()); + } + + @Test public void addAndRemoveParticipant() throws IOException { doLogin(); final String whoDels = getSiteAdminShortName(); final WaveRef waveletName = createTestWave(); assertNotNull(waveletName); - manager.addParticipants(waveletName, getSiteAdminShortName(), whoDels, NEW_PARTICIPANT); + manager.addParticipants(waveletName, getSiteAdminShortName(), whoDels, NEW_PARTICIPANT, + NEW_PARTICIPANT2); final Wavelet fetchWavelet = manager.fetchWave(waveletName, getSiteAdminShortName()); assertNotNull(fetchWavelet); - assertEquals(2, fetchWavelet.getParticipants().size()); + assertEquals(3, fetchWavelet.getParticipants().size()); assertTrue(manager.isParticipant(fetchWavelet, NEW_PARTICIPANT)); + assertTrue(manager.isParticipant(fetchWavelet, NEW_PARTICIPANT2)); assertTrue(manager.isParticipant(fetchWavelet, getSiteAdminShortName())); - manager.delParticipants(waveletName, whoDels, NEW_PARTICIPANT); + manager.delParticipants(waveletName, whoDels, NEW_PARTICIPANT, NEW_PARTICIPANT2); final Wavelet fetchDelWavelet = manager.fetchWave(waveletName, getSiteAdminShortName()); assertNotNull(fetchDelWavelet); assertEquals(1, fetchDelWavelet.getParticipants().size()); assertTrue(manager.isParticipant(fetchDelWavelet, getSiteAdminShortName())); assertFalse(manager.isParticipant(fetchDelWavelet, NEW_PARTICIPANT)); - manager.addParticipants(waveletName, getSiteAdminShortName(), whoDels, NEW_PARTICIPANT); - // Del all - manager.delParticipants(waveletName, whoDels, getSiteAdminShortName(), NEW_PARTICIPANT); + assertFalse(manager.isParticipant(fetchDelWavelet, NEW_PARTICIPANT2)); + manager.addParticipants(waveletName, getSiteAdminShortName(), getSiteAdminShortName(), + NEW_PARTICIPANT); + // Del all (the last, the whoDels...) + manager.delParticipants(waveletName, whoDels, NEW_PARTICIPANT, getSiteAdminShortName()); } @Test @@ -82,6 +112,17 @@ manager.addGadget(waveletName, getSiteAdminShortName(), new URL(TEST_GADGET)); } + @Test + public void addingToSetMaintainsOrder() throws IOException { + final String[] array = new String[] { NEW_PARTICIPANT, NEW_PARTICIPANT, NEW_PARTICIPANT2, + NEW_PARTICIPANT2 }; + final Set<String> set = new TreeSet<String>(Arrays.asList(array)); + assertTrue(set.size() == 2); + final Iterator<String> iterator = set.iterator(); + assertTrue(iterator.next().equals(NEW_PARTICIPANT)); + assertTrue(iterator.next().equals(NEW_PARTICIPANT2)); + } + private void addParticipant(final String whoAdds) throws IOException { doLogin(); final WaveRef waveletName = createTestWave(); @@ -95,24 +136,6 @@ } @Test - public void addParticipantTwice() throws IOException { - doLogin(); - final WaveRef waveletName = createTestWave(); - assertNotNull(waveletName); - manager.addParticipants(waveletName, getSiteAdminShortName(), getSiteAdminShortName(), - NEW_PARTICIPANT); - manager.addParticipants(waveletName, getSiteAdminShortName(), getSiteAdminShortName(), - NEW_PARTICIPANT, NEW_PARTICIPANT); - manager.addParticipants(waveletName, getSiteAdminShortName(), getSiteAdminShortName(), - NEW_PARTICIPANT, NEW_PARTICIPANT, NEW_PARTICIPANT); - final Wavelet fetchWavelet = manager.fetchWave(waveletName, getSiteAdminShortName()); - assertNotNull(fetchWavelet); - assertEquals(2, fetchWavelet.getParticipants().size()); - assertTrue(manager.isParticipant(fetchWavelet, NEW_PARTICIPANT)); - assertTrue(manager.isParticipant(fetchWavelet, getSiteAdminShortName())); - } - - @Test public void authorAddParticipant() throws DefaultException, IOException { final String whoAdds = getSiteAdminShortName(); addParticipant(whoAdds);

1 0

r1636 - in trunk/src/main: java/cc/kune/chat/client/actions java/cc/kune/common/client/notify java/cc/kune/core/client/auth java/cc/kune/core/client/groups/newgroup java/cc/kune/core/client/sitebar/search java/cc/kune/core/client/sitebar/spaces java/cc/kune/core/client/sn/actions java/cc/kune/core/server/stats java/cc/kune/gspace/client/actions java/cc/kune/gspace/client/licensewizard java/cc/kune/gspace/client/themes java/cc/kune/lists/client/actions java/cc/kune/msgs/client java/cc/kune/msg
by Vicente J. Ruiz Jurado 06 Dec '11

06 Dec '11

Author: vjrj_ Date: 2011-12-06 20:55:44 +0100 (Tue, 06 Dec 2011) New Revision: 1636 Modified: trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/search/MultivalueSuggestBox.java trunk/src/main/java/cc/kune/core/client/sitebar/search/SearchBoxFactory.java trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.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/JoinGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.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/server/stats/StatsServiceDefault.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/ParticipateInContentBtn.java trunk/src/main/java/cc/kune/gspace/client/actions/SetAsHomePageMenuItem.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseChangeAction.java trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeManager.java trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java trunk/src/main/java/cc/kune/msgs/client/UserMessageWidget.java trunk/src/main/java/cc/kune/msgs/public/kune-message.css trunk/src/main/webapp/ws.html Log: CLOSED - # 151: Add scrolls to user and group stats in home page http://kune.ourproject.org/issues/ticket/151 CLOSED - # 86: No results in search, don't show any message http://kune.ourproject.org/issues/ticket/86 CLOSED - # 87: Set browser window title when on Inbox and Home http://kune.ourproject.org/issues/ticket/87 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-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -88,7 +88,7 @@ @Override public void onClick(final ClickEvent event) { if (diag.isValid()) { - NotifyUser.showProgressProcessing(); + NotifyUser.showProgress(); final String groupShortName = session.getCurrentState().getGroup().getShortName(); final StateToken parentToken = session.getContainerState().getRootContainer().getStateToken(); contentService.get().addRoom(session.getUserHash(), parentToken, 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-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -145,11 +145,12 @@ } public static void showProgressLoading() { + // Better empty message eventBus.fireEvent(new ProgressShowEvent()); } - public static void showProgressProcessing() { - eventBus.fireEvent(new ProgressShowEvent()); + public static void showProgressSearching() { + eventBus.fireEvent(new ProgressShowEvent(i18n.t("Searching"))); } public static void veryImportant(final String message) { Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-12-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -102,7 +102,7 @@ public void doRegister() { signInProvider.get().hide(); if (!session.isLogged()) { - NotifyUser.showProgressProcessing(); + NotifyUser.showProgress(); getView().show(); // getView().center(); NotifyUser.hideProgress(); 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-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -98,7 +98,7 @@ @Override public void onSuccess(final Void result) { if (session.isLogged()) { - NotifyUser.showProgressProcessing(); + NotifyUser.showProgress(); getView().show(); getView().focusOnShorName(); NotifyUser.hideProgress(); Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/MultivalueSuggestBox.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/MultivalueSuggestBox.java 2011-12-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/MultivalueSuggestBox.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -42,6 +42,8 @@ import java.util.Map; import cc.kune.common.client.log.Log; +import cc.kune.common.client.notify.NotifyUser; +import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.shared.SearcherConstants; import com.google.gwt.event.dom.client.KeyUpEvent; @@ -309,7 +311,9 @@ if (totSize < 1) { // if there were no suggestions, then it's an invalid value updateFormFeedback(FormFeedback.ERROR, "Invalid: " + m_query); - + final OptionSuggestion sugg = new OptionSuggestion(i18n.t("No results"), "#", + m_request.getQuery(), m_query); + suggs.add(sugg); } else if (false && totSize == 1) { // Patch to show always the suggestions // it's an exact match, so do not bother with showing suggestions, @@ -420,7 +424,6 @@ if (query.length() > 0 && mvalueMap.get(query) == null) { // JSUtil.println("getting Suggestions for: " + query); updateFormFeedback(FormFeedback.LOADING, null); - queryOptions(query, mindexFrom, mindexTo, new RestSuggestCallback(mrequest, mcallback, query)); } } @@ -447,7 +450,7 @@ mtimer.schedule(DELAY); } } - private static final int DELAY = 1000; + private static final int DELAY = 500; private static final String DISPLAY_SEPARATOR = ", "; private static final int FIND_EXACT_MATCH_QUERY_LIMIT = 20; @@ -475,8 +478,10 @@ return str; } + private final I18nUITranslationService i18n; private final FormFeedback mfeedback; private final SuggestBox mfield; + private int mfindExactMatchesFound = 0; private final ArrayList<String> mfindExactMatchesNot = new ArrayList<String>(); @@ -488,8 +493,8 @@ private int mindexTo = 0; private boolean misMultivalued = false; + private final String mrestEndpointUrl; - private final String mrestEndpointUrl; private final Map<String, String> mvalueMap; // private final OnExactMatch onExactMatch; @@ -497,6 +502,8 @@ /** * Constructor. * + * @param i18n + * * @param the * URL for the REST endpoint. This URL should accept the parameters q * (for query), indexFrom and indexTo @@ -504,8 +511,9 @@ * - true for allowing multiple values * @param onExactMatch */ - public MultivalueSuggestBox(final String restEndpointUrl, final boolean isMultivalued, - final OnExactMatch onExactMatch) { + public MultivalueSuggestBox(final I18nUITranslationService i18n, final String restEndpointUrl, + final boolean isMultivalued, final OnExactMatch onExactMatch) { + this.i18n = i18n; mrestEndpointUrl = restEndpointUrl; misMultivalued = isMultivalued; // this.onExactMatch = onExactMatch; @@ -917,8 +925,15 @@ final TextBoxBase textBox = mfield.getTextBox(); if (FormFeedback.LOADING == status) { + NotifyUser.showProgressSearching(); // textBox.setEnabled(false); } else { + new Timer() { + @Override + public void run() { + NotifyUser.hideProgress(); + } + }.schedule(1500); // textBox.setEnabled(true); textBox.setFocus(false); // Blur then focus b/c of a strange problem with // the cursor or selection highlights no longer @@ -927,5 +942,4 @@ textBox.setFocus(true); } } - } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/SearchBoxFactory.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/SearchBoxFactory.java 2011-12-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SearchBoxFactory.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -33,6 +33,7 @@ public static MultivalueSuggestBox create(final I18nUITranslationService i18n, final boolean searchOnlyUsers, final String id, final OnEntitySelectedInSearch callback) { final MultivalueSuggestBox multivalueSBox = new MultivalueSuggestBox( + i18n, searchOnlyUsers ? SearcherConstants.USER_DATA_PROXY_URL : SearcherConstants.GROUP_DATA_PROXY_URL, false, new OnExactMatch() { Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java 2011-12-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -31,6 +31,7 @@ import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.ToggleButton; import com.google.gwt.user.client.ui.UIObject; @@ -154,6 +155,11 @@ } @Override + public void setWindowTitle(final String title) { + Window.setTitle(title); + } + + @Override public void showGroupSpaceTooltip() { groupSpaceTooltip.showTemporally(); } 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-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -86,6 +86,8 @@ void setUserBtnDown(boolean down); + void setWindowTitle(String title); + void showGroupSpaceTooltip(); void showHomeSpaceTooltip(); @@ -192,6 +194,7 @@ backManager.clearBackImage(); setDown(Space.homeSpace); currentSpace = Space.homeSpace; + getView().setWindowTitle(i18n.t("Home")); } private void onPublicSpaceSelect(final boolean shouldRestoreToken) { @@ -261,6 +264,7 @@ backManager.clearBackImage(); setDown(Space.userSpace); currentSpace = Space.userSpace; + getView().setWindowTitle(i18n.t("Inbox")); } else { signIn.get().setErrorMessage(i18n.t("Sign in or create an account to access to your inbox"), NotifyLevel.info); 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-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -36,36 +36,37 @@ import com.google.inject.Provider; public class AcceptJoinGroupAction extends AbstractExtendedAction { - private final I18nTranslationService i18n; - private final Session session; - private final Provider<SocialNetworkServiceAsync> snServiceProvider; + private final I18nTranslationService i18n; + private final Session session; + private final Provider<SocialNetworkServiceAsync> snServiceProvider; - private final StateManager stateManager; + private final StateManager stateManager; - @Inject - public AcceptJoinGroupAction(final StateManager stateManager, final Session session, - final I18nTranslationService i18n, final CoreResources res, - final Provider<SocialNetworkServiceAsync> snServiceProvider) { - this.stateManager = stateManager; - this.session = session; - this.i18n = i18n; - this.snServiceProvider = snServiceProvider; - putValue(NAME, i18n.t("Accept this member")); - putValue(Action.SMALL_ICON, res.accept()); - } + @Inject + public AcceptJoinGroupAction(final StateManager stateManager, final Session session, + final I18nTranslationService i18n, final CoreResources res, + final Provider<SocialNetworkServiceAsync> snServiceProvider) { + this.stateManager = stateManager; + this.session = session; + this.i18n = i18n; + this.snServiceProvider = snServiceProvider; + putValue(NAME, i18n.t("Accept this member")); + putValue(Action.SMALL_ICON, res.accept()); + } - @Override - public void actionPerformed(final ActionEvent event) { - NotifyUser.showProgressProcessing(); - snServiceProvider.get().acceptJoinGroup(session.getUserHash(), session.getCurrentState().getStateToken(), - ((GroupDTO) event.getTarget()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { - @Override - public void onSuccess(final SocialNetworkDataDTO result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Member accepted")); - stateManager.setSocialNetwork(result); - } - }); - } + @Override + public void actionPerformed(final ActionEvent event) { + NotifyUser.showProgress(); + snServiceProvider.get().acceptJoinGroup(session.getUserHash(), + session.getCurrentState().getStateToken(), ((GroupDTO) event.getTarget()).getShortName(), + new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override + public void onSuccess(final SocialNetworkDataDTO result) { + NotifyUser.hideProgress(); + NotifyUser.info(i18n.t("Member accepted")); + stateManager.setSocialNetwork(result); + } + }); + } } \ No newline at end of file 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-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -55,7 +55,7 @@ @Override public void actionPerformed(final ActionEvent event) { - NotifyUser.showProgressProcessing(); + NotifyUser.showProgress(); snServiceProvider.get().setCollabAsAdmin(session.getUserHash(), session.getCurrentState().getStateToken(), ((GroupDTO) event.getTarget()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { 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-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -36,35 +36,36 @@ import com.google.inject.Provider; public class ChangeToCollabAction extends AbstractExtendedAction { - private final I18nTranslationService i18n; - private final Session session; - private final Provider<SocialNetworkServiceAsync> snServiceProvider; - private final StateManager stateManager; + private final I18nTranslationService i18n; + private final Session session; + private final Provider<SocialNetworkServiceAsync> snServiceProvider; + private final StateManager stateManager; - @Inject - public ChangeToCollabAction(final StateManager stateManager, final Session session, - final I18nTranslationService i18n, final CoreResources res, - final Provider<SocialNetworkServiceAsync> snServiceProvider) { - this.stateManager = stateManager; - this.session = session; - this.i18n = i18n; - this.snServiceProvider = snServiceProvider; - putValue(NAME, i18n.t("Change to collaborator")); - putValue(Action.SMALL_ICON, res.arrowDownGreen()); - } + @Inject + public ChangeToCollabAction(final StateManager stateManager, final Session session, + final I18nTranslationService i18n, final CoreResources res, + final Provider<SocialNetworkServiceAsync> snServiceProvider) { + this.stateManager = stateManager; + this.session = session; + this.i18n = i18n; + this.snServiceProvider = snServiceProvider; + putValue(NAME, i18n.t("Change to collaborator")); + putValue(Action.SMALL_ICON, res.arrowDownGreen()); + } - @Override - public void actionPerformed(final ActionEvent event) { - NotifyUser.showProgressProcessing(); - snServiceProvider.get().setAdminAsCollab(session.getUserHash(), session.getCurrentState().getStateToken(), - ((GroupDTO) event.getTarget()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { - @Override - public void onSuccess(final SocialNetworkDataDTO result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Member type changed")); - stateManager.setSocialNetwork(result); - } - }); - } + @Override + public void actionPerformed(final ActionEvent event) { + NotifyUser.showProgress(); + snServiceProvider.get().setAdminAsCollab(session.getUserHash(), + session.getCurrentState().getStateToken(), ((GroupDTO) event.getTarget()).getShortName(), + new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override + public void onSuccess(final SocialNetworkDataDTO result) { + NotifyUser.hideProgress(); + NotifyUser.info(i18n.t("Member type changed")); + stateManager.setSocialNetwork(result); + } + }); + } } \ No newline at end of file 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-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -36,35 +36,36 @@ import com.google.inject.Provider; public class DenyJoinGroupAction extends AbstractExtendedAction { - private final I18nTranslationService i18n; - private final Session session; - private final Provider<SocialNetworkServiceAsync> snServiceProvider; - private final StateManager stateManager; + private final I18nTranslationService i18n; + private final Session session; + private final Provider<SocialNetworkServiceAsync> snServiceProvider; + private final StateManager stateManager; - @Inject - public DenyJoinGroupAction(final StateManager stateManager, final Session session, - final I18nTranslationService i18n, final CoreResources res, - final Provider<SocialNetworkServiceAsync> snServiceProvider) { - this.stateManager = stateManager; - this.session = session; - this.i18n = i18n; - this.snServiceProvider = snServiceProvider; - putValue(NAME, i18n.t("Reject as member")); - putValue(Action.SMALL_ICON, res.cancel()); - } + @Inject + public DenyJoinGroupAction(final StateManager stateManager, final Session session, + final I18nTranslationService i18n, final CoreResources res, + final Provider<SocialNetworkServiceAsync> snServiceProvider) { + this.stateManager = stateManager; + this.session = session; + this.i18n = i18n; + this.snServiceProvider = snServiceProvider; + putValue(NAME, i18n.t("Reject as member")); + putValue(Action.SMALL_ICON, res.cancel()); + } - @Override - public void actionPerformed(final ActionEvent event) { - NotifyUser.showProgressProcessing(); - snServiceProvider.get().denyJoinGroup(session.getUserHash(), session.getCurrentState().getStateToken(), - ((GroupDTO) event.getTarget()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { - @Override - public void onSuccess(final SocialNetworkDataDTO result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Member rejected")); - stateManager.setSocialNetwork(result); - } - }); - } + @Override + public void actionPerformed(final ActionEvent event) { + NotifyUser.showProgress(); + snServiceProvider.get().denyJoinGroup(session.getUserHash(), + session.getCurrentState().getStateToken(), ((GroupDTO) event.getTarget()).getShortName(), + new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override + public void onSuccess(final SocialNetworkDataDTO result) { + NotifyUser.hideProgress(); + NotifyUser.info(i18n.t("Member rejected")); + stateManager.setSocialNetwork(result); + } + }); + } } \ No newline at end of file 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-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -70,7 +70,7 @@ @Override public void onSuccess() { - NotifyUser.showProgressProcessing(); + NotifyUser.showProgress(); snServiceProvider.get().requestJoinGroup(session.getUserHash(), session.getCurrentState().getStateToken(), new AsyncCallbackSimple<SocialNetworkRequestResult>() { 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-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -36,35 +36,36 @@ import com.google.inject.Provider; public class RemoveMemberAction extends AbstractExtendedAction { - private final I18nTranslationService i18n; - private final Session session; - private final Provider<SocialNetworkServiceAsync> snServiceProvider; - private final StateManager stateManager; + private final I18nTranslationService i18n; + private final Session session; + private final Provider<SocialNetworkServiceAsync> snServiceProvider; + private final StateManager stateManager; - @Inject - public RemoveMemberAction(final StateManager stateManager, final Session session, - final I18nTranslationService i18n, final CoreResources res, - final Provider<SocialNetworkServiceAsync> snServiceProvider) { - this.stateManager = stateManager; - this.session = session; - this.i18n = i18n; - this.snServiceProvider = snServiceProvider; - putValue(NAME, i18n.t("Remove this member")); - putValue(Action.SMALL_ICON, res.del()); - } + @Inject + public RemoveMemberAction(final StateManager stateManager, final Session session, + final I18nTranslationService i18n, final CoreResources res, + final Provider<SocialNetworkServiceAsync> snServiceProvider) { + this.stateManager = stateManager; + this.session = session; + this.i18n = i18n; + this.snServiceProvider = snServiceProvider; + putValue(NAME, i18n.t("Remove this member")); + putValue(Action.SMALL_ICON, res.del()); + } - @Override - public void actionPerformed(final ActionEvent event) { - NotifyUser.showProgressProcessing(); - snServiceProvider.get().deleteMember(session.getUserHash(), session.getCurrentState().getStateToken(), - ((GroupDTO) event.getTarget()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { - @Override - public void onSuccess(final SocialNetworkDataDTO result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Member removed")); - stateManager.refreshCurrentStateWithoutCache(); - } - }); - } + @Override + public void actionPerformed(final ActionEvent event) { + NotifyUser.showProgress(); + snServiceProvider.get().deleteMember(session.getUserHash(), + session.getCurrentState().getStateToken(), ((GroupDTO) event.getTarget()).getShortName(), + new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override + public void onSuccess(final SocialNetworkDataDTO result) { + NotifyUser.hideProgress(); + NotifyUser.info(i18n.t("Member removed")); + stateManager.refreshCurrentStateWithoutCache(); + } + }); + } } \ No newline at end of file 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-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -56,7 +56,7 @@ new OnAcceptCallback() { @Override public void onSuccess() { - NotifyUser.showProgressProcessing(); + NotifyUser.showProgress(); snServiceProvider.get().unJoinGroup(session.getUserHash(), session.getCurrentState().getStateToken(), new AsyncCallbackSimple<Void>() { @Override 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-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -71,7 +71,7 @@ new OnAcceptCallback() { @Override public void onSuccess() { - NotifyUser.showProgressProcessing(); + NotifyUser.showProgress(); snServiceProvider.get().unJoinGroup(session.getUserHash(), ((GroupDTO) event.getTarget()).getStateToken(), new AsyncCallbackSimple<Void>() { @Override Modified: trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java 2011-12-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -30,7 +30,7 @@ public class StatsServiceDefault implements StatsService { - private static final int LIMIT = 6; + private static final int LIMIT = 20; // Before 6 private final ContentFinder contentFinder; private final GroupFinder groupFinder; private final UserFinder userFinder; 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-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -62,7 +62,7 @@ @Override public void actionPerformed(final ActionEvent event) { - NotifyUser.showProgressProcessing(); + NotifyUser.showProgress(); stateManager.gotoStateToken(((HasContent) session.getCurrentState()).getContainer().getStateToken()); final String newName = (String) getValue(NEW_NAME); final StateToken parentToken = session.getCurrentStateToken(); 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-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerMenuItem.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -68,7 +68,7 @@ @Override public void actionPerformed(final ActionEvent event) { - NotifyUser.showProgressProcessing(); + NotifyUser.showProgress(); stateManager.gotoStateToken(((HasContent) session.getCurrentState()).getContainer().getStateToken()); final String newName = (String) getValue(NEW_NAME); final StateToken parentToken = session.getCurrentStateToken(); 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-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContentAction.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -60,7 +60,7 @@ @Override public void actionPerformed(final ActionEvent event) { - NotifyUser.showProgressProcessing(); + NotifyUser.showProgress(); // stateManager.gotoStateToken(((HasContent) // session.getCurrentState()).getContainer().getStateToken()); final String newName = (String) getValue(NEW_NAME); 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-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/gspace/client/actions/ParticipateInContentBtn.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -56,7 +56,7 @@ @Override public void actionPerformed(final ActionEvent event) { - NotifyUser.showProgressProcessing(); + NotifyUser.showProgress(); contentService.get().addParticipant(session.getUserHash(), session.getCurrentStateToken(), session.getCurrentUser().getShortName(), new AsyncCallbackSimple<Void>() { @Override 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-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/gspace/client/actions/SetAsHomePageMenuItem.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -56,7 +56,7 @@ @Override public void actionPerformed(final ActionEvent event) { final StateToken token = ((AbstractContentSimpleDTO) event.getTarget()).getStateToken(); - NotifyUser.showProgressProcessing(); + NotifyUser.showProgress(); contentService.get().setAsDefaultContent(session.getUserHash(), token, new AsyncCallbackSimple<ContentSimpleDTO>() { @Override 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-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseChangeAction.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -53,7 +53,7 @@ public void changeLicense(final StateToken token, final LicenseDTO license, final SimpleResponseCallback callback) { - NotifyUser.showProgressProcessing(); + NotifyUser.showProgress(); groupService.get().changeDefLicense(session.getUserHash(), token, license, new AsyncCallbackSimple<Void>() { @Override Modified: trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeManager.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeManager.java 2011-12-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeManager.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -90,7 +90,7 @@ } public void changeTheme(final StateToken token, final GSpaceTheme newTheme) { - NotifyUser.showProgressProcessing(); + NotifyUser.showProgress(); groupServiceProvider.get().changeGroupWsTheme(session.getUserHash(), token, newTheme.getName(), new AsyncCallbackSimple<Void>() { @Override @@ -104,7 +104,7 @@ } protected void onChangeGroupWsTheme(final GSpaceTheme newTheme) { - NotifyUser.showProgressProcessing(); + NotifyUser.showProgress(); groupServiceProvider.get().changeGroupWsTheme(session.getUserHash(), session.getCurrentState().getStateToken(), newTheme.getName(), new AsyncCallbackSimple<Void>() { @Override 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-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -88,7 +88,7 @@ @Override public void onClick(final ClickEvent event) { if (diag.isValid()) { - NotifyUser.showProgressProcessing(); + NotifyUser.showProgress(); diag.hide(); listsService.get().createList(session.getUserHash(), session.getCurrentStateToken(), diag.getTextFieldValue(), ListsConstants.TYPE_LIST, true, 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-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -94,7 +94,7 @@ @Override public void onClick(final ClickEvent event) { if (diag.isValid()) { - NotifyUser.showProgressProcessing(); + NotifyUser.showProgress(); diag.hide(); listsService.get().newPost(session.getUserHash(), session.getCurrentStateToken().copy().clearDocument(), diag.getTextFieldValue(), Modified: trunk/src/main/java/cc/kune/msgs/client/UserMessageWidget.java =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/UserMessageWidget.java 2011-12-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/msgs/client/UserMessageWidget.java 2011-12-06 19:55:44 UTC (rev 1636) @@ -147,7 +147,7 @@ @Override public void appendMsg(final String message) { resetTimer(); - label.setHTML(sanitize(label.getHTML() + "" + message + "")); + label.setHTML(sanitize(label.getHTML() + "" + message + "")); } @Override Modified: trunk/src/main/java/cc/kune/msgs/public/kune-message.css =================================================================== --- trunk/src/main/java/cc/kune/msgs/public/kune-message.css 2011-12-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/java/cc/kune/msgs/public/kune-message.css 2011-12-06 19:55:44 UTC (rev 1636) @@ -29,6 +29,10 @@ top: 0px; } +.k-msg-topsep { + border-top: solid 1px wheat; +} + .k-msg-icon { padding: 10px 10px 5px; } Modified: trunk/src/main/webapp/ws.html =================================================================== --- trunk/src/main/webapp/ws.html 2011-12-06 02:42:39 UTC (rev 1635) +++ trunk/src/main/webapp/ws.html 2011-12-06 19:55:44 UTC (rev 1636) @@ -235,6 +235,9 @@ color: #8a5050; font-size: 16px; line-height: 1.5em; + height: 120px; + overflow-y: auto; + overflow-x: hidden; } .k-home-em-text {

1 0

r1635 - in trunk/src/main: java/cc/kune/chat/client java/cc/kune/chat/client/actions java/cc/kune/common/client/notify java/cc/kune/core/client/notify/msgs java/cc/kune/msgs/client webapp/others
by Vicente J. Ruiz Jurado 06 Dec '11

06 Dec '11

Author: vjrj_ Date: 2011-12-06 03:42:39 +0100 (Tue, 06 Dec 2011) New Revision: 1635 Modified: 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/actions/ChatSitebarActions.java trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierViewImpl.java trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifyEvent.java trunk/src/main/java/cc/kune/msgs/client/UserMessage.java trunk/src/main/java/cc/kune/msgs/client/UserMessageWidget.java trunk/src/main/java/cc/kune/msgs/client/UserMessageWidget.ui.xml trunk/src/main/webapp/others/kune-client-actions.xml Log: CLOSED - # 58: NotifyUser messages with title has a bad bottom margin http://kune.ourproject.org/issues/ticket/58 CLOSED - # 149: Improve the new chat notifications http://kune.ourproject.org/issues/ticket/149 Modified: trunk/src/main/java/cc/kune/chat/client/KuneChatNotifier.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/KuneChatNotifier.java 2011-12-06 01:42:07 UTC (rev 1634) +++ trunk/src/main/java/cc/kune/chat/client/KuneChatNotifier.java 2011-12-06 02:42:39 UTC (rev 1635) @@ -24,17 +24,23 @@ import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.hablar.signals.client.notifications.HablarNotifier; +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.gwt.regexp.shared.MatchResult; import com.google.gwt.regexp.shared.RegExp; public class KuneChatNotifier implements HablarNotifier { private final FileDownloadUtils downUtils; + private final EventBus eventBus; private final I18nTranslationService i18n; private final RegExp regExp; - public KuneChatNotifier(final I18nTranslationService i18n, final FileDownloadUtils downUtils) { + public KuneChatNotifier(final I18nTranslationService i18n, final FileDownloadUtils downUtils, + final EventBus eventBus) { this.i18n = i18n; this.downUtils = downUtils; + this.eventBus = eventBus; regExp = RegExp.compile("User (.*) says «(.*)»"); } @@ -55,7 +61,12 @@ final MatchResult m = regExp.exec(userMessage); final String user = m.getGroup(1); NotifyUser.avatar(downUtils.getUserAvatar(user), - i18n.t("User [%s] says «[%s]»", user, m.getGroup(2))); + i18n.t("User [%s] says «[%s]»", user, m.getGroup(2)), new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + ShowChatDialogEvent.fire(eventBus, true); + } + }); } else { NotifyUser.info(userMessage); } Modified: trunk/src/main/java/cc/kune/chat/client/KuneHablarSignals.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/KuneHablarSignals.java 2011-12-06 01:42:07 UTC (rev 1634) +++ trunk/src/main/java/cc/kune/chat/client/KuneHablarSignals.java 2011-12-06 02:42:39 UTC (rev 1635) @@ -99,7 +99,7 @@ // notificationManager.addNotifier((BrowserPopupHablarNotifier) // GWT.create(BrowserPopupHablarNotifier.class), // true); - notificationManager.addNotifier(new KuneChatNotifier(i18n, downUtils), true); + notificationManager.addNotifier(new KuneChatNotifier(i18n, downUtils, kuneEventBus), true); final SignalsPreferencesPresenter preferencesPage = new SignalsPreferencesPresenter(session, storageManager, hablarEventBus, preferences, new SignalsPreferencesWidget(), notificationManager); 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-06 01:42:07 UTC (rev 1634) +++ trunk/src/main/java/cc/kune/chat/client/actions/ChatSitebarActions.java 2011-12-06 02:42:39 UTC (rev 1635) @@ -74,6 +74,7 @@ session.logout(); } } + public class ChangeOnlineStatusAction extends AbstractExtendedAction { private final ImageResource icon; private final PresenceManager manager; @@ -104,6 +105,7 @@ } } } + private static final int AWAY_TIMER_MILLSECS = 60000; private static final String GROUP_CHAT_STATUS = "k-group-chat-status"; private static final String NO_STATUS = null; @@ -203,7 +205,7 @@ }.schedule(1000); } } else { - awayTimer.schedule(3000); + awayTimer.schedule(AWAY_TIMER_MILLSECS); } } }); 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-06 01:42:07 UTC (rev 1634) +++ trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java 2011-12-06 02:42:39 UTC (rev 1635) @@ -26,6 +26,7 @@ import cc.kune.core.client.notify.spiner.ProgressShowEvent; import cc.kune.core.shared.i18n.I18nTranslationService; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.shared.EventBus; import com.google.gwt.resources.client.ImageResource; @@ -44,8 +45,10 @@ askConfirmation(null, title, message, callback); } - public static void avatar(final String url, final String message) { - eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.avatar.url(url), message)); + public static void avatar(final String url, final String message, final ClickHandler clickHandler) { + final UserNotifyEvent event = new UserNotifyEvent(NotifyLevel.avatar.url(url), message); + event.setClickHandler(clickHandler); + eventBus.fireEvent(event); } public static void error(final String message) { 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-06 01:42:07 UTC (rev 1634) +++ trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierViewImpl.java 2011-12-06 02:42:39 UTC (rev 1635) @@ -26,6 +26,7 @@ import cc.kune.msgs.client.UserMessagesPanel; import cc.kune.msgs.client.UserMessagesPresenter; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.Widget; @@ -62,6 +63,10 @@ popup.setCenterPosition(); } }); + final ClickHandler clickHandler = event.getClickHandler(); + if (clickHandler != null) { + msg.addClickHandler(clickHandler); + } event.setCloser(new UserNotifyEvent.UserNotifyCloser() { @Override public void close() { Modified: 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-06 01:42:07 UTC (rev 1634) +++ trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifyEvent.java 2011-12-06 02:42:39 UTC (rev 1635) @@ -20,8 +20,8 @@ package cc.kune.core.client.notify.msgs; import cc.kune.common.client.notify.NotifyLevel; -import cc.kune.msgs.client.CloseCallback; +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; @@ -69,8 +69,8 @@ return TYPE; } + private ClickHandler clickHandler; private final Boolean closeable; - private CloseCallback closeCallback; private UserNotifyCloser closer; private java.lang.String id; private final NotifyLevel level; @@ -112,14 +112,14 @@ return TYPE; } + public ClickHandler getClickHandler() { + return clickHandler; + } + public Boolean getCloseable() { return closeable; } - public CloseCallback getCloseCallback() { - return closeCallback; - } - public UserNotifyCloser getCloser() { return closer; } @@ -140,8 +140,8 @@ return title; } - public void setCloseCallback(final CloseCallback closeCallback) { - this.closeCallback = closeCallback; + public void setClickHandler(final ClickHandler clickHandler) { + this.clickHandler = clickHandler; } public void setCloser(final UserNotifyCloser closer) { Modified: trunk/src/main/java/cc/kune/msgs/client/UserMessage.java =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/UserMessage.java 2011-12-06 01:42:07 UTC (rev 1634) +++ trunk/src/main/java/cc/kune/msgs/client/UserMessage.java 2011-12-06 02:42:39 UTC (rev 1635) @@ -1,7 +1,9 @@ package cc.kune.msgs.client; -public interface UserMessage { +import com.google.gwt.event.dom.client.HasClickHandlers; +public interface UserMessage extends HasClickHandlers { + void appendMsg(String message); void close(); Modified: trunk/src/main/java/cc/kune/msgs/client/UserMessageWidget.java =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/UserMessageWidget.java 2011-12-06 01:42:07 UTC (rev 1634) +++ trunk/src/main/java/cc/kune/msgs/client/UserMessageWidget.java 2011-12-06 02:42:39 UTC (rev 1635) @@ -30,6 +30,8 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.safehtml.client.SafeHtmlTemplates; import com.google.gwt.safehtml.shared.SafeHtml; import com.google.gwt.safehtml.shared.SafeHtmlUtils; @@ -40,6 +42,7 @@ import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.HasText; +import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.InlineHTML; import com.google.gwt.user.client.ui.PushButton; @@ -67,6 +70,7 @@ private static int fadeMills = 5000; private static final MsgTemplate MSG_NO_TITLE = GWT.create(MsgTemplate.class); + private static final MsgWithTitleTemplate MSG_WITH_TITLE = GWT.create(MsgWithTitleTemplate.class); private static UserMessageWidgetUiBinder uiBinder = GWT.create(UserMessageWidgetUiBinder.class); @@ -89,6 +93,9 @@ @UiField InlineHTML label; + @UiField + HorizontalPanel panel; + private Timer time; public UserMessageWidget(final NotifyLevel level, final String title, final String message, @@ -132,6 +139,12 @@ } @Override + public HandlerRegistration addClickHandler(final ClickHandler handler) { + panel.addStyleName("k-pointer"); + return addDomHandler(handler, ClickEvent.getType()); + } + + @Override public void appendMsg(final String message) { resetTimer(); label.setHTML(sanitize(label.getHTML() + "" + message + "")); Modified: trunk/src/main/java/cc/kune/msgs/client/UserMessageWidget.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/UserMessageWidget.ui.xml 2011-12-06 01:42:07 UTC (rev 1634) +++ trunk/src/main/java/cc/kune/msgs/client/UserMessageWidget.ui.xml 2011-12-06 02:42:39 UTC (rev 1635) @@ -17,7 +17,7 @@ </ui:style> <ui:with field='img' type='cc.kune.msgs.client.resources.UserMessageImages'/> - <g:HorizontalPanel verticalAlignment="ALIGN_MIDDLE" + <g:HorizontalPanel ui:field="panel" verticalAlignment="ALIGN_MIDDLE" addStyleNames="k-msg, k-3corners, {style.k-msg-width}"> <g:SimplePanel addStyleNames="k-msg-icon"> <g:Image width="100%" ui:field="icon" height="100%"/> Modified: trunk/src/main/webapp/others/kune-client-actions.xml =================================================================== --- trunk/src/main/webapp/others/kune-client-actions.xml 2011-12-06 01:42:07 UTC (rev 1634) +++ trunk/src/main/webapp/others/kune-client-actions.xml 2011-12-06 02:42:39 UTC (rev 1635) @@ -5,6 +5,18 @@  <waveExtensions> + + <extension> + <name>WavePlan</name> + <installerUrl>http://sh1.sg.securlogic.com/wave/waveplan/manifest.xml + </installerUrl> + <gadgetUrl>http://sh1.sg.securlogic.com/wave/waveplan/waveplan.xml + </gadgetUrl> + <iconUrl>http://sh1.sg.securlogic.com/wave/waveplan/waveplan.png + </iconUrl> + <iconCss></iconCss> + </extension> + <extension> <name>Image</name> <installerUrl>http://everybodywave.appspot.com/gadget/image/xt.xml @@ -411,6 +423,40 @@ <participants>ask</participants> </guiActionDescriptor> + + <guiActionDescriptor> + <type>wave-gadget</type> + <extensionName>WavePlan</extensionName> + <name>New meet planer</name> + <path>New Gadget»Calendar</path> + <description>This gadget helps you to coordinate multi-participant schedules and make decisions in an intuitive manner. + </description> + <new-content-title>New meet planner</new-content-title> + <new-content-textintro></new-content-textintro> + <enabled>true</enabled> + <typeIds> + <typeId origTypeId="docs.folder" destTypeId="docs.doc"/> + <typeId origTypeId="docs.root" destTypeId="docs.doc"/> + <typeId origTypeId="blogs.blog" destTypeId="blogs.post"/> + <typeId origTypeId="lists.list" destTypeId="lists.post"/> +  + <typeId origTypeId="docs.doc" destTypeId="docs.doc"/> + <typeId origTypeId="blogs.post" destTypeId="blogs.post"/> + <typeId origTypeId="lists.post" destTypeId="lists.post"/> + <typeId origTypeId="wiki.wikipage" destTypeId="wiki.wikipage"/> + <typeId origTypeId="tasks.task" destTypeId="tasks.task"/> + </typeIds> + <rol> +  + <rolRequired>Editor</rolRequired> + <authNeed>true</authNeed> + </rol> +  + <participants>ask</participants> + </guiActionDescriptor> + +  <guiActionDescriptor>

1 0

r1634 - in trunk/src: main/java/cc/kune/chat/client main/java/cc/kune/common/client/notify main/java/cc/kune/core/client/auth main/java/cc/kune/core/client/notify/msgs main/java/cc/kune/msgs main/java/cc/kune/msgs/client test/java/cc/kune test/java/cc/kune/msgs test/java/cc/kune/msgs/client
by Vicente J. Ruiz Jurado 06 Dec '11

06 Dec '11

Author: vjrj_ Date: 2011-12-06 02:42:07 +0100 (Tue, 06 Dec 2011) New Revision: 1634 Added: trunk/src/main/java/cc/kune/msgs/client/UserMessageWidget.java trunk/src/main/java/cc/kune/msgs/client/UserMessageWidget.ui.xml trunk/src/test/java/cc/kune/msgs/ trunk/src/test/java/cc/kune/msgs/client/ trunk/src/test/java/cc/kune/msgs/client/UserMessagesPresenterTest.java Removed: trunk/src/main/java/cc/kune/msgs/client/UserMessage.ui.xml Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.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/common/client/notify/NotifyLevel.java trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java trunk/src/main/java/cc/kune/core/client/auth/AnonUsersManager.java trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierViewImpl.java trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifyEvent.java trunk/src/main/java/cc/kune/msgs/KuneMsgs.gwt.xml trunk/src/main/java/cc/kune/msgs/client/UserMessage.java trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java trunk/src/main/java/cc/kune/msgs/client/UserMessagesPresenter.java Log: CLOSED - # 98: When using NotifyUser.info/etc messages of the same level must be show together http://kune.ourproject.org/issues/ticket/98 CLOSED - # 97: Allow NotifyUser with images (useful for chat notifications) http://kune.ourproject.org/issues/ticket/97 CLOSED - # 168: "You did not sign in" box remains after I've registered http://kune.ourproject.org/issues/ticket/168 Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-12-05 20:42:43 UTC (rev 1633) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-12-06 01:42:07 UTC (rev 1634) @@ -44,6 +44,7 @@ import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.init.AppStopEvent; import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.sitebar.SitebarActions; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.UserSignInEvent; @@ -132,6 +133,7 @@ private final ChatOptions chatOptions; private final ChatResources chatResources; private Dialog dialog; + private final FileDownloadUtils downUtils; private final I18nTranslationService i18n; private final EventBus kuneEventBus; private final CoreResources res; @@ -141,16 +143,18 @@ private final GlobalShortcutRegister shorcutRegister; private final SitebarActions siteActions; private final SubscriptionManager subscriptionManager; + private final XmppSession xmppSession; @Inject public ChatClientDefault(final EventBus kuneEventBus, final I18nTranslationService i18n, final SitebarActions siteActions, final Session session, final CoreResources res, - final GlobalShortcutRegister shorcutRegister, final ChatOptions chatOptions, - final ChatResources chatResources, final ChatInstances chatInstances) { + final FileDownloadUtils downUtils, final GlobalShortcutRegister shorcutRegister, + final ChatOptions chatOptions, final ChatResources chatResources, final ChatInstances chatInstances) { this.kuneEventBus = kuneEventBus; this.i18n = i18n; this.res = res; + this.downUtils = downUtils; this.chatInstances = chatInstances; action = new ChatClientAction(chatResources); this.siteActions = siteActions; @@ -322,7 +326,7 @@ final KuneHablarWidget widget = new KuneHablarWidget(config.layout, config.tabHeaderSize); final Hablar hablar = widget.getHablar(); HablarComplete.install(hablar, config); - new KuneHablarSignals(kuneEventBus, xmppSession, hablar, action, chatInstances); + new KuneHablarSignals(kuneEventBus, xmppSession, hablar, action, chatInstances, i18n, downUtils); if (htmlConfig.hasLogger) { new HablarConsole(hablar); } Modified: trunk/src/main/java/cc/kune/chat/client/KuneChatNotifier.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/KuneChatNotifier.java 2011-12-05 20:42:43 UTC (rev 1633) +++ trunk/src/main/java/cc/kune/chat/client/KuneChatNotifier.java 2011-12-06 01:42:07 UTC (rev 1634) @@ -20,24 +20,45 @@ package cc.kune.chat.client; import cc.kune.common.client.notify.NotifyUser; +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.regexp.shared.MatchResult; +import com.google.gwt.regexp.shared.RegExp; public class KuneChatNotifier implements HablarNotifier { + private final FileDownloadUtils downUtils; + private final I18nTranslationService i18n; + private final RegExp regExp; - @Override - public String getDisplayName() { - return "Bottom notifier"; - } + public KuneChatNotifier(final I18nTranslationService i18n, final FileDownloadUtils downUtils) { + this.i18n = i18n; + this.downUtils = downUtils; + regExp = RegExp.compile("User (.*) says «(.*)»"); + } - @Override - public String getId() { - return "kuneChatNotifier"; - } + @Override + public String getDisplayName() { + return "Bottom notifier"; + } - @Override - public void show(final String userMessage, final String messageType) { - NotifyUser.info(userMessage); + @Override + public String getId() { + return "kuneChatNotifier"; + } + + @Override + public void show(final String userMessage, final String messageType) { + // FIXME Dirty hack while emite/hablar lib don't provide user info + if (regExp.test(userMessage)) { + final MatchResult m = regExp.exec(userMessage); + final String user = m.getGroup(1); + NotifyUser.avatar(downUtils.getUserAvatar(user), + i18n.t("User [%s] says «[%s]»", user, m.getGroup(2))); + } else { + NotifyUser.info(userMessage); } + } } Modified: trunk/src/main/java/cc/kune/chat/client/KuneHablarSignals.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/KuneHablarSignals.java 2011-12-05 20:42:43 UTC (rev 1633) +++ trunk/src/main/java/cc/kune/chat/client/KuneHablarSignals.java 2011-12-06 01:42:07 UTC (rev 1634) @@ -20,6 +20,8 @@ package cc.kune.chat.client; import cc.kune.chat.client.ChatClientDefault.ChatClientAction; +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; @@ -34,7 +36,6 @@ import com.calclab.hablar.signals.client.unattended.UnattendedPagesManager; import com.calclab.hablar.signals.client.unattended.UnattendedPresenter; import com.calclab.hablar.user.client.UserContainer; -import com.google.gwt.core.client.GWT; import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.HasText; @@ -70,7 +71,8 @@ // FIXME: move to gin @SuppressWarnings("deprecation") public KuneHablarSignals(final EventBus kuneEventBus, final XmppSession session, final Hablar hablar, - final ChatClientAction action, final ChatInstances chatInstances) { + final ChatClientAction action, final ChatInstances chatInstances, + final I18nTranslationService i18n, final FileDownloadUtils downUtils) { final HablarEventBus hablarEventBus = hablar.getEventBus(); final PrivateStorageManager storageManager = chatInstances.privateStorageManager; @@ -97,11 +99,10 @@ // notificationManager.addNotifier((BrowserPopupHablarNotifier) // GWT.create(BrowserPopupHablarNotifier.class), // true); - notificationManager.addNotifier((KuneChatNotifier) GWT.create(KuneChatNotifier.class), true); + notificationManager.addNotifier(new KuneChatNotifier(i18n, downUtils), true); final SignalsPreferencesPresenter preferencesPage = new SignalsPreferencesPresenter(session, storageManager, hablarEventBus, preferences, new SignalsPreferencesWidget(), notificationManager); hablar.addPage(preferencesPage, UserContainer.ROL); } - } Modified: trunk/src/main/java/cc/kune/common/client/notify/NotifyLevel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/notify/NotifyLevel.java 2011-12-05 20:42:43 UTC (rev 1633) +++ trunk/src/main/java/cc/kune/common/client/notify/NotifyLevel.java 2011-12-06 01:42:07 UTC (rev 1634) @@ -20,5 +20,24 @@ package cc.kune.common.client.notify; public enum NotifyLevel { - error, important, info, log, veryImportant + avatar, error, important, info, log, veryImportant; + + private String url; + + NotifyLevel() { + this(null); + } + + NotifyLevel(final String url) { + this.url = url; + } + + public String getUrl() { + return url; + } + + public NotifyLevel url(final String url) { + this.url = url; + return this; + } } 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-05 20:42:43 UTC (rev 1633) +++ trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java 2011-12-06 01:42:07 UTC (rev 1634) @@ -44,6 +44,10 @@ askConfirmation(null, title, message, callback); } + public static void avatar(final String url, final String message) { + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.avatar.url(url), message)); + } + public static void error(final String message) { eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, message)); } 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-05 20:42:43 UTC (rev 1633) +++ trunk/src/main/java/cc/kune/core/client/auth/AnonUsersManager.java 2011-12-06 01:42:07 UTC (rev 1634) @@ -19,26 +19,29 @@ */ package cc.kune.core.client.auth; -import cc.kune.common.client.notify.NotifyUser; +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; import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; +import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; public class AnonUsersManager { public static final String ANON_MESSAGE_CLOSE_ICON = "k-anon-um-close-btn"; + protected UserNotifyEvent notifyMsg; @Inject public AnonUsersManager(final Session session, final CookiesManager cookiesManager, - final I18nUITranslationService i18n) { + final I18nUITranslationService i18n, final EventBus eventBus) { session.onAppStart(true, new AppStartHandler() { @Override public void onAppStart(final AppStartEvent event) { @@ -52,13 +55,16 @@ final String signin = TextUtils.generateHtmlLink("#" + SiteTokens.SIGNIN, i18n.tWithNT("sign in", "register, in lowercase"), false); final String siteCommonName = i18n.getSiteCommonName(); - NotifyUser.info( + notifyMsg = UserNotifyEvent.fire( + eventBus, + NotifyLevel.info, "", i18n.tWithNT( "You did not sign-in, so you can just see some public contents in [%s], " + "but not edit or collaborate with others. Please [%s] or [%s] in order to get full access to [%s] tools and contents", "This will be something like 'Please register or sign in in other to get full access to this site tools', but instead of %s some links", - siteCommonName, register, signin, siteCommonName), ANON_MESSAGE_CLOSE_ICON, true); + siteCommonName, register, signin, siteCommonName), Boolean.TRUE); + notifyMsg.setId(ANON_MESSAGE_CLOSE_ICON); } else { if (Boolean.valueOf(anonCookie)) { // Registered already: we set the cookie for some big period again @@ -74,6 +80,10 @@ @Override public void onUserSignIn(final UserSignInEvent event) { cookiesManager.setAnonCookie(true); + if (notifyMsg != null) { + // Isue #168, after register/sign-in the message not remains visible + notifyMsg.getCloser().close(); + } } }); } 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-05 20:42:43 UTC (rev 1633) +++ trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierViewImpl.java 2011-12-06 01:42:07 UTC (rev 1634) @@ -22,6 +22,7 @@ import cc.kune.common.client.ui.PopupBottomPanel; import cc.kune.core.client.notify.msgs.UserNotifierPresenter.UserNotifierView; import cc.kune.msgs.client.CloseCallback; +import cc.kune.msgs.client.UserMessage; import cc.kune.msgs.client.UserMessagesPanel; import cc.kune.msgs.client.UserMessagesPresenter; @@ -32,36 +33,45 @@ import com.gwtplatform.mvp.client.PopupViewImpl; public class UserNotifierViewImpl extends PopupViewImpl implements UserNotifierView { - private final UserMessagesPresenter msgs; - private final PopupBottomPanel popup; + private final UserMessagesPresenter msgs; + private final PopupBottomPanel popup; - @Inject - public UserNotifierViewImpl(final EventBus eventBus, final UserMessagesPresenter msgs, final UserMessagesPanel panel) { - super(eventBus); - this.msgs = msgs; - msgs.init(panel); - panel.setWidth("370px"); - popup = new PopupBottomPanel(false, false); - popup.add(panel); - popup.show(); - } + @Inject + public UserNotifierViewImpl(final EventBus eventBus, final UserMessagesPresenter msgs, + final UserMessagesPanel panel) { + super(eventBus); + this.msgs = msgs; + msgs.init(panel); + panel.setWidth("370px"); + popup = new PopupBottomPanel(false, false); + popup.add(panel); + popup.show(); + } - @Override - public Widget asWidget() { - return popup; - } + @Override + public Widget asWidget() { + return popup; + } - @Override - public void notify(final UserNotifyEvent event) { - msgs.add(event.getLevel(), event.getTitle(), event.getMessage(), event.getId(), event.getCloseable(), - new CloseCallback() { - @Override - public void onClose() { - popup.setCenterPosition(); - } - }); - popup.setCenterPosition(); - DOM.setStyleAttribute(popup.getElement(), "zIndex", "100000"); - } + @Override + public void notify(final UserNotifyEvent event) { + final UserMessage msg = msgs.add(event.getLevel(), event.getTitle(), event.getMessage(), + event.getId(), event.getCloseable(), new CloseCallback() { + @Override + public void onClose() { + popup.setCenterPosition(); + } + }); + event.setCloser(new UserNotifyEvent.UserNotifyCloser() { + @Override + public void close() { + if (msg.isAttached()) { + msg.close(); + } + } + }); + popup.setCenterPosition(); + DOM.setStyleAttribute(popup.getElement(), "zIndex", "100000"); + } } Modified: 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-05 20:42:43 UTC (rev 1633) +++ trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifyEvent.java 2011-12-06 01:42:07 UTC (rev 1634) @@ -20,6 +20,7 @@ package cc.kune.core.client.notify.msgs; import cc.kune.common.client.notify.NotifyLevel; +import cc.kune.msgs.client.CloseCallback; import com.google.gwt.event.shared.EventHandler; import com.google.gwt.event.shared.GwtEvent; @@ -28,101 +29,127 @@ public class UserNotifyEvent extends GwtEvent<UserNotifyEvent.UserNotifyHandler> { - public interface HasUserNotifyHandlers extends HasHandlers { - HandlerRegistration addUserNotifyHandler(UserNotifyHandler handler); - } + public interface HasUserNotifyHandlers extends HasHandlers { + HandlerRegistration addUserNotifyHandler(UserNotifyHandler handler); + } - public interface UserNotifyHandler extends EventHandler { - public void onUserNotify(UserNotifyEvent event); - } + public interface UserNotifyCloser { + public void close(); + } - private static final Type<UserNotifyHandler> TYPE = new Type<UserNotifyHandler>(); + public interface UserNotifyHandler extends EventHandler { + public void onUserNotify(UserNotifyEvent event); + } - public static void fire(final HasHandlers source, final NotifyLevel level, final java.lang.String message) { - source.fireEvent(new UserNotifyEvent(level, "", message)); - } + private static final Type<UserNotifyHandler> TYPE = new Type<UserNotifyHandler>(); - 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 message) { + source.fireEvent(new UserNotifyEvent(level, "", message)); + } - 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 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, final Boolean closeable) { - source.fireEvent(new UserNotifyEvent(level, title, 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 Type<UserNotifyHandler> getType() { - return TYPE; - } + 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; + } - private final Boolean closeable; - private java.lang.String id; - private final NotifyLevel level; - private final java.lang.String message; - private final java.lang.String title; + public static Type<UserNotifyHandler> getType() { + return TYPE; + } - public UserNotifyEvent(final NotifyLevel level, final java.lang.String message) { - this(level, "", message, false); - } + private final Boolean closeable; + private CloseCallback closeCallback; + 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, final Boolean closeable) { - this(level, "", message, closeable); - } + public UserNotifyEvent(final NotifyLevel level, final java.lang.String message) { + this(level, "", message, false); + } - 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 message, final Boolean closeable) { + this(level, "", message, closeable); + } - 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 NotifyLevel level, final java.lang.String title, + final java.lang.String message) { + this(level, title, message, false); + } - public UserNotifyEvent(final String message) { - this(NotifyLevel.info, message); - } + 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; + } - @Override - protected void dispatch(final UserNotifyHandler handler) { - handler.onUserNotify(this); - } + public UserNotifyEvent(final String message) { + this(NotifyLevel.info, message); + } - @Override - public Type<UserNotifyHandler> getAssociatedType() { - return TYPE; - } + @Override + protected void dispatch(final UserNotifyHandler handler) { + handler.onUserNotify(this); + } - public Boolean getCloseable() { - return closeable; - } + @Override + public Type<UserNotifyHandler> getAssociatedType() { + return TYPE; + } - public java.lang.String getId() { - return id; - } + public Boolean getCloseable() { + return closeable; + } - public NotifyLevel getLevel() { - return level; - } + public CloseCallback getCloseCallback() { + return closeCallback; + } - public java.lang.String getMessage() { - return message; - } + public UserNotifyCloser getCloser() { + return closer; + } - public java.lang.String getTitle() { - return title; - } + public java.lang.String getId() { + return id; + } - public void setId(final String id) { - this.id = id; - } + public NotifyLevel getLevel() { + return level; + } + public java.lang.String getMessage() { + return message; + } + + public java.lang.String getTitle() { + return title; + } + + public void setCloseCallback(final CloseCallback closeCallback) { + this.closeCallback = closeCallback; + } + + 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/msgs/KuneMsgs.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/msgs/KuneMsgs.gwt.xml 2011-12-05 20:42:43 UTC (rev 1633) +++ trunk/src/main/java/cc/kune/msgs/KuneMsgs.gwt.xml 2011-12-06 01:42:07 UTC (rev 1634) @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <module>  - <inherits name='com.google.gwt.user.User' /> - <inherits name="org.adamtacy.GWTEffects" /> - <inherits name="cc.kune.common.KuneCommon" /> + <inherits name='com.google.gwt.user.User'/> + <inherits name="org.adamtacy.GWTEffects"/> + <inherits name="cc.kune.common.KuneCommon"/>     - <source path='client' /> - <public path="public" /> + <source path='client' + excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java"/> + <public path="public"/> </module> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/msgs/client/UserMessage.java =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/UserMessage.java 2011-12-05 20:42:43 UTC (rev 1633) +++ trunk/src/main/java/cc/kune/msgs/client/UserMessage.java 2011-12-06 01:42:07 UTC (rev 1634) @@ -1,168 +1,10 @@ -/* - * - * 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.msgs.client; -import org.adamtacy.client.ui.effects.events.EffectCompletedEvent; -import org.adamtacy.client.ui.effects.events.EffectCompletedHandler; -import org.adamtacy.client.ui.effects.examples.Fade; -import org.adamtacy.client.ui.effects.examples.Show; +public interface UserMessage { -import cc.kune.common.client.notify.NotifyLevel; -import cc.kune.common.client.utils.TextUtils; -import cc.kune.msgs.client.resources.UserMessageImagesUtil; + void appendMsg(String message); -import com.google.gwt.core.client.GWT; -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.safehtml.client.SafeHtmlTemplates; -import com.google.gwt.safehtml.shared.SafeHtml; -import com.google.gwt.safehtml.shared.SafeHtmlUtils; -import com.google.gwt.safehtml.shared.SimpleHtmlSanitizer; -import com.google.gwt.uibinder.client.UiBinder; -import com.google.gwt.uibinder.client.UiField; -import com.google.gwt.uibinder.client.UiHandler; -import com.google.gwt.user.client.Timer; -import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.HasText; -import com.google.gwt.user.client.ui.Image; -import com.google.gwt.user.client.ui.InlineHTML; -import com.google.gwt.user.client.ui.PushButton; -import com.google.gwt.user.client.ui.Widget; + void close(); -public class UserMessage extends Composite implements HasText { - - interface MessageUiBinder extends UiBinder<Widget, UserMessage> { - } - - public interface MsgTemplate extends SafeHtmlTemplates { - @Template("{0}") - SafeHtml format(SafeHtml message); - } - - public interface MsgWithTitleTemplate extends SafeHtmlTemplates { - @Template("{0}{1}") - SafeHtml format(SafeHtml title, SafeHtml message); - } - - private static String closeTitle = "Close"; - - private static int fadeMills = 5000; - - private static final MsgTemplate MSG_NO_TITLE = GWT.create(MsgTemplate.class); - private static final MsgWithTitleTemplate MSG_WITH_TITLE = GWT.create(MsgWithTitleTemplate.class); - - private static MessageUiBinder uiBinder = GWT.create(MessageUiBinder.class); - - public static void setCloseTitle(final String title) { - closeTitle = title; - } - - public static void setFadeMills(final int mills) { - fadeMills = mills; - } - - @UiField - PushButton close; - - private final CloseCallback closeCallback; - - @UiField - Image icon; - - @UiField - InlineHTML label; - - public UserMessage(final NotifyLevel level, final String title, final String message, final String id, - final boolean closeable, final CloseCallback closeCallback) { - this.closeCallback = closeCallback; - initWidget(uiBinder.createAndBindUi(this)); - if (TextUtils.notEmpty(id)) { - close.ensureDebugId(id); - } - if (TextUtils.notEmpty(message)) { - if (TextUtils.notEmpty(title)) { - label.setHTML(MSG_WITH_TITLE.format(SimpleHtmlSanitizer.sanitizeHtml(title), sanitize(message))); - } else { - label.setHTML(MSG_NO_TITLE.format(sanitize(message))); - } - close.setVisible(closeable); - close.setTitle(closeTitle); - if (!closeable) { - final Timer time = new Timer() { - @Override - public void run() { - close(); - } - }; - time.schedule(fadeMills); - } - icon.setResource(UserMessageImagesUtil.getIcon(level)); - final Show anim = new Show(this.getElement()); - anim.setDuration(0.5); - anim.play(); - } - } - - public UserMessage(final String message, final CloseCallback closeCallback) { - this("", message, false, closeCallback); - } - - public UserMessage(final String title, final String message, final boolean closeable, - final CloseCallback closeCallback) { - this(NotifyLevel.info, title, message, "", closeable, closeCallback); - } - - public UserMessage(final String title, final String message, final CloseCallback closeCallback) { - this(title, message, false, closeCallback); - } - - private void close() { - final Fade fade = new Fade(this.getElement()); - fade.setDuration(0.7); - fade.play(); - fade.addEffectCompletedHandler(new EffectCompletedHandler() { - - @Override - public void onEffectCompleted(final EffectCompletedEvent event) { - removeFromParent(); - closeCallback.onClose(); - } - }); - } - - @Override - public String getText() { - return label.getText(); - } - - @UiHandler("close") - void handleClick(final ClickEvent e) { - close(); - } - - private SafeHtml sanitize(final String message) { - return SafeHtmlUtils.fromTrustedString(message); - } - - @Override - public void setText(final String text) { - label.setText(text); - } - + boolean isAttached(); } Deleted: trunk/src/main/java/cc/kune/msgs/client/UserMessage.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/UserMessage.ui.xml 2011-12-05 20:42:43 UTC (rev 1633) +++ trunk/src/main/java/cc/kune/msgs/client/UserMessage.ui.xml 2011-12-06 01:42:07 UTC (rev 1634) @@ -1,36 +0,0 @@ -<!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:style> - @if user.agent safari { - .k-msg-width { - width: 0px; - } - } - - @else { - .k-msg-width { - width: auto; - } - } - </ui:style> - <ui:with field='img' - type='cc.kune.msgs.client.resources.UserMessageImages'/> - <g:HorizontalPanel verticalAlignment="ALIGN_MIDDLE" - height="42px" addStyleNames="k-msg, k-3corners, {style.k-msg-width}"> - <g:SimplePanel addStyleNames="k-msg-icon"> - <g:Image width="100%" ui:field="icon" height="100%"/> - </g:SimplePanel> - <g:Cell width="100%"> - <g:InlineHTML ui:field="label" width="100%" - styleName="k-msg-label"/> - </g:Cell> - <g:PushButton ui:field="close" styleName="k-msg-close" - width="22px"> - <g:upFace image='{img.remove}'/> - <g:downFace image='{img.removeOver}'/> - <g:upHoveringFace image='{img.removeGrey}'/> - </g:PushButton> - </g:HorizontalPanel> -</ui:UiBinder> Copied: trunk/src/main/java/cc/kune/msgs/client/UserMessageWidget.java (from rev 1630, trunk/src/main/java/cc/kune/msgs/client/UserMessage.java) =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/UserMessageWidget.java (rev 0) +++ trunk/src/main/java/cc/kune/msgs/client/UserMessageWidget.java 2011-12-06 01:42:07 UTC (rev 1634) @@ -0,0 +1,198 @@ +/* + * + * 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.msgs.client; + +import org.adamtacy.client.ui.effects.events.EffectCompletedEvent; +import org.adamtacy.client.ui.effects.events.EffectCompletedHandler; +import org.adamtacy.client.ui.effects.examples.Fade; +import org.adamtacy.client.ui.effects.examples.Show; + +import cc.kune.common.client.notify.NotifyLevel; +import cc.kune.common.client.utils.TextUtils; +import cc.kune.msgs.client.resources.UserMessageImagesUtil; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.safehtml.client.SafeHtmlTemplates; +import com.google.gwt.safehtml.shared.SafeHtml; +import com.google.gwt.safehtml.shared.SafeHtmlUtils; +import com.google.gwt.safehtml.shared.SimpleHtmlSanitizer; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.uibinder.client.UiHandler; +import com.google.gwt.user.client.Timer; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.HasText; +import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.InlineHTML; +import com.google.gwt.user.client.ui.PushButton; +import com.google.gwt.user.client.ui.Widget; + +public class UserMessageWidget extends Composite implements HasText, UserMessage { + + public interface MsgTemplate extends SafeHtmlTemplates { + @Template("{0}") + SafeHtml format(SafeHtml message); + } + + public interface MsgWithTitleTemplate extends SafeHtmlTemplates { + @Template("{0}{1}") + SafeHtml format(SafeHtml title, SafeHtml message); + } + + interface UserMessageWidgetUiBinder extends UiBinder<Widget, UserMessageWidget> { + } + + private static final String AVATAR_SIZE = "40px"; + + private static String closeTitle = "Close"; + + private static int fadeMills = 5000; + + private static final MsgTemplate MSG_NO_TITLE = GWT.create(MsgTemplate.class); + private static final MsgWithTitleTemplate MSG_WITH_TITLE = GWT.create(MsgWithTitleTemplate.class); + private static UserMessageWidgetUiBinder uiBinder = GWT.create(UserMessageWidgetUiBinder.class); + + public static void setCloseTitle(final String title) { + closeTitle = title; + } + + public static void setFadeMills(final int mills) { + fadeMills = mills; + } + + @UiField + PushButton close; + + private final CloseCallback closeCallback; + + @UiField + Image icon; + + @UiField + InlineHTML label; + + private Timer time; + + public UserMessageWidget(final NotifyLevel level, final String title, final String message, + final String id, final boolean closeable, final CloseCallback closeCallback) { + this.closeCallback = closeCallback; + initWidget(uiBinder.createAndBindUi(this)); + if (TextUtils.notEmpty(id)) { + close.ensureDebugId(id); + } + if (TextUtils.notEmpty(message)) { + setMsg(title, message); + close.setVisible(closeable); + close.setTitle(closeTitle); + if (!closeable) { + time = new Timer() { + @Override + public void run() { + close(); + } + }; + time.schedule(fadeMills); + } + setIcon(level); + final Show anim = new Show(this.getElement()); + anim.setDuration(0.5); + anim.play(); + } + } + + public UserMessageWidget(final String message, final CloseCallback closeCallback) { + this("", message, false, closeCallback); + } + + public UserMessageWidget(final String title, final String message, final boolean closeable, + final CloseCallback closeCallback) { + this(NotifyLevel.info, title, message, "", closeable, closeCallback); + } + + public UserMessageWidget(final String title, final String message, final CloseCallback closeCallback) { + this(title, message, false, closeCallback); + } + + @Override + public void appendMsg(final String message) { + resetTimer(); + label.setHTML(sanitize(label.getHTML() + "" + message + "")); + } + + @Override + public void close() { + final Fade fade = new Fade(this.getElement()); + fade.setDuration(0.7); + fade.play(); + fade.addEffectCompletedHandler(new EffectCompletedHandler() { + + @Override + public void onEffectCompleted(final EffectCompletedEvent event) { + removeFromParent(); + closeCallback.onClose(); + } + }); + } + + @Override + public String getText() { + return label.getText(); + } + + @UiHandler("close") + void handleClick(final ClickEvent e) { + close(); + } + + private void resetTimer() { + if (time != null) { + // More time to read it! + time.schedule(fadeMills); + } + } + + private SafeHtml sanitize(final String message) { + return SafeHtmlUtils.fromTrustedString(message); + } + + private void setIcon(final NotifyLevel level) { + if (level.equals(NotifyLevel.avatar)) { + icon.setUrl(level.getUrl()); + icon.setSize(AVATAR_SIZE, AVATAR_SIZE); + } else { + icon.setResource(UserMessageImagesUtil.getIcon(level)); + } + } + + private void setMsg(final String title, final String message) { + if (TextUtils.notEmpty(title)) { + label.setHTML(MSG_WITH_TITLE.format(SimpleHtmlSanitizer.sanitizeHtml(title), sanitize(message))); + } else { + label.setHTML(MSG_NO_TITLE.format(sanitize(message))); + } + } + + @Override + public void setText(final String text) { + label.setText(text); + } + +} Copied: trunk/src/main/java/cc/kune/msgs/client/UserMessageWidget.ui.xml (from rev 1630, trunk/src/main/java/cc/kune/msgs/client/UserMessage.ui.xml) =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/UserMessageWidget.ui.xml (rev 0) +++ trunk/src/main/java/cc/kune/msgs/client/UserMessageWidget.ui.xml 2011-12-06 01:42:07 UTC (rev 1634) @@ -0,0 +1,36 @@ +<!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:style> + @if user.agent safari { + .k-msg-width { + width: 0px; + } + } + + @else { + .k-msg-width { + width: auto; + } + } + </ui:style> + <ui:with field='img' + type='cc.kune.msgs.client.resources.UserMessageImages'/> + <g:HorizontalPanel verticalAlignment="ALIGN_MIDDLE" + addStyleNames="k-msg, k-3corners, {style.k-msg-width}"> + <g:SimplePanel addStyleNames="k-msg-icon"> + <g:Image width="100%" ui:field="icon" height="100%"/> + </g:SimplePanel> + <g:Cell width="100%"> + <g:InlineHTML ui:field="label" width="100%" + styleName="k-msg-label"/> + </g:Cell> + <g:PushButton ui:field="close" styleName="k-msg-close" + width="22px"> + <g:upFace image='{img.remove}'/> + <g:downFace image='{img.removeOver}'/> + <g:upHoveringFace image='{img.removeGrey}'/> + </g:PushButton> + </g:HorizontalPanel> +</ui:UiBinder> Modified: trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java 2011-12-05 20:42:43 UTC (rev 1633) +++ trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java 2011-12-06 01:42:07 UTC (rev 1634) @@ -40,8 +40,7 @@ @UiField FlowPanel bottom; - private NotifyLevel currentLevel; - private UserMessage currentMsg; + @UiField VerticalPanel panel; @@ -50,12 +49,11 @@ } @Override - public void add(final NotifyLevel level, final String title, final String message, final String id, - final boolean closeable, final CloseCallback closeCallback) { + public UserMessage add(final NotifyLevel level, final String title, final String message, + final String id, final Boolean closeable, final CloseCallback closeCallback) { - final UserMessage msg = new UserMessage(level, title, message, id, closeable, closeCallback); - currentMsg = msg; - currentLevel = level; + final UserMessageWidget msg = new UserMessageWidget(level, title, message, id, closeable, + closeCallback); // msg.getText(). @@ -71,5 +69,10 @@ } } }); + return msg; } + + public int getCurrentMsgCount() { + return panel.getWidgetCount(); + } } Modified: trunk/src/main/java/cc/kune/msgs/client/UserMessagesPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/UserMessagesPresenter.java 2011-12-05 20:42:43 UTC (rev 1633) +++ trunk/src/main/java/cc/kune/msgs/client/UserMessagesPresenter.java 2011-12-06 01:42:07 UTC (rev 1634) @@ -23,21 +23,56 @@ public class UserMessagesPresenter { - public interface UserMessagesView { - void add(NotifyLevel level, String title, String message, String id, boolean closable, CloseCallback callback); - } + public interface UserMessagesView { + UserMessage add(NotifyLevel level, String title, String message, String id, Boolean closable, + CloseCallback callback); + } - private UserMessagesView view; + private boolean currentClosable; + private String currentId; + private NotifyLevel currentLevel; + private UserMessage currentMsg; + private String currentTitle; + private UserMessagesView view; - public UserMessagesPresenter() { - } + public UserMessagesPresenter() { + } - public void add(final NotifyLevel level, final String title, final String message, final String id, - final boolean closable, final CloseCallback closeCallback) { - view.add(level, title, message, id, closable, closeCallback); + public UserMessage add(final NotifyLevel level, final String title, final String message, + final String id, final boolean closable, final CloseCallback closeCallback) { + if ((currentMsg != null && !currentMsg.isAttached()) || !level.equals(currentLevel) + || !same(title, currentTitle) || !same(id, currentId) || closable != currentClosable) { + currentMsg = view.add(level, title, message, id, closable, closeCallback); + } else { + // Similar message, so, I'll reuse the widget + assert (currentMsg != null); + currentMsg.appendMsg(message); } + currentLevel = level; + currentTitle = title; + currentId = id; + currentClosable = closable; + return currentMsg; + } - public void init(final UserMessagesView view) { - this.view = view; + public void init(final UserMessagesView view) { + this.view = view; + } + + private boolean same(final Object object, final Object otherObj) { + if (object == otherObj) { + return true; } + if (otherObj == null) { + return false; + } + if (object == null) { + if (otherObj != null) { + return false; + } + } else if (!object.equals(otherObj)) { + return false; + } + return true; + } } Added: trunk/src/test/java/cc/kune/msgs/client/UserMessagesPresenterTest.java =================================================================== --- trunk/src/test/java/cc/kune/msgs/client/UserMessagesPresenterTest.java (rev 0) +++ trunk/src/test/java/cc/kune/msgs/client/UserMessagesPresenterTest.java 2011-12-06 01:42:07 UTC (rev 1634) @@ -0,0 +1,131 @@ +package cc.kune.msgs.client; + +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mockito; + +import cc.kune.common.client.notify.NotifyLevel; +import cc.kune.msgs.client.UserMessagesPresenter.UserMessagesView; + +public class UserMessagesPresenterTest { + + private static final String ID_1 = "id1"; + private static final String ID_2 = "id2"; + private static final String MESSAGE_1 = "message 1"; + private static final String MESSAGE_2 = "message 2"; + private static final String TITLE_1 = "title 1"; + private static final String TITLE_2 = "title 2"; + private CloseCallback closeCallback; + private UserMessage msg; + private UserMessagesPresenter presenter; + private UserMessagesView view; + + @Test + public void basicMsg() { + presenter.add(NotifyLevel.info, TITLE_1, MESSAGE_1, null, false, closeCallback); + Mockito.verify(view, Mockito.times(1)).add(NotifyLevel.info, TITLE_1, MESSAGE_1, null, false, + closeCallback); + } + + @Before + public void before() { + presenter = new UserMessagesPresenter(); + view = Mockito.mock(UserMessagesView.class); + closeCallback = Mockito.mock(CloseCallback.class); + presenter.init(view); + msg = Mockito.mock(UserMessage.class); + // Mockito.when(msg.getText()).thenReturn(MESSAGE_1); + Mockito.when( + view.add((NotifyLevel) Mockito.anyObject(), Mockito.anyString(), Mockito.anyString(), + Mockito.anyString(), Mockito.anyBoolean(), (CloseCallback) Mockito.anyObject())).thenReturn( + msg); + } + + @Test + public void twoBasicAvatarMsg() { + final NotifyLevel avatar = NotifyLevel.avatar.url("image1.png"); + presenter.add(avatar, TITLE_1, MESSAGE_1, null, false, closeCallback); + Mockito.when(msg.isAttached()).thenReturn(true); + presenter.add(avatar, TITLE_1, MESSAGE_2, null, false, closeCallback); + Mockito.verify(view, Mockito.times(1)).add(avatar, TITLE_1, MESSAGE_1, null, false, closeCallback); + Mockito.verify(msg, Mockito.times(1)).appendMsg(MESSAGE_2); + } + + @Test + public void twoBasicDiffAvatarMsg() { + final NotifyLevel avatar1 = NotifyLevel.avatar.url("image1.png"); + presenter.add(avatar1, TITLE_1, MESSAGE_1, ID_1, false, closeCallback); + final NotifyLevel avatar2 = NotifyLevel.avatar.url("image2.png"); + presenter.add(avatar2, TITLE_1, MESSAGE_1, ID_1, true, closeCallback); + Mockito.verify(view, Mockito.times(1)).add(avatar1, TITLE_1, MESSAGE_1, ID_1, false, closeCallback); + Mockito.verify(view, Mockito.times(1)).add(avatar2, TITLE_1, MESSAGE_1, ID_1, true, closeCallback); + Mockito.verify(msg, Mockito.never()).appendMsg(MESSAGE_1); + } + + @Test + public void twoBasicDiffCloseableMsg() { + presenter.add(NotifyLevel.info, TITLE_1, MESSAGE_1, ID_1, false, closeCallback); + presenter.add(NotifyLevel.info, TITLE_1, MESSAGE_1, ID_1, true, closeCallback); + Mockito.verify(view, Mockito.times(1)).add(NotifyLevel.info, TITLE_1, MESSAGE_1, ID_1, false, + closeCallback); + Mockito.verify(view, Mockito.times(1)).add(NotifyLevel.info, TITLE_1, MESSAGE_1, ID_1, true, + closeCallback); + Mockito.verify(msg, Mockito.never()).appendMsg(MESSAGE_1); + } + + @Test + public void twoBasicDiffIdMsg() { + presenter.add(NotifyLevel.info, TITLE_1, MESSAGE_1, ID_1, false, closeCallback); + presenter.add(NotifyLevel.info, TITLE_1, MESSAGE_1, ID_2, false, closeCallback); + Mockito.verify(view, Mockito.times(1)).add(NotifyLevel.info, TITLE_1, MESSAGE_1, ID_1, false, + closeCallback); + Mockito.verify(view, Mockito.times(1)).add(NotifyLevel.info, TITLE_1, MESSAGE_1, ID_2, false, + closeCallback); + Mockito.verify(msg, Mockito.never()).appendMsg(MESSAGE_1); + } + + @Test + public void twoBasicDiffLevelMsg() { + presenter.add(NotifyLevel.info, TITLE_1, MESSAGE_1, null, false, closeCallback); + presenter.add(NotifyLevel.error, TITLE_1, MESSAGE_2, null, false, closeCallback); + Mockito.verify(view, Mockito.times(1)).add(NotifyLevel.info, TITLE_1, MESSAGE_1, null, false, + closeCallback); + Mockito.verify(view, Mockito.times(1)).add(NotifyLevel.error, TITLE_1, MESSAGE_2, null, false, + closeCallback); + Mockito.verify(msg, Mockito.never()).appendMsg(MESSAGE_2); + } + + @Test + public void twoBasicDiffTitleMsg() { + presenter.add(NotifyLevel.info, TITLE_1, MESSAGE_1, null, false, closeCallback); + presenter.add(NotifyLevel.info, TITLE_2, MESSAGE_1, null, false, closeCallback); + Mockito.verify(view, Mockito.times(1)).add(NotifyLevel.info, TITLE_1, MESSAGE_1, null, false, + closeCallback); + Mockito.verify(view, Mockito.times(1)).add(NotifyLevel.info, TITLE_2, MESSAGE_1, null, false, + closeCallback); + Mockito.verify(msg, Mockito.never()).appendMsg(MESSAGE_1); + } + + @Test + public void twoBasicMsg() { + presenter.add(NotifyLevel.info, TITLE_1, MESSAGE_1, null, false, closeCallback); + Mockito.when(msg.isAttached()).thenReturn(true); + presenter.add(NotifyLevel.info, TITLE_1, MESSAGE_2, null, false, closeCallback); + Mockito.verify(view, Mockito.times(1)).add(NotifyLevel.info, TITLE_1, MESSAGE_1, null, false, + closeCallback); + Mockito.verify(msg, Mockito.times(1)).appendMsg(MESSAGE_2); + } + + @Test + public void twoBasicMsgButAfterFirstClosed() { + presenter.add(NotifyLevel.info, TITLE_1, MESSAGE_1, null, false, closeCallback); + Mockito.verify(view, Mockito.times(1)).add(NotifyLevel.info, TITLE_1, MESSAGE_1, null, false, + closeCallback); + presenter.add(NotifyLevel.info, TITLE_1, MESSAGE_2, null, false, closeCallback); + Mockito.when(msg.isAttached()).thenReturn(false); + Mockito.verify(view, Mockito.times(1)).add(NotifyLevel.info, TITLE_1, MESSAGE_1, null, false, + closeCallback); + Mockito.verify(msg, Mockito.never()).appendMsg(MESSAGE_2); + } + +}

1 0

r1633 - in trunk: . script src/main/java/cc/kune src/main/java/cc/kune/core/client/auth src/main/java/cc/kune/core/client/errors src/main/java/cc/kune/core/client/i18n src/main/java/cc/kune/core/client/init src/main/java/cc/kune/core/client/sitebar/spaces src/main/java/cc/kune/gspace/client/actions src/main/java/cc/kune/gspace/client/options/general
by Vicente J. Ruiz Jurado 05 Dec '11

05 Dec '11

Author: vjrj_ Date: 2011-12-05 21:42:43 +0100 (Mon, 05 Dec 2011) New Revision: 1633 Modified: trunk/INSTALL trunk/pom.xml trunk/script/server.sh trunk/src/main/java/cc/kune/Kune.gwt.xml trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java trunk/src/main/java/cc/kune/gspace/client/actions/ParticipateInContentBtn.java trunk/src/main/java/cc/kune/gspace/client/options/general/EntityOptGeneralPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/general/GroupOptGeneralPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptGeneralPresenter.java Log: CLOSED - # 176: Ask for confirmation before reload to change the UI to your language http://kune.ourproject.org/issues/ticket/176 Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2011-11-30 01:31:04 UTC (rev 1632) +++ trunk/INSTALL 2011-12-05 20:42:43 UTC (rev 1633) @@ -171,7 +171,7 @@ ==Production environment instructions== With - mvn package + mvn assembly:assembly an executable target/kune-VERSION-jar-with-dependencies.jar is generated in target directory. That you can use to start kune: bin/server.sh -j kune.jar Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-30 01:31:04 UTC (rev 1632) +++ trunk/pom.xml 2011-12-05 20:42:43 UTC (rev 1633) @@ -927,6 +927,7 @@ </descriptorRefs> <dependencySets> <dependencySet> + <outputDirectory>/</outputDirectory> <scope>runtime</scope> <unpackOptions> <excludes> @@ -936,9 +937,23 @@ <exclude>**extjs**</exclude> <exclude>**gxt**</exclude> </excludes> + <includes> + <include>${basedir}/target/kune-0.1.0-SNAPSHOT/ws/**</include> + <include>${basedir}/src/main/webapp/**</include> + </includes> </unpackOptions> </dependencySet> </dependencySets> + <fileSets> + <fileSet> + <directory>${basedir}</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>**/target/kune-0.1.0-SNAPSHOT/ws/**</include> + <include>**src/main/webapp**</include> + </includes> + </fileSet> + </fileSets> </configuration> </plugin> <plugin> Modified: trunk/script/server.sh =================================================================== --- trunk/script/server.sh 2011-11-30 01:31:04 UTC (rev 1632) +++ trunk/script/server.sh 2011-12-05 20:42:43 UTC (rev 1633) @@ -7,7 +7,7 @@ Example: $0 -j target/kune-0.1.0-SNAPSHOT-jar-with-dependencies.jar -l IGNORE -d -p -u 20000 Options: --j <jar file> : runs jar file generated via mvn package -Dmaven.test.skip=true +-j <jar file> : runs jar file generated via mvn assembly:assembly -a: run as a daemon (only root user) -l LOGLEVEL : IGNORE|DEBUG|INFO|WARN Modified: trunk/src/main/java/cc/kune/Kune.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/Kune.gwt.xml 2011-11-30 01:31:04 UTC (rev 1632) +++ trunk/src/main/java/cc/kune/Kune.gwt.xml 2011-12-05 20:42:43 UTC (rev 1633) @@ -56,9 +56,12 @@ <set-configuration-property name="CssResource.style" value="pretty" />  - <extend-property name="locale" values="en" /> - <extend-property name="locale" values="es" /> - <extend-property name="locale" values="fr" /> +  + <extend-property name="locale" values="en,es,fr" /> + <set-property-fallback name="locale" value="en"/> + + <set-property name="locale" value="en,es,fr"/> +    Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java 2011-11-30 01:31:04 UTC (rev 1632) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java 2011-12-05 20:42:43 UTC (rev 1633) @@ -21,6 +21,7 @@ import cc.kune.core.client.cookies.CookiesManager; import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.i18n.I18nUITranslationService.I18nLanguageChangeNeeded; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; @@ -93,13 +94,22 @@ session.setCurrentUserInfo(userInfoDTO); final I18nLanguageDTO language = userInfoDTO.getLanguage(); session.setCurrentLanguage(language); - if (!i18n.changeToLanguageIfNecessary(language.getCode())) { - if (gotoHomePage) { - stateManager.gotoStateToken(new StateToken(userInfoDTO.getHomePage()).clearDocument()); - } else { - stateManager.redirectOrRestorePreviousToken(); - } - } + i18n.changeToLanguageIfNecessary(language.getCode(), language.getEnglishName(), + new I18nLanguageChangeNeeded() { + + @Override + public void onChangeNeeded() { + } + + @Override + public void onChangeNotNeeded() { + if (gotoHomePage) { + stateManager.gotoStateToken(new StateToken(userInfoDTO.getHomePage()).clearDocument()); + } else { + stateManager.redirectOrRestorePreviousToken(); + } + } + }); } protected void saveAutocompleteLoginData(final String nickOrEmail, final String password) { Modified: trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-11-30 01:31:04 UTC (rev 1632) +++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-12-05 20:42:43 UTC (rev 1633) @@ -84,7 +84,7 @@ final String msg = caught.getMessage(); eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, i18n.t("You do not have rights to perform that action") - + (TextUtils.empty(msg) ? "" : ". " + i18n.t(msg)))); + + (!TextUtils.empty(msg) && msg.length() > 1 ? ". " + i18n.t(msg) : ""))); goHome(); } else if (caught instanceof SessionExpiredException) { logException(caught); Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-11-30 01:31:04 UTC (rev 1632) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-12-05 20:42:43 UTC (rev 1633) @@ -27,9 +27,11 @@ import java.util.Set; import cc.kune.common.client.log.Log; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.Location; import cc.kune.common.client.utils.MetaUtils; import cc.kune.common.client.utils.Pair; +import cc.kune.common.client.utils.SimpleResponseCallback; import cc.kune.common.client.utils.TextUtils; import cc.kune.common.client.utils.WindowUtils; import cc.kune.core.client.rpcservices.I18nServiceAsync; @@ -48,6 +50,11 @@ import com.google.inject.Inject; public class I18nUITranslationService extends I18nTranslationService { + public interface I18nLanguageChangeNeeded { + void onChangeNeeded(); + + void onChangeNotNeeded(); + } private I18nLanguageDTO currentLang; private String currentLanguageCode; private final Set<Pair<String, String>> earlyTexts; @@ -57,6 +64,7 @@ private final KuneConstants kuneConstants; private HashMap<String, String> lexicon; private final Session session; + private String siteCommonName; @Inject @@ -101,11 +109,20 @@ + ", isRTL: " + currentLang.getDirection() + " use properties: " + shouldIuseProperties()); - if (!changeToLanguageIfNecessary(getCurrentGWTlanguage(), currentLang.getCode())) { - isCurrentLangRTL = currentLang.getDirection().equals(RTL); - eventBus.fireEvent(new I18nReadyEvent()); - } - I18nStyles.setRTL(isCurrentLangRTL); + changeToLanguageIfNecessary(getCurrentGWTlanguage(), currentLang.getCode(), + currentLang.getEnglishName(), new I18nLanguageChangeNeeded() { + + @Override + public void onChangeNeeded() { + } + + @Override + public void onChangeNotNeeded() { + isCurrentLangRTL = currentLang.getDirection().equals(RTL); + eventBus.fireEvent(new I18nReadyEvent()); + I18nStyles.setRTL(isCurrentLangRTL); + } + }); } }); session.onUserSignIn(true, new UserSignInHandler() { @@ -162,8 +179,9 @@ changeHref("http://" + WindowUtils.getLocation().getHost() + newUrl); } - public boolean changeToLanguageIfNecessary(final String wantedLang) { - return changeToLanguageIfNecessary(currentLang.getCode(), wantedLang); + public void changeToLanguageIfNecessary(final String wantedLang, final String wantedLangEnglishName, + final I18nLanguageChangeNeeded listener) { + changeToLanguageIfNecessary(currentLang.getCode(), wantedLang, wantedLangEnglishName, listener); } /** @@ -172,13 +190,29 @@ * to check and to change to * @return true if we should reload the client with the new language */ - public boolean changeToLanguageIfNecessary(final String currentLang, final String wantedLang) { - if (!currentLang.equals(wantedLang) && isInConstantProperties(wantedLang)) { - setCurrentLanguage(wantedLang); - changeLanguageInUrl(wantedLang); - return true; + private void changeToLanguageIfNecessary(final String currentLangCode, final String wantedLang, + final String wantedLangEnglishName, final I18nLanguageChangeNeeded listener) { + if (!currentLangCode.equals(wantedLang) && isInConstantProperties(wantedLang)) { + NotifyUser.askConfirmation(t("Confirm please"), + t("Do you want to reload this page to use '[%s]' language?", wantedLangEnglishName), + new SimpleResponseCallback() { + @Override + public void onCancel() { + // User no accepted to change the language... + listener.onChangeNotNeeded(); + } + + @Override + public void onSuccess() { + // User accepted to change the language... + listener.onChangeNeeded(); + setCurrentLanguage(wantedLang); + changeLanguageInUrl(wantedLang); + } + }); + } else { + listener.onChangeNotNeeded(); } - return false; } public String formatDateWithLocale(final Date date) { Modified: trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2011-11-30 01:31:04 UTC (rev 1632) +++ trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2011-12-05 20:42:43 UTC (rev 1633) @@ -66,11 +66,13 @@ } private void checkNavigatorCompatibility(final NavigatorSupport navSupport) { - if (Navigator.getUserAgent().toLowerCase().contains("msie") - || Navigator.getUserAgent().toLowerCase().contains("opera")) { + // http://www.useragentstring.com/pages/useragentstring.php + final String userAgent = Navigator.getUserAgent().toLowerCase(); + Log.info("User agent: " + userAgent); + if (userAgent.contains("chrome") || userAgent.contains("gecko")) { + navSupport.onSupported(); + } else { navSupport.onNotSupported(); - } else { - navSupport.onSupported(); } } 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-11-30 01:31:04 UTC (rev 1632) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-12-05 20:42:43 UTC (rev 1633) @@ -145,7 +145,13 @@ view.getGroupBtn().addClickHandler(new ClickHandler() { @Override public void onClick(final ClickEvent event) { - restoreToken(groupToken); + if (groupToken.equals(SiteTokens.GROUP_HOME)) { + // as current home is equal to "no content" token, we shall go to + // group space def home page + stateManager.gotoDefaultHomepage(); + } else { + restoreToken(groupToken); + } setDown(Space.groupSpace); } }); Modified: trunk/src/main/java/cc/kune/gspace/client/actions/ParticipateInContentBtn.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/ParticipateInContentBtn.java 2011-11-30 01:31:04 UTC (rev 1632) +++ trunk/src/main/java/cc/kune/gspace/client/actions/ParticipateInContentBtn.java 2011-12-05 20:42:43 UTC (rev 1633) @@ -76,7 +76,7 @@ final IsCurrentStateEditableCondition isEditable, final IsNotParticipantOfCurrentStateCondition isNotParticipant, final CoreResources res) { super(action); - this.withText(i18n.t("Edit")).withToolTip("Participate in the edition of this page").withIcon( + this.withText(i18n.t("Participate")).withToolTip("Participate in the edition of this page").withIcon( res.contentEdit()).withStyles("k-def-docbtn, k-fl"); super.add(isLogged); super.add(isEditable); Modified: trunk/src/main/java/cc/kune/gspace/client/options/general/EntityOptGeneralPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/general/EntityOptGeneralPresenter.java 2011-11-30 01:31:04 UTC (rev 1632) +++ trunk/src/main/java/cc/kune/gspace/client/options/general/EntityOptGeneralPresenter.java 2011-12-05 20:42:43 UTC (rev 1633) @@ -19,9 +19,9 @@ */ package cc.kune.gspace.client.options.general; +import cc.kune.core.client.i18n.I18nUITranslationService; 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.EntityOptions; import cc.kune.gspace.client.options.logo.CurrentEntityChangedEvent; @@ -34,13 +34,13 @@ protected final EntityOptions entityOptions; private final EventBus eventBus; - protected final I18nTranslationService i18n; + protected final I18nUITranslationService i18n; protected final Session session; protected final StateManager stateManager; protected EntityOptGeneralView view; public EntityOptGeneralPresenter(final Session session, final StateManager stateManager, - final EventBus eventBus, final I18nTranslationService i18n, final EntityOptions entityOptions) { + final EventBus eventBus, final I18nUITranslationService i18n, final EntityOptions entityOptions) { this.session = session; this.stateManager = stateManager; this.eventBus = eventBus; Modified: trunk/src/main/java/cc/kune/gspace/client/options/general/GroupOptGeneralPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/general/GroupOptGeneralPresenter.java 2011-11-30 01:31:04 UTC (rev 1632) +++ trunk/src/main/java/cc/kune/gspace/client/options/general/GroupOptGeneralPresenter.java 2011-12-05 20:42:43 UTC (rev 1633) @@ -20,6 +20,7 @@ package cc.kune.gspace.client.options.general; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.state.GroupChangedEvent; @@ -29,7 +30,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.GroupOptions; import com.google.gwt.event.shared.EventBus; @@ -43,7 +43,7 @@ @Inject public GroupOptGeneralPresenter(final StateManager stateManager, final Session session, - final EventBus eventBus, final I18nTranslationService i18n, final GroupOptions entityOptions, + final EventBus eventBus, final I18nUITranslationService i18n, final GroupOptions entityOptions, final Provider<GroupServiceAsync> groupService, final GroupOptGeneralView view) { super(session, stateManager, eventBus, i18n, entityOptions); this.groupService = groupService; Modified: trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptGeneralPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptGeneralPresenter.java 2011-11-30 01:31:04 UTC (rev 1632) +++ trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptGeneralPresenter.java 2011-12-05 20:42:43 UTC (rev 1633) @@ -20,6 +20,8 @@ package cc.kune.gspace.client.options.general; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.i18n.I18nUITranslationService.I18nLanguageChangeNeeded; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.UserServiceAsync; import cc.kune.core.client.state.Session; @@ -30,7 +32,6 @@ import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.UserDTO; import cc.kune.core.shared.dto.UserSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.options.UserOptions; import com.google.gwt.event.shared.EventBus; @@ -44,7 +45,7 @@ @Inject public UserOptGeneralPresenter(final Session session, final StateManager stateManager, - final EventBus eventBus, final I18nTranslationService i18n, final UserOptions entityOptions, + final EventBus eventBus, final I18nUITranslationService i18n, final UserOptions entityOptions, final Provider<UserServiceAsync> userService, final UserOptGeneralView view) { super(session, stateManager, eventBus, i18n, entityOptions); this.userService = userService; @@ -84,13 +85,25 @@ user.setId(currentUser.getId()); final String longName = userView.getLongName(); user.setName(longName); + final I18nLanguageSimpleDTO lang = userView.getLanguage(); userService.get().updateUser(session.getUserHash(), user, userView.getLanguage(), new AsyncCallbackSimple<StateAbstractDTO>() { @Override public void onSuccess(final StateAbstractDTO result) { NotifyUser.hideProgress(); - stateManager.setRetrievedStateAndGo(result); - sendChangeEntityEvent(); + // Change language to new one if needed + i18n.changeToLanguageIfNecessary(lang.getCode(), lang.getEnglishName(), + new I18nLanguageChangeNeeded() { + @Override + public void onChangeNeeded() { + } + + @Override + public void onChangeNotNeeded() { + stateManager.setRetrievedStateAndGo(result); + sendChangeEntityEvent(); + } + }); }; }

1 0