[kune-commits] r1071 - in trunk/src/main/java/org/ourproject/kune: platf/client/services platf/client/ui/rte/basic platf/client/ui/rte/edithtml platf/client/ui/rte/edithtml/editor platf/client/ui/rte/edithtml/preview platf/client/ui/rte/insertimg platf/client/ui/rte/insertimg/ext platf/client/ui/rte/insertlink platf/client/ui/rte/insertlink/abstractlink platf/client/ui/rte/insertlink/email platf/client/ui/rte/insertlink/ext platf/client/ui/rte/saving workspace/client workspace/client/editor/insertlocalimg w

Author: vjrj Date: 2009-03-11 15:08:13 +0100 (Wed, 11 Mar 2009) New Revision: 1071 Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionSndToolbar.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionTopToolbar.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlAgent.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialog.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogView.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialog.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogView.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialog.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogView.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkGroup.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstract.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstractPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstractView.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/InsertLinkEmail.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/InsertLinkEmailPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/InsertLinkEmailPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/InsertLinkEmailView.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExt.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtView.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocal.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalView.java Removed: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionSndToolbar.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionSndToolbarPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionTopToolbar.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionTopToolbarPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEcanBeBasic.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtml.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlView.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/editor/EditHtmlAgent.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImage.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImagePanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImagePresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageView.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElement.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElementGroup.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElementPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElementPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElementView.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/TextEditorInsertAbstract.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/TextEditorInsertAbstractPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/TextEditorInsertAbstractView.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/TextEditorInsertLinkEmail.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/TextEditorInsertLinkEmailPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/TextEditorInsertLinkEmailPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/TextEditorInsertLinkEmailView.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/TextEditorInsertLinkExt.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/TextEditorInsertLinkExtPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/TextEditorInsertLinkExtPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/TextEditorInsertLinkExtView.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/TextEditorInsertLinkLocal.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/TextEditorInsertLinkLocalPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/TextEditorInsertLinkLocalPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/TextEditorInsertLinkLocalView.java Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneCoreModule.java trunk/src/main/java/org/ourproject/kune/platf/client/services/KunePlatformModule.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/editor/EditHtmlEditorPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/editor/EditHtmlEditorPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/preview/EditHtmlPreviewPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/preview/EditHtmlPreviewPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditor.java trunk/src/main/java/org/ourproject/kune/workspace/client/KuneWorkspaceModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPresenter.java Log: Incomplete - task Better RTE (Rich Text Editor) support Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneCoreModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneCoreModule.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneCoreModule.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -23,7 +23,7 @@ import org.ourproject.kune.platf.client.app.EntityOptionsGroup; import org.ourproject.kune.platf.client.app.ToolGroup; import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageGroup; -import org.ourproject.kune.platf.client.ui.rte.insertlink.TextEditorInsertElementGroup; +import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkGroup; import com.calclab.suco.client.ioc.module.AbstractModule; @@ -35,6 +35,6 @@ registerDecorator(ToolGroup.class, new ToolGroup(container)); registerDecorator(EntityOptionsGroup.class, new EntityOptionsGroup(container)); registerDecorator(InsertImageGroup.class, new InsertImageGroup(container)); - registerDecorator(TextEditorInsertElementGroup.class, new TextEditorInsertElementGroup(container)); + registerDecorator(InsertLinkGroup.class, new InsertLinkGroup(container)); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KunePlatformModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KunePlatformModule.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KunePlatformModule.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -50,16 +50,14 @@ import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalettePresenter; import org.ourproject.kune.platf.client.ui.rte.TestRTEDialog; import org.ourproject.kune.platf.client.ui.rte.basic.RTEActionSndToolbar; -import org.ourproject.kune.platf.client.ui.rte.basic.RTEActionSndToolbarPresenter; import org.ourproject.kune.platf.client.ui.rte.basic.RTEActionTopToolbar; -import org.ourproject.kune.platf.client.ui.rte.basic.RTEActionTopToolbarPresenter; import org.ourproject.kune.platf.client.ui.rte.basic.RTEditor; import org.ourproject.kune.platf.client.ui.rte.basic.RTEditorPanel; import org.ourproject.kune.platf.client.ui.rte.basic.RTEditorPresenter; -import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtml; +import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtmlDialog; import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtmlGroup; -import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtmlPanel; -import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtmlPresenter; +import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtmlDialogPanel; +import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtmlDialogPresenter; import org.ourproject.kune.platf.client.ui.rte.edithtml.editor.EditHtmlEditor; import org.ourproject.kune.platf.client.ui.rte.edithtml.editor.EditHtmlEditorPanel; import org.ourproject.kune.platf.client.ui.rte.edithtml.editor.EditHtmlEditorPresenter; @@ -67,24 +65,24 @@ import org.ourproject.kune.platf.client.ui.rte.edithtml.preview.EditHtmlPreviewPanel; import org.ourproject.kune.platf.client.ui.rte.edithtml.preview.EditHtmlPreviewPresenter; import org.ourproject.kune.platf.client.ui.rte.img.RTEImgResources; -import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImage; +import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageDialog; import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageGroup; -import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImagePanel; -import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImagePresenter; +import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageDialogPanel; +import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageDialogPresenter; import org.ourproject.kune.platf.client.ui.rte.insertimg.ext.InsertImageExt; import org.ourproject.kune.platf.client.ui.rte.insertimg.ext.InsertImageExtPanel; import org.ourproject.kune.platf.client.ui.rte.insertimg.ext.InsertImageExtPresenter; -import org.ourproject.kune.platf.client.ui.rte.insertlink.TextEditorInsertElement; -import org.ourproject.kune.platf.client.ui.rte.insertlink.TextEditorInsertElementGroup; -import org.ourproject.kune.platf.client.ui.rte.insertlink.TextEditorInsertElementPanel; -import org.ourproject.kune.platf.client.ui.rte.insertlink.TextEditorInsertElementPresenter; -import org.ourproject.kune.platf.client.ui.rte.insertlink.email.TextEditorInsertLinkEmail; -import org.ourproject.kune.platf.client.ui.rte.insertlink.email.TextEditorInsertLinkEmailPanel; -import org.ourproject.kune.platf.client.ui.rte.insertlink.email.TextEditorInsertLinkEmailPresenter; -import org.ourproject.kune.platf.client.ui.rte.insertlink.ext.TextEditorInsertLinkExt; -import org.ourproject.kune.platf.client.ui.rte.insertlink.ext.TextEditorInsertLinkExtPanel; -import org.ourproject.kune.platf.client.ui.rte.insertlink.ext.TextEditorInsertLinkExtPresenter; -import org.ourproject.kune.platf.client.ui.rte.insertlink.ext.TextEditorInsertLinkExtView; +import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkDialog; +import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkGroup; +import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkDialogPanel; +import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkDialogPresenter; +import org.ourproject.kune.platf.client.ui.rte.insertlink.email.InsertLinkEmail; +import org.ourproject.kune.platf.client.ui.rte.insertlink.email.InsertLinkEmailPanel; +import org.ourproject.kune.platf.client.ui.rte.insertlink.email.InsertLinkEmailPresenter; +import org.ourproject.kune.platf.client.ui.rte.insertlink.ext.InsertLinkExt; +import org.ourproject.kune.platf.client.ui.rte.insertlink.ext.InsertLinkExtPanel; +import org.ourproject.kune.platf.client.ui.rte.insertlink.ext.InsertLinkExtPresenter; +import org.ourproject.kune.platf.client.ui.rte.insertlink.ext.InsertLinkExtView; import org.ourproject.kune.platf.client.ui.rte.saving.RTESavingEditor; import org.ourproject.kune.platf.client.ui.rte.saving.RTESavingEditorPanel; import org.ourproject.kune.platf.client.ui.rte.saving.RTESavingEditorPresenter; @@ -256,14 +254,14 @@ @Override public RTEActionTopToolbar create() { final ActionToolbarPanel<Object> panel = new ActionToolbarPanel<Object>($$(ActionManager.class)); - final RTEActionTopToolbarPresenter toolbar = new RTEActionTopToolbarPresenter(panel); + final RTEActionTopToolbar toolbar = new RTEActionTopToolbar(panel); return toolbar; } }, new Factory<RTEActionSndToolbar>(RTEActionSndToolbar.class) { @Override public RTEActionSndToolbar create() { final ActionToolbarPanel<Object> panel = new ActionToolbarPanel<Object>($$(ActionManager.class), true); - final RTEActionSndToolbarPresenter toolbar = new RTEActionSndToolbarPresenter(panel); + final RTEActionSndToolbar toolbar = new RTEActionSndToolbar(panel); return toolbar; } }); @@ -281,8 +279,8 @@ RTEActionTopToolbar topBar = $(RTEActionTopToolbar.class); RTEActionSndToolbar sndBar = $(RTEActionSndToolbar.class); final RTEditorPresenter presenter = new RTEditorPresenter($(I18nTranslationService.class), - $(Session.class), topBar, sndBar, $(RTEImgResources.class), $(TextEditorInsertElement.class), - $(ColorWebSafePalette.class), $$(EditHtml.class), $$(InsertImage.class), + $(Session.class), topBar, sndBar, $(RTEImgResources.class), $(InsertLinkDialog.class), + $(ColorWebSafePalette.class), $$(EditHtmlDialog.class), $$(InsertImageDialog.class), $(DeferredCommandWrapper.class)); final RTEditorPanel panel = new RTEditorPanel(presenter, $(I18nUITranslationService.class), $(ActionManager.class)); @@ -326,11 +324,11 @@ registerDecorator(EditHtmlGroup.class, new EditHtmlGroup(container)); - register(Singleton.class, new Factory<EditHtml>(EditHtml.class) { + register(Singleton.class, new Factory<EditHtmlDialog>(EditHtmlDialog.class) { @Override - public EditHtml create() { - final EditHtmlPresenter presenter = new EditHtmlPresenter(); - final EditHtmlPanel panel = new EditHtmlPanel(presenter, $(I18nTranslationService.class), + public EditHtmlDialog create() { + final EditHtmlDialogPresenter presenter = new EditHtmlDialogPresenter(); + final EditHtmlDialogPanel panel = new EditHtmlDialogPanel(presenter, $(I18nTranslationService.class), $(RTEImgResources.class), $(Images.class), $(EditHtmlGroup.class)); presenter.init(panel); return presenter; @@ -340,7 +338,7 @@ register(EditHtmlGroup.class, new Factory<EditHtmlEditor>(EditHtmlEditor.class) { @Override public EditHtmlEditor create() { - final EditHtmlEditorPresenter presenter = new EditHtmlEditorPresenter($(EditHtml.class)); + final EditHtmlEditorPresenter presenter = new EditHtmlEditorPresenter($(EditHtmlDialog.class)); final EditHtmlEditorPanel panel = new EditHtmlEditorPanel(i18n, presenter); presenter.init(panel); return presenter; @@ -348,18 +346,18 @@ }, new Factory<EditHtmlPreview>(EditHtmlPreview.class) { @Override public EditHtmlPreview create() { - final EditHtmlPreviewPresenter presenter = new EditHtmlPreviewPresenter($(EditHtml.class)); + final EditHtmlPreviewPresenter presenter = new EditHtmlPreviewPresenter($(EditHtmlDialog.class)); final EditHtmlPreviewPanel panel = new EditHtmlPreviewPanel(i18n, presenter); presenter.init(panel); return presenter; } }); - register(Singleton.class, new Factory<InsertImage>(InsertImage.class) { + register(Singleton.class, new Factory<InsertImageDialog>(InsertImageDialog.class) { @Override - public InsertImage create() { - final InsertImagePresenter presenter = new InsertImagePresenter(); - final InsertImagePanel panel = new InsertImagePanel(presenter, $(I18nTranslationService.class), + public InsertImageDialog create() { + final InsertImageDialogPresenter presenter = new InsertImageDialogPresenter(); + final InsertImageDialogPanel panel = new InsertImageDialogPanel(presenter, $(I18nTranslationService.class), $(Images.class), $(InsertImageGroup.class)); presenter.init(panel); return presenter; @@ -369,44 +367,44 @@ register(InsertImageGroup.class, new Factory<InsertImageExt>(InsertImageExt.class) { @Override public InsertImageExt create() { - final InsertImageExtPresenter presenter = new InsertImageExtPresenter($(InsertImage.class)); + final InsertImageExtPresenter presenter = new InsertImageExtPresenter($(InsertImageDialog.class)); final InsertImageExtPanel panel = new InsertImageExtPanel(presenter, i18n); presenter.init(panel); return presenter; } }); - register(Singleton.class, new Factory<TextEditorInsertElement>(TextEditorInsertElement.class) { + register(Singleton.class, new Factory<InsertLinkDialog>(InsertLinkDialog.class) { @Override - public TextEditorInsertElement create() { - final TextEditorInsertElementPresenter presenter = new TextEditorInsertElementPresenter(); - final TextEditorInsertElementPanel panel = new TextEditorInsertElementPanel(presenter, $(Images.class), - $(I18nTranslationService.class), $(TextEditorInsertElementGroup.class)); + public InsertLinkDialog create() { + final InsertLinkDialogPresenter presenter = new InsertLinkDialogPresenter(); + final InsertLinkDialogPanel panel = new InsertLinkDialogPanel(presenter, $(Images.class), + $(I18nTranslationService.class), $(InsertLinkGroup.class)); presenter.init(panel); return presenter; } }); - register(TextEditorInsertElementGroup.class, - new Factory<TextEditorInsertLinkExt>(TextEditorInsertLinkExt.class) { + register(InsertLinkGroup.class, + new Factory<InsertLinkExt>(InsertLinkExt.class) { @Override - public TextEditorInsertLinkExt create() { - final TextEditorInsertLinkExtPresenter presenter = new TextEditorInsertLinkExtPresenter( - $(TextEditorInsertElement.class)); - final TextEditorInsertLinkExtView panel = new TextEditorInsertLinkExtPanel(presenter, + public InsertLinkExt create() { + final InsertLinkExtPresenter presenter = new InsertLinkExtPresenter( + $(InsertLinkDialog.class)); + final InsertLinkExtView panel = new InsertLinkExtPanel(presenter, $(I18nTranslationService.class)); presenter.init(panel); return presenter; } }); - register(TextEditorInsertElementGroup.class, new Factory<TextEditorInsertLinkEmail>( - TextEditorInsertLinkEmail.class) { + register(InsertLinkGroup.class, new Factory<InsertLinkEmail>( + InsertLinkEmail.class) { @Override - public TextEditorInsertLinkEmail create() { - final TextEditorInsertLinkEmailPresenter presenter = new TextEditorInsertLinkEmailPresenter( - $(TextEditorInsertElement.class)); - final TextEditorInsertLinkEmailPanel panel = new TextEditorInsertLinkEmailPanel(presenter, + public InsertLinkEmail create() { + final InsertLinkEmailPresenter presenter = new InsertLinkEmailPresenter( + $(InsertLinkDialog.class)); + final InsertLinkEmailPanel panel = new InsertLinkEmailPanel(presenter, $(I18nTranslationService.class)); presenter.init(panel); return presenter; Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionSndToolbar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionSndToolbar.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionSndToolbar.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,7 +0,0 @@ -package org.ourproject.kune.platf.client.ui.rte.basic; - -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; - -public interface RTEActionSndToolbar extends ActionToolbar<Object> { - -} \ No newline at end of file Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionSndToolbar.java (from rev 1070, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionSndToolbarPresenter.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionSndToolbarPresenter.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionSndToolbar.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,13 @@ +package org.ourproject.kune.platf.client.ui.rte.basic; + +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter; +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; + +public class RTEActionSndToolbar extends ActionToolbarPresenter<Object> implements ActionToolbar<Object> { + + public RTEActionSndToolbar(ActionToolbarView<Object> toolbar) { + super(toolbar); + } + +} \ No newline at end of file Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionSndToolbarPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionSndToolbarPresenter.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionSndToolbarPresenter.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,12 +0,0 @@ -package org.ourproject.kune.platf.client.ui.rte.basic; - -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter; -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; - -public class RTEActionSndToolbarPresenter extends ActionToolbarPresenter<Object> implements RTEActionSndToolbar { - - public RTEActionSndToolbarPresenter(ActionToolbarView<Object> toolbar) { - super(toolbar); - } - -} \ No newline at end of file Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionTopToolbar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionTopToolbar.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionTopToolbar.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,7 +0,0 @@ -package org.ourproject.kune.platf.client.ui.rte.basic; - -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; - -public interface RTEActionTopToolbar extends ActionToolbar<Object> { - -} \ No newline at end of file Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionTopToolbar.java (from rev 1070, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionTopToolbarPresenter.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionTopToolbarPresenter.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionTopToolbar.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,13 @@ +package org.ourproject.kune.platf.client.ui.rte.basic; + +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter; +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; + +public class RTEActionTopToolbar extends ActionToolbarPresenter<Object> implements ActionToolbar<Object> { + + public RTEActionTopToolbar(ActionToolbarView<Object> toolbar) { + super(toolbar); + } + +} \ No newline at end of file Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionTopToolbarPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionTopToolbarPresenter.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEActionTopToolbarPresenter.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,12 +0,0 @@ -package org.ourproject.kune.platf.client.ui.rte.basic; - -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter; -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; - -public class RTEActionTopToolbarPresenter extends ActionToolbarPresenter<Object> implements RTEActionTopToolbar { - - public RTEActionTopToolbarPresenter(ActionToolbarView<Object> toolbar) { - super(toolbar); - } - -} \ No newline at end of file Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEcanBeBasic.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEcanBeBasic.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEcanBeBasic.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,10 +0,0 @@ -package org.ourproject.kune.platf.client.ui.rte.basic; - -import org.ourproject.kune.platf.client.actions.ActionAddCondition; - -public class RTEcanBeBasic implements ActionAddCondition<Object> { - public boolean mustBeAdded(Object param) { - // TODO Auto-generated method stub - return false; - } -} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -18,10 +18,10 @@ import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette; import org.ourproject.kune.platf.client.ui.rte.RichTextArea; -import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtml; +import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtmlDialog; import org.ourproject.kune.platf.client.ui.rte.img.RTEImgResources; -import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImage; -import org.ourproject.kune.platf.client.ui.rte.insertlink.TextEditorInsertElement; +import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageDialog; +import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkDialog; import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper; import com.calclab.suco.client.events.Event0; @@ -58,17 +58,17 @@ private ActionToolbarPushButtonDescriptor<Object> underline; private ActionToolbarPushButtonDescriptor<Object> strikethrough; private final Event0 onEdit; - private final TextEditorInsertElement insertElement; + private final InsertLinkDialog insertElement; private final ColorWebSafePalette palette; private final DeferredCommandWrapper deferred; private final ActionAddCondition<Object> canBeBasic; private final ActionAddCondition<Object> canBeExtended; - private final Provider<EditHtml> editHtmlDialog; - private final Provider<InsertImage> insertImageDialog; + private final Provider<EditHtmlDialog> editHtmlDialog; + private final Provider<InsertImageDialog> insertImageDialog; public RTEditorPresenter(I18nTranslationService i18n, Session session, RTEActionTopToolbar topBar, - RTEActionSndToolbar sndBar, RTEImgResources imgResources, TextEditorInsertElement textEditorInsertElement, - ColorWebSafePalette palette, Provider<EditHtml> editHtmlDialog, Provider<InsertImage> insertImageDialog, + RTEActionSndToolbar sndBar, RTEImgResources imgResources, InsertLinkDialog textEditorInsertElement, + ColorWebSafePalette palette, Provider<EditHtmlDialog> editHtmlDialog, Provider<InsertImageDialog> insertImageDialog, DeferredCommandWrapper deferred) { this.i18n = i18n; this.session = session; @@ -399,7 +399,7 @@ ActionToolbarMenuDescriptor<Object> editHtml = new ActionToolbarMenuDescriptor<Object>(accessRol, topbar, new Listener0() { public void onEvent() { - EditHtml dialog = editHtmlDialog.get(); + EditHtmlDialog dialog = editHtmlDialog.get(); dialog.setUpdateListener(new Listener<String>() { public void onEvent(String html) { view.setHtml(html); Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtml.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtml.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtml.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,21 +0,0 @@ -package org.ourproject.kune.platf.client.ui.rte.edithtml; - -import org.ourproject.kune.platf.client.ui.rte.edithtml.editor.EditHtmlAgent; -import org.ourproject.kune.workspace.client.options.AbstractOptions; - -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener0; - -public interface EditHtml extends AbstractOptions { - - String getHtml(); - - void setAgent(EditHtmlAgent agent); - - void setCancelListener(Listener0 cancelListener); - - void setHtml(String html); - - void setUpdateListener(Listener<String> updateListener); - -} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlAgent.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/editor/EditHtmlAgent.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/editor/EditHtmlAgent.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlAgent.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,8 @@ +package org.ourproject.kune.platf.client.ui.rte.edithtml; + +public interface EditHtmlAgent { + + String getHtml(); + + void setHtml(String html); +} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialog.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtml.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtml.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialog.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,20 @@ +package org.ourproject.kune.platf.client.ui.rte.edithtml; + +import org.ourproject.kune.workspace.client.options.AbstractOptions; + +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener0; + +public interface EditHtmlDialog extends AbstractOptions { + + String getHtml(); + + void setAgent(EditHtmlAgent agent); + + void setCancelListener(Listener0 cancelListener); + + void setHtml(String html); + + void setUpdateListener(Listener<String> updateListener); + +} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPanel.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlPanel.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlPanel.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPanel.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,60 @@ +package org.ourproject.kune.platf.client.ui.rte.edithtml; + +import org.ourproject.kune.platf.client.i18n.I18nTranslationService; +import org.ourproject.kune.platf.client.services.Images; +import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level; +import org.ourproject.kune.platf.client.ui.rte.img.RTEImgResources; +import org.ourproject.kune.workspace.client.options.AbstractOptionsPanel; + +import com.google.gwt.user.client.Window; +import com.gwtext.client.core.EventObject; +import com.gwtext.client.widgets.Button; +import com.gwtext.client.widgets.event.ButtonListenerAdapter; + +public class EditHtmlDialogPanel extends AbstractOptionsPanel implements EditHtmlDialogView { + + public static final String EDIT_HTML_DIALOG = "ehtml-dialog"; + public static final String EDIG_HTML_DIALOG_ERROR_ID = "ehtml-dialgo-error"; + private final EditHtmlGroup editHtmlGroup; + private final I18nTranslationService i18n; + private Button cancel; + private final EditHtmlDialogPresenter presenter; + + public EditHtmlDialogPanel(final EditHtmlDialogPresenter presenter, I18nTranslationService i18n, RTEImgResources resources, + Images images, EditHtmlGroup editHtmlGroup) { + super(EDIT_HTML_DIALOG, i18n.tWithNT("Edit the HTML", + "Option in a content editor to edit the html internal code (for advance users)"), + Window.getClientWidth() - 100, HEIGHT + 80, Window.getClientWidth() - 100, HEIGHT + 80, true, images, + EDIG_HTML_DIALOG_ERROR_ID); + this.presenter = presenter; + this.i18n = i18n; + this.editHtmlGroup = editHtmlGroup; + // super.setIconCls(RTEImgResources.SUFFIX + + // resources.edithtml().getName()); + } + + @Override + public void createAndShow() { + if (cancel == null) { + cancel = new Button(i18n.t("Cancel")); + Button update = new Button(i18n.t("Update")); + cancel.addListener(new ButtonListenerAdapter() { + @Override + public void onClick(Button button, EventObject e) { + presenter.onCancel(); + } + }); + update.addListener(new ButtonListenerAdapter() { + @Override + public void onClick(Button button, EventObject e) { + presenter.onUpdate(); + } + }); + super.addButton(update); + super.addButton(cancel); + } + editHtmlGroup.createAll(); + super.createAndShow(); + super.setErrorMessage(i18n.t("This option is only for advanced users"), Level.info); + } +} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPresenter.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlPresenter.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlPresenter.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPresenter.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,51 @@ +package org.ourproject.kune.platf.client.ui.rte.edithtml; + +import org.ourproject.kune.workspace.client.options.AbstractOptionsPresenter; + +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener0; + +public class EditHtmlDialogPresenter extends AbstractOptionsPresenter implements EditHtmlDialog { + + private Listener<String> updateListener; + private Listener0 cancelListener; + private EditHtmlAgent agent; + + public EditHtmlDialogPresenter() { + } + + public String getHtml() { + return agent.getHtml(); + } + + public void onCancel() { + if (cancelListener != null) { + cancelListener.onEvent(); + } + hide(); + } + + public void onUpdate() { + if (updateListener != null) { + // FIXME + updateListener.onEvent(agent.getHtml()); + } + hide(); + } + + public void setAgent(EditHtmlAgent agent) { + this.agent = agent; + } + + public void setCancelListener(Listener0 cancelListener) { + this.cancelListener = cancelListener; + } + + public void setHtml(String html) { + agent.setHtml(html); + } + + public void setUpdateListener(Listener<String> updateListener) { + this.updateListener = updateListener; + } +} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogView.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlView.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlView.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogView.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,8 @@ +package org.ourproject.kune.platf.client.ui.rte.edithtml; + +import org.ourproject.kune.platf.client.View; +import org.ourproject.kune.workspace.client.options.AbstractOptionsView; + +public interface EditHtmlDialogView extends AbstractOptionsView, View { + int HEIGHT = 225; +} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlPanel.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlPanel.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,60 +0,0 @@ -package org.ourproject.kune.platf.client.ui.rte.edithtml; - -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.services.Images; -import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level; -import org.ourproject.kune.platf.client.ui.rte.img.RTEImgResources; -import org.ourproject.kune.workspace.client.options.AbstractOptionsPanel; - -import com.google.gwt.user.client.Window; -import com.gwtext.client.core.EventObject; -import com.gwtext.client.widgets.Button; -import com.gwtext.client.widgets.event.ButtonListenerAdapter; - -public class EditHtmlPanel extends AbstractOptionsPanel implements EditHtmlView { - - public static final String EDIT_HTML_DIALOG = "ehtml-dialog"; - public static final String EDIG_HTML_DIALOG_ERROR_ID = "ehtml-dialgo-error"; - private final EditHtmlGroup editHtmlGroup; - private final I18nTranslationService i18n; - private Button cancel; - private final EditHtmlPresenter presenter; - - public EditHtmlPanel(final EditHtmlPresenter presenter, I18nTranslationService i18n, RTEImgResources resources, - Images images, EditHtmlGroup editHtmlGroup) { - super(EDIT_HTML_DIALOG, i18n.tWithNT("Edit the HTML", - "Option in a content editor to edit the html internal code (for advance users)"), - Window.getClientWidth() - 100, HEIGHT + 80, Window.getClientWidth() - 100, HEIGHT + 80, true, images, - EDIG_HTML_DIALOG_ERROR_ID); - this.presenter = presenter; - this.i18n = i18n; - this.editHtmlGroup = editHtmlGroup; - // super.setIconCls(RTEImgResources.SUFFIX + - // resources.edithtml().getName()); - } - - @Override - public void createAndShow() { - if (cancel == null) { - cancel = new Button(i18n.t("Cancel")); - Button update = new Button(i18n.t("Update")); - cancel.addListener(new ButtonListenerAdapter() { - @Override - public void onClick(Button button, EventObject e) { - presenter.onCancel(); - } - }); - update.addListener(new ButtonListenerAdapter() { - @Override - public void onClick(Button button, EventObject e) { - presenter.onUpdate(); - } - }); - super.addButton(update); - super.addButton(cancel); - } - editHtmlGroup.createAll(); - super.createAndShow(); - super.setErrorMessage(i18n.t("This option is only for advanced users"), Level.info); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlPresenter.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlPresenter.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,52 +0,0 @@ -package org.ourproject.kune.platf.client.ui.rte.edithtml; - -import org.ourproject.kune.platf.client.ui.rte.edithtml.editor.EditHtmlAgent; -import org.ourproject.kune.workspace.client.options.AbstractOptionsPresenter; - -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener0; - -public class EditHtmlPresenter extends AbstractOptionsPresenter implements EditHtml { - - private Listener<String> updateListener; - private Listener0 cancelListener; - private EditHtmlAgent agent; - - public EditHtmlPresenter() { - } - - public String getHtml() { - return agent.getHtml(); - } - - public void onCancel() { - if (cancelListener != null) { - cancelListener.onEvent(); - } - hide(); - } - - public void onUpdate() { - if (updateListener != null) { - // FIXME - updateListener.onEvent(agent.getHtml()); - } - hide(); - } - - public void setAgent(EditHtmlAgent agent) { - this.agent = agent; - } - - public void setCancelListener(Listener0 cancelListener) { - this.cancelListener = cancelListener; - } - - public void setHtml(String html) { - agent.setHtml(html); - } - - public void setUpdateListener(Listener<String> updateListener) { - this.updateListener = updateListener; - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlView.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlView.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,8 +0,0 @@ -package org.ourproject.kune.platf.client.ui.rte.edithtml; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.workspace.client.options.AbstractOptionsView; - -public interface EditHtmlView extends AbstractOptionsView, View { - int HEIGHT = 225; -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/editor/EditHtmlAgent.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/editor/EditHtmlAgent.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/editor/EditHtmlAgent.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,8 +0,0 @@ -package org.ourproject.kune.platf.client.ui.rte.edithtml.editor; - -public interface EditHtmlAgent { - - String getHtml(); - - void setHtml(String html); -} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/editor/EditHtmlEditorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/editor/EditHtmlEditorPanel.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/editor/EditHtmlEditorPanel.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -2,7 +2,7 @@ import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; -import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtmlView; +import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtmlDialogView; import com.gwtext.client.widgets.form.TextArea; @@ -15,9 +15,9 @@ super("HTML"); super.setAutoWidth(true); super.setHideLabels(true); - super.setHeight(EditHtmlView.HEIGHT - 20); + super.setHeight(EditHtmlDialogView.HEIGHT - 20); editorField = new TextArea(); - editorField.setHeight(EditHtmlView.HEIGHT - 70); + editorField.setHeight(EditHtmlDialogView.HEIGHT - 70); editorField.setWidth("98%"); editorField.setTabIndex(4); editorField.setName(HTML_FIELD); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/editor/EditHtmlEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/editor/EditHtmlEditorPresenter.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/editor/EditHtmlEditorPresenter.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,14 +1,15 @@ package org.ourproject.kune.platf.client.ui.rte.edithtml.editor; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtml; +import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtmlDialog; +import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtmlAgent; public class EditHtmlEditorPresenter implements EditHtmlEditor, EditHtmlAgent { private EditHtmlEditorView view; - private final EditHtml editHtml; + private final EditHtmlDialog editHtml; - public EditHtmlEditorPresenter(EditHtml editHtml) { + public EditHtmlEditorPresenter(EditHtmlDialog editHtml) { this.editHtml = editHtml; editHtml.setAgent(this); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/preview/EditHtmlPreviewPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/preview/EditHtmlPreviewPanel.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/preview/EditHtmlPreviewPanel.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,7 +1,7 @@ package org.ourproject.kune.platf.client.ui.rte.edithtml.preview; import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtmlView; +import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtmlDialogView; import com.google.gwt.user.client.ui.HTML; import com.gwtext.client.widgets.Panel; @@ -12,7 +12,7 @@ public EditHtmlPreviewPanel(I18nTranslationService i18n, final EditHtmlPreviewPresenter presenter) { setTitle(i18n.t("Preview")); setCls("kune-Content-Main"); - setHeight(EditHtmlView.HEIGHT - 45); + setHeight(EditHtmlDialogView.HEIGHT - 45); setPaddings(5); setAutoScroll(true); setAutoWidth(true); @@ -20,7 +20,7 @@ @Override public void onActivate(Panel panel) { clear(); - setHeight(EditHtmlView.HEIGHT - 45); + setHeight(EditHtmlDialogView.HEIGHT - 45); add(new HTML(presenter.getHtml())); if (isRendered()) { doLayout(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/preview/EditHtmlPreviewPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/preview/EditHtmlPreviewPresenter.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/preview/EditHtmlPreviewPresenter.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,14 +1,14 @@ package org.ourproject.kune.platf.client.ui.rte.edithtml.preview; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtml; +import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtmlDialog; public class EditHtmlPreviewPresenter implements EditHtmlPreview { private EditHtmlPreviewView view; - private final EditHtml editHtml; + private final EditHtmlDialog editHtml; - public EditHtmlPreviewPresenter(EditHtml editHtml) { + public EditHtmlPreviewPresenter(EditHtmlDialog editHtml) { this.editHtml = editHtml; } Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImage.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImage.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImage.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,7 +0,0 @@ -package org.ourproject.kune.platf.client.ui.rte.insertimg; - -import org.ourproject.kune.workspace.client.options.AbstractOptions; - -public interface InsertImage extends AbstractOptions { - -} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialog.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImage.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImage.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialog.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,7 @@ +package org.ourproject.kune.platf.client.ui.rte.insertimg; + +import org.ourproject.kune.workspace.client.options.AbstractOptions; + +public interface InsertImageDialog extends AbstractOptions { + +} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPanel.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImagePanel.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImagePanel.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPanel.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,26 @@ +package org.ourproject.kune.platf.client.ui.rte.insertimg; + +import org.ourproject.kune.platf.client.i18n.I18nTranslationService; +import org.ourproject.kune.platf.client.services.Images; +import org.ourproject.kune.workspace.client.options.AbstractOptionsPanel; + +public class InsertImageDialogPanel extends AbstractOptionsPanel implements InsertImageDialogView { + + private static final String INSERT_IMG_DIALOG = "iip-dial"; + private static final String INSERT_IMG_DIALOG_ERROR_ID = "iip-err"; + private final InsertImageGroup insertImageGroup; + + public InsertImageDialogPanel(final InsertImageDialogPresenter presenter, I18nTranslationService i18n, Images images, + InsertImageGroup insertImageGroup) { + super(INSERT_IMG_DIALOG, i18n.t("Insert an image"), 380, HEIGHT + 90, 380, HEIGHT + 90, true, images, + INSERT_IMG_DIALOG_ERROR_ID); + super.setIconCls("k-picture-icon"); + this.insertImageGroup = insertImageGroup; + } + + @Override + public void createAndShow() { + insertImageGroup.createAll(); + super.createAndShow(); + } +} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPresenter.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImagePresenter.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImagePresenter.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPresenter.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,9 @@ +package org.ourproject.kune.platf.client.ui.rte.insertimg; + +import org.ourproject.kune.workspace.client.options.AbstractOptionsPresenter; + +public class InsertImageDialogPresenter extends AbstractOptionsPresenter implements InsertImageDialog { + + public InsertImageDialogPresenter() { + } +} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogView.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageView.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageView.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogView.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,8 @@ +package org.ourproject.kune.platf.client.ui.rte.insertimg; + +import org.ourproject.kune.platf.client.View; +import org.ourproject.kune.workspace.client.options.AbstractOptionsView; + +public interface InsertImageDialogView extends AbstractOptionsView, View { + int HEIGHT = 225; +} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImagePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImagePanel.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImagePanel.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,26 +0,0 @@ -package org.ourproject.kune.platf.client.ui.rte.insertimg; - -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.services.Images; -import org.ourproject.kune.workspace.client.options.AbstractOptionsPanel; - -public class InsertImagePanel extends AbstractOptionsPanel implements InsertImageView { - - private static final String INSERT_IMG_DIALOG = "iip-dial"; - private static final String INSERT_IMG_DIALOG_ERROR_ID = "iip-err"; - private final InsertImageGroup insertImageGroup; - - public InsertImagePanel(final InsertImagePresenter presenter, I18nTranslationService i18n, Images images, - InsertImageGroup insertImageGroup) { - super(INSERT_IMG_DIALOG, i18n.t("Insert an image"), 380, HEIGHT + 90, 380, HEIGHT + 90, true, images, - INSERT_IMG_DIALOG_ERROR_ID); - super.setIconCls("k-picture-icon"); - this.insertImageGroup = insertImageGroup; - } - - @Override - public void createAndShow() { - insertImageGroup.createAll(); - super.createAndShow(); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImagePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImagePresenter.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImagePresenter.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,9 +0,0 @@ -package org.ourproject.kune.platf.client.ui.rte.insertimg; - -import org.ourproject.kune.workspace.client.options.AbstractOptionsPresenter; - -public class InsertImagePresenter extends AbstractOptionsPresenter implements InsertImage { - - public InsertImagePresenter() { - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageView.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageView.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,8 +0,0 @@ -package org.ourproject.kune.platf.client.ui.rte.insertimg; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.workspace.client.options.AbstractOptionsView; - -public interface InsertImageView extends AbstractOptionsView, View { - int HEIGHT = 225; -} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPanel.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPanel.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -3,7 +3,7 @@ import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.TextUtils; import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; -import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageView; +import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageDialogView; import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.Button; @@ -22,7 +22,7 @@ public InsertImageExtPanel(final InsertImageExtPresenter presenter, I18nTranslationService i18n) { super(i18n.t("External image")); super.setAutoWidth(true); - super.setHeight(InsertImageView.HEIGHT); + super.setHeight(InsertImageDialogView.HEIGHT); linkField = new TextField(); linkField.setTabIndex(1); linkField.setFieldLabel(i18n.t("External image link (URL)")); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPresenter.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPresenter.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,12 +1,12 @@ package org.ourproject.kune.platf.client.ui.rte.insertimg.ext; -import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImage; +import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageDialog; public class InsertImageExtPresenter implements InsertImageExt { - private final InsertImage insertImageDialog; + private final InsertImageDialog insertImageDialog; - public InsertImageExtPresenter(InsertImage insertImageDialog) { + public InsertImageExtPresenter(InsertImageDialog insertImageDialog) { this.insertImageDialog = insertImageDialog; } Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialog.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElement.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElement.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialog.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,34 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.ourproject.kune.platf.client.ui.rte.insertlink; + +import org.ourproject.kune.workspace.client.options.AbstractOptions; + +import com.calclab.suco.client.events.Listener2; + +public interface InsertLinkDialog extends AbstractOptions { + + @Deprecated + void addOnCreateLink(Listener2<String, String> slot); + + @Deprecated + void fireOnCreateLink(String name, String link); + +} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPanel.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElementPanel.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElementPanel.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPanel.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,52 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.ourproject.kune.platf.client.ui.rte.insertlink; + +import org.ourproject.kune.platf.client.i18n.I18nTranslationService; +import org.ourproject.kune.platf.client.services.Images; +import org.ourproject.kune.workspace.client.options.AbstractOptionsPanel; + +import com.calclab.suco.client.events.Listener0; + +public class InsertLinkDialogPanel extends AbstractOptionsPanel implements InsertLinkDialogView { + public static final String TEXT_EDT_INSERT_DIALOG = "k-ted-iep-dialog"; + public static final String TEXT_EDT_INSERT_DIALOG_ERROR_ID = "k-ted-iep-dialog-err"; + private final InsertLinkGroup textEditorInsertElementGroup; + + public InsertLinkDialogPanel(final InsertLinkDialogPresenter presenter, Images images, + I18nTranslationService i18n, final InsertLinkGroup textEditorInsertElementGroup) { + super(TEXT_EDT_INSERT_DIALOG, i18n.tWithNT("Insert a link", + "Option in a text editor to insert links and other elements"), 380, HEIGHT + 90, 380, HEIGHT + 90, + true, images, TEXT_EDT_INSERT_DIALOG_ERROR_ID); + super.setIconCls("k-link-icon"); + this.textEditorInsertElementGroup = textEditorInsertElementGroup; + super.addHideListener(new Listener0() { + public void onEvent() { + textEditorInsertElementGroup.resetAll(); + } + }); + } + + @Override + public void createAndShow() { + textEditorInsertElementGroup.createAll(); + super.createAndShow(); + } +} \ No newline at end of file Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPresenter.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElementPresenter.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElementPresenter.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPresenter.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,52 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.ourproject.kune.platf.client.ui.rte.insertlink; + +import org.ourproject.kune.workspace.client.options.AbstractOptionsPresenter; + +import com.calclab.suco.client.events.Event2; +import com.calclab.suco.client.events.Listener2; + +public class InsertLinkDialogPresenter extends AbstractOptionsPresenter implements InsertLinkDialog { + + private final Event2<String, String> onCreateLink; + + public InsertLinkDialogPresenter() { + this.onCreateLink = new Event2<String, String>("onCreateLink"); + } + + @Deprecated + public void addOnCreateLink(final Listener2<String, String> slot) { + onCreateLink.add(slot); + } + + @Deprecated + public void fireOnCreateLink(String name, String link) { + onCreateLink.fire(name, link); + super.hide(); + } + + @Deprecated + public void fireOnInsertHtml(String name, String link) { + onCreateLink.fire(name, link); + super.hide(); + } + +} \ No newline at end of file Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogView.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElementView.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElementView.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogView.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,27 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.ourproject.kune.platf.client.ui.rte.insertlink; + +import org.ourproject.kune.platf.client.View; +import org.ourproject.kune.workspace.client.options.AbstractOptionsView; + +public interface InsertLinkDialogView extends AbstractOptionsView, View { + int HEIGHT = 225; +} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkGroup.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElementGroup.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElementGroup.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkGroup.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,46 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + \*/ +package org.ourproject.kune.platf.client.ui.rte.insertlink; + +import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.InsertLinkAbstract; + +import com.calclab.suco.client.ioc.Container; +import com.calclab.suco.client.ioc.Provider; +import com.calclab.suco.client.ioc.decorator.ProviderCollection; +import com.calclab.suco.client.ioc.decorator.Singleton; + +public class InsertLinkGroup extends ProviderCollection { + + public InsertLinkGroup(final Container container) { + super(container, Singleton.instance); + } + + public void createAll() { + for (final Provider<?> p : getProviders()) { + p.get(); + } + } + + public void resetAll() { + for (final Provider<?> p : getProviders()) { + ((InsertLinkAbstract) p.get()).reset(); + } + } +} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElement.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElement.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElement.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,34 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.platf.client.ui.rte.insertlink; - -import org.ourproject.kune.workspace.client.options.AbstractOptions; - -import com.calclab.suco.client.events.Listener2; - -public interface TextEditorInsertElement extends AbstractOptions { - - @Deprecated - void addOnCreateLink(Listener2<String, String> slot); - - @Deprecated - void fireOnCreateLink(String name, String link); - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElementGroup.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElementGroup.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElementGroup.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,46 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ -package org.ourproject.kune.platf.client.ui.rte.insertlink; - -import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.TextEditorInsertAbstract; - -import com.calclab.suco.client.ioc.Container; -import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.ioc.decorator.ProviderCollection; -import com.calclab.suco.client.ioc.decorator.Singleton; - -public class TextEditorInsertElementGroup extends ProviderCollection { - - public TextEditorInsertElementGroup(final Container container) { - super(container, Singleton.instance); - } - - public void createAll() { - for (final Provider<?> p : getProviders()) { - p.get(); - } - } - - public void resetAll() { - for (final Provider<?> p : getProviders()) { - ((TextEditorInsertAbstract) p.get()).reset(); - } - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElementPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElementPanel.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElementPanel.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,52 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.platf.client.ui.rte.insertlink; - -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.services.Images; -import org.ourproject.kune.workspace.client.options.AbstractOptionsPanel; - -import com.calclab.suco.client.events.Listener0; - -public class TextEditorInsertElementPanel extends AbstractOptionsPanel implements TextEditorInsertElementView { - public static final String TEXT_EDT_INSERT_DIALOG = "k-ted-iep-dialog"; - public static final String TEXT_EDT_INSERT_DIALOG_ERROR_ID = "k-ted-iep-dialog-err"; - private final TextEditorInsertElementGroup textEditorInsertElementGroup; - - public TextEditorInsertElementPanel(final TextEditorInsertElementPresenter presenter, Images images, - I18nTranslationService i18n, final TextEditorInsertElementGroup textEditorInsertElementGroup) { - super(TEXT_EDT_INSERT_DIALOG, i18n.tWithNT("Insert a link", - "Option in a text editor to insert links and other elements"), 380, HEIGHT + 90, 380, HEIGHT + 90, - true, images, TEXT_EDT_INSERT_DIALOG_ERROR_ID); - super.setIconCls("k-link-icon"); - this.textEditorInsertElementGroup = textEditorInsertElementGroup; - super.addHideListener(new Listener0() { - public void onEvent() { - textEditorInsertElementGroup.resetAll(); - } - }); - } - - @Override - public void createAndShow() { - textEditorInsertElementGroup.createAll(); - super.createAndShow(); - } -} \ No newline at end of file Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElementPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElementPresenter.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElementPresenter.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,52 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.platf.client.ui.rte.insertlink; - -import org.ourproject.kune.workspace.client.options.AbstractOptionsPresenter; - -import com.calclab.suco.client.events.Event2; -import com.calclab.suco.client.events.Listener2; - -public class TextEditorInsertElementPresenter extends AbstractOptionsPresenter implements TextEditorInsertElement { - - private final Event2<String, String> onCreateLink; - - public TextEditorInsertElementPresenter() { - this.onCreateLink = new Event2<String, String>("onCreateLink"); - } - - @Deprecated - public void addOnCreateLink(final Listener2<String, String> slot) { - onCreateLink.add(slot); - } - - @Deprecated - public void fireOnCreateLink(String name, String link) { - onCreateLink.fire(name, link); - super.hide(); - } - - @Deprecated - public void fireOnInsertHtml(String name, String link) { - onCreateLink.fire(name, link); - super.hide(); - } - -} \ No newline at end of file Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElementView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElementView.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/TextEditorInsertElementView.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,27 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.platf.client.ui.rte.insertlink; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.workspace.client.options.AbstractOptionsView; - -public interface TextEditorInsertElementView extends AbstractOptionsView, View { - int HEIGHT = 225; -} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstract.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/TextEditorInsertAbstract.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/TextEditorInsertAbstract.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstract.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,26 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink; + +public interface InsertLinkAbstract { + + void reset(); + +} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstractPresenter.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/TextEditorInsertAbstractPresenter.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/TextEditorInsertAbstractPresenter.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstractPresenter.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,51 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink; + +import org.ourproject.kune.platf.client.View; +import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkDialog; + +public class InsertLinkAbstractPresenter implements InsertLinkAbstract { + + private InsertLinkAbstractView view; + private final InsertLinkDialog editorInsertElement; + + public InsertLinkAbstractPresenter(InsertLinkDialog editorInsertElement) { + this.editorInsertElement = editorInsertElement; + } + + public View getView() { + return view; + } + + public void init(InsertLinkAbstractView view) { + this.view = view; + editorInsertElement.addOptionTab(view); + } + + public void onInsert(String name, String link) { + editorInsertElement.fireOnCreateLink(name, link); + reset(); + } + + public void reset() { + view.reset(); + } +} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstractView.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/TextEditorInsertAbstractView.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/TextEditorInsertAbstractView.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstractView.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,28 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink; + +import org.ourproject.kune.platf.client.View; + +public interface InsertLinkAbstractView extends View { + + void reset(); + +} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/TextEditorInsertAbstract.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/TextEditorInsertAbstract.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/TextEditorInsertAbstract.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,26 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink; - -public interface TextEditorInsertAbstract { - - void reset(); - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/TextEditorInsertAbstractPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/TextEditorInsertAbstractPresenter.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/TextEditorInsertAbstractPresenter.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,51 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.ui.rte.insertlink.TextEditorInsertElement; - -public class TextEditorInsertAbstractPresenter implements TextEditorInsertAbstract { - - private TextEditorInsertAbstractView view; - private final TextEditorInsertElement editorInsertElement; - - public TextEditorInsertAbstractPresenter(TextEditorInsertElement editorInsertElement) { - this.editorInsertElement = editorInsertElement; - } - - public View getView() { - return view; - } - - public void init(TextEditorInsertAbstractView view) { - this.view = view; - editorInsertElement.addOptionTab(view); - } - - public void onInsert(String name, String link) { - editorInsertElement.fireOnCreateLink(name, link); - reset(); - } - - public void reset() { - view.reset(); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/TextEditorInsertAbstractView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/TextEditorInsertAbstractView.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/TextEditorInsertAbstractView.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,28 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink; - -import org.ourproject.kune.platf.client.View; - -public interface TextEditorInsertAbstractView extends View { - - void reset(); - -} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/InsertLinkEmail.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/TextEditorInsertLinkEmail.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/TextEditorInsertLinkEmail.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/InsertLinkEmail.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,26 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.ourproject.kune.platf.client.ui.rte.insertlink.email; + +import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.InsertLinkAbstract; + +public interface InsertLinkEmail extends InsertLinkAbstract { + +} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/InsertLinkEmailPanel.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/TextEditorInsertLinkEmailPanel.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/TextEditorInsertLinkEmailPanel.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/InsertLinkEmailPanel.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,67 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.ourproject.kune.platf.client.ui.rte.insertlink.email; + +import org.ourproject.kune.platf.client.i18n.I18nTranslationService; +import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; +import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkDialogView; + +import com.gwtext.client.core.EventObject; +import com.gwtext.client.widgets.Button; +import com.gwtext.client.widgets.event.ButtonListenerAdapter; +import com.gwtext.client.widgets.form.TextField; +import com.gwtext.client.widgets.form.VType; + +public class InsertLinkEmailPanel extends DefaultForm implements InsertLinkEmailView { + + public static final String EMAIL_FIELD = "k-teilep-email-field"; + private final TextField emailField; + + public InsertLinkEmailPanel(final InsertLinkEmailPresenter presenter, + I18nTranslationService i18n) { + super(i18n.t("Email link")); + super.setAutoWidth(true); + super.setHeight(InsertLinkDialogView.HEIGHT); + emailField = new TextField(); + emailField.setTabIndex(4); + emailField.setFieldLabel(i18n.t("Email")); + emailField.setName(EMAIL_FIELD); + emailField.setVtype(VType.EMAIL); + emailField.setWidth(DEF_MEDIUM_FIELD_WIDTH); + emailField.setAllowBlank(false); + emailField.setValidationEvent(false); + emailField.setId(EMAIL_FIELD); + add(emailField); + Button insert = new Button(i18n.t("Insert")); + insert.addListener(new ButtonListenerAdapter() { + @Override + public void onClick(Button button, EventObject e) { + if (getFormPanel().getForm().isValid()) { + presenter.onInsert("", "mailto://" + emailField.getRawValue()); + } + } + }); + addButton(insert); + } + + public void clear() { + super.reset(); + } +} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/InsertLinkEmailPresenter.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/TextEditorInsertLinkEmailPresenter.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/TextEditorInsertLinkEmailPresenter.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/InsertLinkEmailPresenter.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,32 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.ourproject.kune.platf.client.ui.rte.insertlink.email; + +import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkDialog; +import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.InsertLinkAbstractPresenter; + +public class InsertLinkEmailPresenter extends InsertLinkAbstractPresenter implements + InsertLinkEmail { + + public InsertLinkEmailPresenter(InsertLinkDialog editorInsertElement) { + super(editorInsertElement); + } + +} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/InsertLinkEmailView.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/TextEditorInsertLinkEmailView.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/TextEditorInsertLinkEmailView.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/InsertLinkEmailView.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,25 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.ourproject.kune.platf.client.ui.rte.insertlink.email; + +import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.InsertLinkAbstractView; + +public interface InsertLinkEmailView extends InsertLinkAbstractView { +} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/TextEditorInsertLinkEmail.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/TextEditorInsertLinkEmail.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/TextEditorInsertLinkEmail.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,26 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.platf.client.ui.rte.insertlink.email; - -import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.TextEditorInsertAbstract; - -public interface TextEditorInsertLinkEmail extends TextEditorInsertAbstract { - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/TextEditorInsertLinkEmailPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/TextEditorInsertLinkEmailPanel.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/TextEditorInsertLinkEmailPanel.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,67 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.platf.client.ui.rte.insertlink.email; - -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; -import org.ourproject.kune.platf.client.ui.rte.insertlink.TextEditorInsertElementView; - -import com.gwtext.client.core.EventObject; -import com.gwtext.client.widgets.Button; -import com.gwtext.client.widgets.event.ButtonListenerAdapter; -import com.gwtext.client.widgets.form.TextField; -import com.gwtext.client.widgets.form.VType; - -public class TextEditorInsertLinkEmailPanel extends DefaultForm implements TextEditorInsertLinkEmailView { - - public static final String EMAIL_FIELD = "k-teilep-email-field"; - private final TextField emailField; - - public TextEditorInsertLinkEmailPanel(final TextEditorInsertLinkEmailPresenter presenter, - I18nTranslationService i18n) { - super(i18n.t("Email link")); - super.setAutoWidth(true); - super.setHeight(TextEditorInsertElementView.HEIGHT); - emailField = new TextField(); - emailField.setTabIndex(4); - emailField.setFieldLabel(i18n.t("Email")); - emailField.setName(EMAIL_FIELD); - emailField.setVtype(VType.EMAIL); - emailField.setWidth(DEF_MEDIUM_FIELD_WIDTH); - emailField.setAllowBlank(false); - emailField.setValidationEvent(false); - emailField.setId(EMAIL_FIELD); - add(emailField); - Button insert = new Button(i18n.t("Insert")); - insert.addListener(new ButtonListenerAdapter() { - @Override - public void onClick(Button button, EventObject e) { - if (getFormPanel().getForm().isValid()) { - presenter.onInsert("", "mailto://" + emailField.getRawValue()); - } - } - }); - addButton(insert); - } - - public void clear() { - super.reset(); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/TextEditorInsertLinkEmailPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/TextEditorInsertLinkEmailPresenter.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/TextEditorInsertLinkEmailPresenter.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,32 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.platf.client.ui.rte.insertlink.email; - -import org.ourproject.kune.platf.client.ui.rte.insertlink.TextEditorInsertElement; -import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.TextEditorInsertAbstractPresenter; - -public class TextEditorInsertLinkEmailPresenter extends TextEditorInsertAbstractPresenter implements - TextEditorInsertLinkEmail { - - public TextEditorInsertLinkEmailPresenter(TextEditorInsertElement editorInsertElement) { - super(editorInsertElement); - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/TextEditorInsertLinkEmailView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/TextEditorInsertLinkEmailView.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/TextEditorInsertLinkEmailView.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,25 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.platf.client.ui.rte.insertlink.email; - -import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.TextEditorInsertAbstractView; - -public interface TextEditorInsertLinkEmailView extends TextEditorInsertAbstractView { -} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExt.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/TextEditorInsertLinkExt.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/TextEditorInsertLinkExt.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExt.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,26 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.ourproject.kune.platf.client.ui.rte.insertlink.ext; + +import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.InsertLinkAbstract; + +public interface InsertLinkExt extends InsertLinkAbstract { + +} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPanel.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/TextEditorInsertLinkExtPanel.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/TextEditorInsertLinkExtPanel.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPanel.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,103 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.ourproject.kune.platf.client.ui.rte.insertlink.ext; + +import org.ourproject.kune.platf.client.i18n.I18nTranslationService; +import org.ourproject.kune.platf.client.ui.TextUtils; +import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; +import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkDialogView; + +import com.google.gwt.user.client.ui.Frame; +import com.gwtext.client.core.EventObject; +import com.gwtext.client.widgets.Button; +import com.gwtext.client.widgets.PaddedPanel; +import com.gwtext.client.widgets.Panel; +import com.gwtext.client.widgets.event.ButtonListenerAdapter; +import com.gwtext.client.widgets.form.TextField; +import com.gwtext.client.widgets.layout.FitLayout; + +public class InsertLinkExtPanel extends DefaultForm implements InsertLinkExtView { + + public static final String LINK_FIELD = "k-teilep-link-f"; + final TextField linkField; + final Panel previewPanel; + + public InsertLinkExtPanel(final InsertLinkExtPresenter presenter, + final I18nTranslationService i18n) { + super(i18n.t("External link")); + super.setAutoWidth(true); + super.setHeight(InsertLinkDialogView.HEIGHT); + linkField = new TextField(); + linkField.setTabIndex(1); + linkField.setFieldLabel(i18n.t("External link (URL)")); + linkField.setRegex(TextUtils.URL_REGEXP); + linkField.setRegexText(i18n.t("The link should be a URL in the format 'http://www.domain.com'")); + linkField.setName(LINK_FIELD); + linkField.setWidth(DEF_FIELD_WIDTH); + linkField.setAllowBlank(false); + linkField.setMinLength(3); + linkField.setMaxLength(250); + linkField.setValidationEvent(false); + linkField.setId(LINK_FIELD); + add(linkField); + previewPanel = new Panel(); + previewPanel.setLayout(new FitLayout()); + previewPanel.setHeight(125); + add(new PaddedPanel(previewPanel, 0)); + Button preview = new Button(i18n.t("Preview")); + preview.addListener(new ButtonListenerAdapter() { + @Override + public void onClick(Button button, EventObject e) { + presenter.onPreview(); + } + }); + addButton(preview); + + Button insert = new Button(i18n.t("Insert")); + insert.addListener(new ButtonListenerAdapter() { + @Override + public void onClick(Button button, EventObject e) { + presenter.onInsert(); + } + }); + addButton(insert); + } + + public String getUrl() { + return linkField.getRawValue(); + } + + @Override + public void reset() { + super.reset(); + previewPanel.clear(); + } + + public void setPreviewUrl(String url) { + Frame previewFrame = new Frame(url); + previewPanel.clear(); + previewPanel.add(previewFrame); + previewPanel.doLayout(); + } + + public void setUrl(String url) { + linkField.setValue(url); + } +} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPresenter.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/TextEditorInsertLinkExtPresenter.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/TextEditorInsertLinkExtPresenter.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPresenter.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,79 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.ourproject.kune.platf.client.ui.rte.insertlink.ext; + +import org.ourproject.kune.platf.client.ui.TextUtils; +import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkDialog; +import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.InsertLinkAbstractPresenter; + +public class InsertLinkExtPresenter extends InsertLinkAbstractPresenter implements + InsertLinkExt { + + interface Action { + void onValid(String url); + } + + private InsertLinkExtView view; + + public InsertLinkExtPresenter(InsertLinkDialog editorInsertElement) { + super(editorInsertElement); + } + + public void init(InsertLinkExtView view) { + super.init(view); + this.view = view; + } + + public void onInsert() { + doActionIfValid(new Action() { + public void onValid(String url) { + onInsert("", url); + } + }); + } + + public void onPreview() { + doActionIfValid(new Action() { + public void onValid(String url) { + view.setPreviewUrl(url); + } + }); + } + + private void doActionIfValid(Action action) { + String url = view.getUrl(); + if (url.matches(TextUtils.URL_REGEXP)) { + action.onValid(url); + } else { + if (!url.startsWith("http://")) { + url = "http://" + url; + if (url.matches(TextUtils.URL_REGEXP)) { + view.setUrl(url); + action.onValid(url); + } else { + view.isValid(); + } + } else { + // Seems is not valid + view.isValid(); + } + } + } +} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtView.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/TextEditorInsertLinkExtView.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/TextEditorInsertLinkExtView.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtView.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,33 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.ourproject.kune.platf.client.ui.rte.insertlink.ext; + +import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.InsertLinkAbstractView; + +public interface InsertLinkExtView extends InsertLinkAbstractView { + + public String getUrl(); + + public boolean isValid(); + + public void setPreviewUrl(String url); + + public void setUrl(String url); +} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/TextEditorInsertLinkExt.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/TextEditorInsertLinkExt.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/TextEditorInsertLinkExt.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,26 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.platf.client.ui.rte.insertlink.ext; - -import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.TextEditorInsertAbstract; - -public interface TextEditorInsertLinkExt extends TextEditorInsertAbstract { - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/TextEditorInsertLinkExtPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/TextEditorInsertLinkExtPanel.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/TextEditorInsertLinkExtPanel.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,103 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.platf.client.ui.rte.insertlink.ext; - -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.ui.TextUtils; -import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; -import org.ourproject.kune.platf.client.ui.rte.insertlink.TextEditorInsertElementView; - -import com.google.gwt.user.client.ui.Frame; -import com.gwtext.client.core.EventObject; -import com.gwtext.client.widgets.Button; -import com.gwtext.client.widgets.PaddedPanel; -import com.gwtext.client.widgets.Panel; -import com.gwtext.client.widgets.event.ButtonListenerAdapter; -import com.gwtext.client.widgets.form.TextField; -import com.gwtext.client.widgets.layout.FitLayout; - -public class TextEditorInsertLinkExtPanel extends DefaultForm implements TextEditorInsertLinkExtView { - - public static final String LINK_FIELD = "k-teilep-link-f"; - final TextField linkField; - final Panel previewPanel; - - public TextEditorInsertLinkExtPanel(final TextEditorInsertLinkExtPresenter presenter, - final I18nTranslationService i18n) { - super(i18n.t("External link")); - super.setAutoWidth(true); - super.setHeight(TextEditorInsertElementView.HEIGHT); - linkField = new TextField(); - linkField.setTabIndex(1); - linkField.setFieldLabel(i18n.t("External link (URL)")); - linkField.setRegex(TextUtils.URL_REGEXP); - linkField.setRegexText(i18n.t("The link should be a URL in the format 'http://www.domain.com'")); - linkField.setName(LINK_FIELD); - linkField.setWidth(DEF_FIELD_WIDTH); - linkField.setAllowBlank(false); - linkField.setMinLength(3); - linkField.setMaxLength(250); - linkField.setValidationEvent(false); - linkField.setId(LINK_FIELD); - add(linkField); - previewPanel = new Panel(); - previewPanel.setLayout(new FitLayout()); - previewPanel.setHeight(125); - add(new PaddedPanel(previewPanel, 0)); - Button preview = new Button(i18n.t("Preview")); - preview.addListener(new ButtonListenerAdapter() { - @Override - public void onClick(Button button, EventObject e) { - presenter.onPreview(); - } - }); - addButton(preview); - - Button insert = new Button(i18n.t("Insert")); - insert.addListener(new ButtonListenerAdapter() { - @Override - public void onClick(Button button, EventObject e) { - presenter.onInsert(); - } - }); - addButton(insert); - } - - public String getUrl() { - return linkField.getRawValue(); - } - - @Override - public void reset() { - super.reset(); - previewPanel.clear(); - } - - public void setPreviewUrl(String url) { - Frame previewFrame = new Frame(url); - previewPanel.clear(); - previewPanel.add(previewFrame); - previewPanel.doLayout(); - } - - public void setUrl(String url) { - linkField.setValue(url); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/TextEditorInsertLinkExtPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/TextEditorInsertLinkExtPresenter.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/TextEditorInsertLinkExtPresenter.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,79 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.platf.client.ui.rte.insertlink.ext; - -import org.ourproject.kune.platf.client.ui.TextUtils; -import org.ourproject.kune.platf.client.ui.rte.insertlink.TextEditorInsertElement; -import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.TextEditorInsertAbstractPresenter; - -public class TextEditorInsertLinkExtPresenter extends TextEditorInsertAbstractPresenter implements - TextEditorInsertLinkExt { - - interface Action { - void onValid(String url); - } - - private TextEditorInsertLinkExtView view; - - public TextEditorInsertLinkExtPresenter(TextEditorInsertElement editorInsertElement) { - super(editorInsertElement); - } - - public void init(TextEditorInsertLinkExtView view) { - super.init(view); - this.view = view; - } - - public void onInsert() { - doActionIfValid(new Action() { - public void onValid(String url) { - onInsert("", url); - } - }); - } - - public void onPreview() { - doActionIfValid(new Action() { - public void onValid(String url) { - view.setPreviewUrl(url); - } - }); - } - - private void doActionIfValid(Action action) { - String url = view.getUrl(); - if (url.matches(TextUtils.URL_REGEXP)) { - action.onValid(url); - } else { - if (!url.startsWith("http://")) { - url = "http://" + url; - if (url.matches(TextUtils.URL_REGEXP)) { - view.setUrl(url); - action.onValid(url); - } else { - view.isValid(); - } - } else { - // Seems is not valid - view.isValid(); - } - } - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/TextEditorInsertLinkExtView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/TextEditorInsertLinkExtView.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/TextEditorInsertLinkExtView.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,33 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.platf.client.ui.rte.insertlink.ext; - -import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.TextEditorInsertAbstractView; - -public interface TextEditorInsertLinkExtView extends TextEditorInsertAbstractView { - - public String getUrl(); - - public boolean isValid(); - - public void setPreviewUrl(String url); - - public void setUrl(String url); -} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditor.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditor.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -8,20 +8,36 @@ public interface RTESavingEditor { + /** + * Start to edit some html code + * + * @param html + * the html text to edit + * @param onSave + * the save action (when user click the save button) + * @param onEditCancelled + * the cancel action (when user click the cancel/close button) + */ void edit(String html, Listener<String> onSave, Listener0 onEditCancelled); RTEditor getBasicEditor(); /** - * This is use for listen to changes as url changes, window close, and - * save/cancel or stop these actions + * This is used for listen to changes that affect the edition as url + * changes, window close, to save/cancel or stop these actions * - * @return + * @return the listener */ BeforeActionListener getBeforeSavingListener(); + /** + * Call this when your save action is successful + */ void onSavedSuccessful(); + /** + * Call this when your save action fails + */ void onSaveFailed(); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/KuneWorkspaceModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/KuneWorkspaceModule.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/KuneWorkspaceModule.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -49,10 +49,10 @@ import org.ourproject.kune.platf.client.ui.rte.TestRTEDialog; import org.ourproject.kune.platf.client.ui.rte.basic.RTEditor; import org.ourproject.kune.platf.client.ui.rte.img.RTEImgResources; -import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImage; +import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageDialog; import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageGroup; -import org.ourproject.kune.platf.client.ui.rte.insertlink.TextEditorInsertElement; -import org.ourproject.kune.platf.client.ui.rte.insertlink.TextEditorInsertElementGroup; +import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkDialog; +import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkGroup; import org.ourproject.kune.platf.client.ui.rte.saving.RTESavingEditorPanel; import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper; import org.ourproject.kune.platf.client.utils.TimerWrapper; @@ -73,9 +73,9 @@ import org.ourproject.kune.workspace.client.editor.insertlocalimg.InsertImageLocal; import org.ourproject.kune.workspace.client.editor.insertlocalimg.InsertImageLocalPanel; import org.ourproject.kune.workspace.client.editor.insertlocalimg.InsertImageLocalPresenter; -import org.ourproject.kune.workspace.client.editor.insertlocallink.TextEditorInsertLinkLocal; -import org.ourproject.kune.workspace.client.editor.insertlocallink.TextEditorInsertLinkLocalPanel; -import org.ourproject.kune.workspace.client.editor.insertlocallink.TextEditorInsertLinkLocalPresenter; +import org.ourproject.kune.workspace.client.editor.insertlocallink.InsertLinkLocal; +import org.ourproject.kune.workspace.client.editor.insertlocallink.InsertLinkLocalPanel; +import org.ourproject.kune.workspace.client.editor.insertlocallink.InsertLinkLocalPresenter; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.entityheader.EntityHeaderPanel; import org.ourproject.kune.workspace.client.entityheader.EntityHeaderPresenter; @@ -806,13 +806,13 @@ } }); - register(TextEditorInsertElementGroup.class, new Factory<TextEditorInsertLinkLocal>( - TextEditorInsertLinkLocal.class) { + register(InsertLinkGroup.class, new Factory<InsertLinkLocal>( + InsertLinkLocal.class) { @Override - public TextEditorInsertLinkLocal create() { - final TextEditorInsertLinkLocalPresenter presenter = new TextEditorInsertLinkLocalPresenter( - $(TextEditorInsertElement.class)); - final TextEditorInsertLinkLocalPanel panel = new TextEditorInsertLinkLocalPanel(presenter, + public InsertLinkLocal create() { + final InsertLinkLocalPresenter presenter = new InsertLinkLocalPresenter( + $(InsertLinkDialog.class)); + final InsertLinkLocalPanel panel = new InsertLinkLocalPanel(presenter, $(WorkspaceSkeleton.class), $(I18nTranslationService.class), $(FileDownloadUtils.class)); presenter.init(panel); return presenter; @@ -928,7 +928,7 @@ register(InsertImageGroup.class, new Factory<InsertImageLocal>(InsertImageLocal.class) { @Override public InsertImageLocal create() { - final InsertImageLocalPresenter presenter = new InsertImageLocalPresenter($(InsertImage.class)); + final InsertImageLocalPresenter presenter = new InsertImageLocalPresenter($(InsertImageDialog.class)); final InsertImageLocalPanel panel = new InsertImageLocalPanel(presenter, $(I18nTranslationService.class)); presenter.init(panel); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -2,7 +2,7 @@ import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.TextUtils; -import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageView; +import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageDialogView; import com.google.gwt.user.client.ui.Label; import com.gwtext.client.widgets.Panel; @@ -12,7 +12,7 @@ public InsertImageLocalPanel(final InsertImageLocalPresenter presenter, I18nTranslationService i18n) { super(i18n.t("Local image")); setAutoWidth(true); - setHeight(InsertImageView.HEIGHT); + setHeight(InsertImageDialogView.HEIGHT); setPaddings(20); add(new Label(TextUtils.IN_DEVELOPMENT)); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPresenter.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPresenter.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,12 +1,12 @@ package org.ourproject.kune.workspace.client.editor.insertlocalimg; -import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImage; +import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageDialog; public class InsertImageLocalPresenter implements InsertImageLocal { - private final InsertImage insertImageDialog; + private final InsertImageDialog insertImageDialog; - public InsertImageLocalPresenter(InsertImage insertImageDialog) { + public InsertImageLocalPresenter(InsertImageDialog insertImageDialog) { this.insertImageDialog = insertImageDialog; } Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocal.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/TextEditorInsertLinkLocal.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/TextEditorInsertLinkLocal.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocal.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,26 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.ourproject.kune.workspace.client.editor.insertlocallink; + +import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.InsertLinkAbstract; + +public interface InsertLinkLocal extends InsertLinkAbstract { + +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/TextEditorInsertLinkLocalPanel.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/TextEditorInsertLinkLocalPanel.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,51 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.ourproject.kune.workspace.client.editor.insertlocallink; + +import org.ourproject.kune.platf.client.dto.LinkDTO; +import org.ourproject.kune.platf.client.dto.StateToken; +import org.ourproject.kune.platf.client.i18n.I18nTranslationService; +import org.ourproject.kune.platf.client.ui.WindowUtils; +import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkDialogView; +import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherPanel; +import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; + +import com.calclab.suco.client.events.Listener; + +public class InsertLinkLocalPanel extends AbstractLiveSearcherPanel implements InsertLinkLocalView { + + private static final String DATA_PROXY_URL = "/kune/json/ContentJSONService/search"; + + public InsertLinkLocalPanel(final InsertLinkLocalPresenter presenter, + final WorkspaceSkeleton ws, I18nTranslationService i18n, FileDownloadUtils downloadUtils) { + super(i18n, TEMPLATE_TEXT_PREFIX + downloadUtils.getLogoImageUrl(new StateToken("{shortName}")) + + TEMPLATE_TEXT_SUFFIX, DATA_PROXY_URL, new Listener<LinkDTO>() { + public void onEvent(LinkDTO link) { + // FIXME + presenter.onInsert("", WindowUtils.getLocation().getHref() + link.getLink()); + } + }); + super.setTitle(i18n.t("Local link")); + super.setFrame(true); + super.setHeight(InsertLinkDialogView.HEIGHT); + super.setPaddings(20); + } +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPresenter.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/TextEditorInsertLinkLocalPresenter.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/TextEditorInsertLinkLocalPresenter.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPresenter.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,32 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.ourproject.kune.workspace.client.editor.insertlocallink; + +import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkDialog; +import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.InsertLinkAbstractPresenter; + +public class InsertLinkLocalPresenter extends InsertLinkAbstractPresenter implements + InsertLinkLocal { + + public InsertLinkLocalPresenter(InsertLinkDialog editorInsertElement) { + super(editorInsertElement); + } + +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalView.java (from rev 1069, trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/TextEditorInsertLinkLocalView.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/TextEditorInsertLinkLocalView.java 2009-03-11 13:21:45 UTC (rev 1069) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalView.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -0,0 +1,25 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.ourproject.kune.workspace.client.editor.insertlocallink; + +import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.InsertLinkAbstractView; + +public interface InsertLinkLocalView extends InsertLinkAbstractView { +} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/TextEditorInsertLinkLocal.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/TextEditorInsertLinkLocal.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/TextEditorInsertLinkLocal.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,26 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.workspace.client.editor.insertlocallink; - -import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.TextEditorInsertAbstract; - -public interface TextEditorInsertLinkLocal extends TextEditorInsertAbstract { - -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/TextEditorInsertLinkLocalPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/TextEditorInsertLinkLocalPanel.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/TextEditorInsertLinkLocalPanel.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,51 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.workspace.client.editor.insertlocallink; - -import org.ourproject.kune.platf.client.dto.LinkDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.ui.WindowUtils; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; -import org.ourproject.kune.platf.client.ui.rte.insertlink.TextEditorInsertElementView; -import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - -import com.calclab.suco.client.events.Listener; - -public class TextEditorInsertLinkLocalPanel extends AbstractLiveSearcherPanel implements TextEditorInsertLinkLocalView { - - private static final String DATA_PROXY_URL = "/kune/json/ContentJSONService/search"; - - public TextEditorInsertLinkLocalPanel(final TextEditorInsertLinkLocalPresenter presenter, - final WorkspaceSkeleton ws, I18nTranslationService i18n, FileDownloadUtils downloadUtils) { - super(i18n, TEMPLATE_TEXT_PREFIX + downloadUtils.getLogoImageUrl(new StateToken("{shortName}")) - + TEMPLATE_TEXT_SUFFIX, DATA_PROXY_URL, new Listener<LinkDTO>() { - public void onEvent(LinkDTO link) { - // FIXME - presenter.onInsert("", WindowUtils.getLocation().getHref() + link.getLink()); - } - }); - super.setTitle(i18n.t("Local link")); - super.setFrame(true); - super.setHeight(TextEditorInsertElementView.HEIGHT); - super.setPaddings(20); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/TextEditorInsertLinkLocalPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/TextEditorInsertLinkLocalPresenter.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/TextEditorInsertLinkLocalPresenter.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,32 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.workspace.client.editor.insertlocallink; - -import org.ourproject.kune.platf.client.ui.rte.insertlink.TextEditorInsertElement; -import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.TextEditorInsertAbstractPresenter; - -public class TextEditorInsertLinkLocalPresenter extends TextEditorInsertAbstractPresenter implements - TextEditorInsertLinkLocal { - - public TextEditorInsertLinkLocalPresenter(TextEditorInsertElement editorInsertElement) { - super(editorInsertElement); - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/TextEditorInsertLinkLocalView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/TextEditorInsertLinkLocalView.java 2009-03-11 13:47:13 UTC (rev 1070) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/TextEditorInsertLinkLocalView.java 2009-03-11 14:08:13 UTC (rev 1071) @@ -1,25 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.workspace.client.editor.insertlocallink; - -import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.TextEditorInsertAbstractView; - -public interface TextEditorInsertLinkLocalView extends TextEditorInsertAbstractView { -}