Merge security.ui bundle in the cms.ui.workbench bundle

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / text / Img.java

diff --git a/org.argeo.cms/src/org/argeo/cms/text/Img.java b/org.argeo.cms/src/org/argeo/cms/text/Img.java
index 54f702bbafb90f656adc55dca09792078671d80b..8c23109bfade8513d77a65432cb3abc12dd55175 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/text/Img.java
+++ b/org.argeo.cms/src/org/argeo/cms/text/Img.java
@@ -5,16 +5,15 @@ import javax.jcr.RepositoryException;
 
 import org.argeo.cms.CmsException;
 import org.argeo.cms.CmsImageManager;
-import org.argeo.cms.CmsSession;
 import org.argeo.cms.internal.JcrFileUploadReceiver;
 import org.argeo.cms.util.CmsUtils;
 import org.argeo.cms.viewers.NodePart;
 import org.argeo.cms.viewers.Section;
 import org.argeo.cms.viewers.SectionPart;
 import org.argeo.cms.widgets.EditableImage;
-import org.eclipse.rap.addons.fileupload.FileUploadHandler;
-import org.eclipse.rap.addons.fileupload.FileUploadListener;
-import org.eclipse.rap.addons.fileupload.FileUploadReceiver;
+import org.eclipse.rap.fileupload.FileUploadHandler;
+import org.eclipse.rap.fileupload.FileUploadListener;
+import org.eclipse.rap.fileupload.FileUploadReceiver;
 import org.eclipse.rap.rwt.service.ServerPushSession;
 import org.eclipse.rap.rwt.widgets.FileUpload;
 import org.eclipse.swt.SWT;
@@ -51,7 +50,7 @@ public class Img extends EditableImage implements SectionPart, NodePart {
                        Point preferredImageSize) throws RepositoryException {
                super(parent, swtStyle, imgNode, false, preferredImageSize);
                this.section = section;
-               imageManager = CmsSession.current.get().getImageManager();
+               imageManager = CmsUtils.getCmsView().getImageManager();
                CmsUtils.style(this, TextStyles.TEXT_IMG);
        }
 
@@ -93,8 +92,7 @@ public class Img extends EditableImage implements SectionPart, NodePart {
                // FileDialog fileDialog = new FileDialog(getShell());
                // fileDialog.open();
                // String fileName = fileDialog.getFileName();
-               CmsImageManager imageManager = CmsSession.current.get()
-                               .getImageManager();
+               CmsImageManager imageManager = CmsUtils.getCmsView().getImageManager();
                Node node = getNode();
                JcrFileUploadReceiver receiver = new JcrFileUploadReceiver(
                                node.getParent(), node.getName() + '[' + node.getIndex() + ']',