X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Ffs%2FFsContextMenu.java;h=c548e2aa0b0cfdd25bf7ffcce158d9334886ba3c;hb=633a8acd189cc22f06944d278879601189be1bc8;hp=f45629b04278900acb7bdf1b6237bce83c85ee1c;hpb=5b3108fe285bca50565b58b63fa4feddc96c0765;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/fs/FsContextMenu.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/fs/FsContextMenu.java index f45629b04..c548e2aa0 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/fs/FsContextMenu.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/fs/FsContextMenu.java @@ -15,10 +15,9 @@ import java.util.List; import java.util.Map; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.cms.CmsException; -import org.argeo.cms.ui.util.CmsUiUtils; +import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.dialogs.SingleValue; import org.eclipse.jface.dialogs.MessageDialog; @@ -40,7 +39,7 @@ import org.eclipse.swt.widgets.Shell; public class FsContextMenu extends Shell { private static final long serialVersionUID = -9120261153509855795L; - private final static Log log = LogFactory.getLog(FsContextMenu.class); + private final static CmsLog log = CmsLog.getLog(FsContextMenu.class); // Default known actions public final static String ACTION_ID_CREATE_FOLDER = "createFolder"; @@ -70,7 +69,7 @@ public class FsContextMenu extends Shell { Composite boxCmp = new Composite(this, SWT.NO_FOCUS | SWT.BORDER); boxCmp.setLayout(EclipseUiUtils.noSpaceGridLayout()); - CmsUiUtils.style(boxCmp, FsStyles.CONTEXT_MENU_BOX); + CmsSwtUtils.style(boxCmp, FsStyles.CONTEXT_MENU_BOX); createContextMenu(boxCmp); addShellListener(new ActionsShellListener()); @@ -82,8 +81,8 @@ public class FsContextMenu extends Shell { Button btn = new Button(boxCmp, SWT.FLAT | SWT.PUSH | SWT.LEAD); btn.setText(getLabel(actionId)); btn.setLayoutData(EclipseUiUtils.fillWidth()); - CmsUiUtils.markup(btn); - CmsUiUtils.style(btn, actionId + FsStyles.BUTTON_SUFFIX); + CmsSwtUtils.markup(btn); + CmsSwtUtils.style(btn, actionId + FsStyles.BUTTON_SUFFIX); btn.setData(KEY_ACTION_ID, actionId); btn.addSelectionListener(asl); actionButtons.put(actionId, btn);