From deff1ebf635c211d9151660d9440c58460f67c81 Mon Sep 17 00:00:00 2001 From: jensp Date: Tue, 17 Jun 2014 07:05:20 +0000 Subject: [PATCH] Simplified uploading multiple images. The image upload in the images tab now returns to itself instead of the library component. git-svn-id: https://svn.libreccm.org/ccm/trunk@2703 8810af33-2d31-482b-a856-94f89814c4df --- .../cms/ui/ImageComponentAdminListener.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ImageComponentAdminListener.java b/ccm-cms/src/com/arsdigita/cms/ui/ImageComponentAdminListener.java index 9da2d993b..7ca94f796 100644 --- a/ccm-cms/src/com/arsdigita/cms/ui/ImageComponentAdminListener.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ImageComponentAdminListener.java @@ -23,22 +23,27 @@ class ImageComponentAdminListener extends ImageComponentAbstractListener impleme private final ComponentMap m_pane; - public ImageComponentAdminListener(MapComponentSelectionModel imageComponent, ComponentMap pane) { + public ImageComponentAdminListener(final MapComponentSelectionModel imageComponent, + final ComponentMap pane) { super(imageComponent); m_pane = pane; } @Override - protected void cancelled(PageState ps) { - m_pane.reset(ps); + protected void cancelled(final PageState state) { + m_pane.reset(state); } @Override - protected void processImage(FormSectionEvent event, PageState ps, ImageComponent component, ReusableImageAsset image) { - m_pane.reset(ps); + protected void processImage(final FormSectionEvent event, + final PageState state, + final ImageComponent component, + final ReusableImageAsset image) { + //m_pane.reset(state); } - public void actionPerformed(ActionEvent ev) { - setImageComponent(ev.getPageState(), ImageComponent.UPLOAD); + @Override + public void actionPerformed(final ActionEvent event) { + setImageComponent(event.getPageState(), ImageComponent.UPLOAD); } }