import javax.jcr.Item;
+import org.argeo.api.cms.CmsTheme;
import org.argeo.cms.Localized;
-import org.argeo.cms.ui.CmsTheme;
-import org.argeo.cms.ui.util.CmsIcon;
-import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.cms.swt.CmsIcon;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.ui.viewers.EditablePart;
import org.argeo.cms.ui.widgets.ContextOverlay;
import org.argeo.cms.ui.widgets.StyledControl;
throw new IllegalArgumentException("Item cannot be null");
this.termsManager = termsManager;
this.typology = termsManager.getTypology(typology);
- this.theme = CmsTheme.getCmsTheme(parent);
+ this.theme = CmsSwtUtils.getCmsTheme(parent);
editable = !(SWT.READ_ONLY == (style & SWT.READ_ONLY));
highlightColor = parent.getDisplay().getSystemColor(SWT.COLOR_GRAY);
}
}
protected void setControlLayoutData(Control control) {
- control.setLayoutData(CmsUiUtils.fillAll());
+ control.setLayoutData(CmsSwtUtils.fillAll());
}
protected void setContainerLayoutData(Composite composite) {
- composite.setLayoutData(CmsUiUtils.fillAll());
+ composite.setLayoutData(CmsSwtUtils.fillAll());
}
//
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.argeo.cms.swt.CmsSwtUtils;
+import org.argeo.cms.swt.MouseDoubleClick;
+import org.argeo.cms.swt.MouseDown;
+import org.argeo.cms.swt.Selected;
import org.argeo.cms.ui.forms.FormStyle;
-import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.cms.ui.viewers.EditablePart;
import org.argeo.cms.ui.widgets.ContextOverlay;
-import org.argeo.eclipse.ui.MouseDoubleClick;
-import org.argeo.eclipse.ui.MouseDown;
-import org.argeo.eclipse.ui.Selected;
import org.argeo.entity.Term;
import org.argeo.entity.TermsManager;
import org.argeo.jcr.Jcr;
boolean vertical = SWT.VERTICAL == (getStyle() & SWT.VERTICAL);
RowLayout rl = new RowLayout(vertical ? SWT.VERTICAL : SWT.HORIZONTAL);
- rl = CmsUiUtils.noMarginsRowLayout(rl);
+ rl = CmsSwtUtils.noMarginsRowLayout(rl);
// rl.wrap = true;
// rl.justify = true;
placeholder.setLayout(rl);
if (currentValue != null && !currentValue.isEmpty()) {
for (Term value : currentValue) {
Composite block = new Composite(placeholder, SWT.NONE);
- block.setLayout(CmsUiUtils.noSpaceGridLayout(3));
+ block.setLayout(CmsSwtUtils.noSpaceGridLayout(3));
Label lbl = new Label(block, SWT.NONE);
String display = getTermLabel(value);
lbl.setText(display);
- CmsUiUtils.style(lbl, style == null ? FormStyle.propertyText.style() : style);
+ CmsSwtUtils.style(lbl, style == null ? FormStyle.propertyText.style() : style);
processTermListLabel(value, lbl);
if (isEditable())
lbl.addMouseListener((MouseDoubleClick) (e) -> {
if (isEditing()) {
Composite block = new Composite(placeholder, SWT.NONE);
- block.setLayout(CmsUiUtils.noSpaceGridLayout(3));
+ block.setLayout(CmsSwtUtils.noSpaceGridLayout(3));
createHighlight(block);
Text txt = new Text(block, SWT.SINGLE | SWT.BORDER);
- txt.setLayoutData(CmsUiUtils.fillWidth());
+ txt.setLayoutData(CmsSwtUtils.fillWidth());
// txt.setMessage("[new]");
- CmsUiUtils.style(txt, style == null ? FormStyle.propertyText.style() : style);
+ CmsSwtUtils.style(txt, style == null ? FormStyle.propertyText.style() : style);
ToolBar toolBar = new ToolBar(block, SWT.HORIZONTAL);
ToolItem cancelItem = new ToolItem(toolBar, SWT.FLAT);
@Override
protected void refresh(ContextOverlay contextArea, String filter, Text txt) {
- CmsUiUtils.clear(contextArea);
+ CmsSwtUtils.clear(contextArea);
List<? extends Term> terms = termsManager.listAllTerms(typology.getId());
List<Term> currentValue = getValue();
terms: for (Term term : terms) {
import javax.jcr.Item;
+import org.argeo.cms.swt.CmsSwtUtils;
+import org.argeo.cms.swt.MouseDoubleClick;
+import org.argeo.cms.swt.MouseDown;
+import org.argeo.cms.swt.Selected;
import org.argeo.cms.ui.forms.FormStyle;
-import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.cms.ui.viewers.EditablePart;
import org.argeo.cms.ui.widgets.ContextOverlay;
-import org.argeo.eclipse.ui.MouseDoubleClick;
-import org.argeo.eclipse.ui.MouseDown;
-import org.argeo.eclipse.ui.Selected;
import org.argeo.entity.Term;
import org.argeo.entity.TermsManager;
import org.argeo.jcr.Jcr;
protected Control createControl(Composite box, String style) {
if (isEditing()) {
Composite block = new Composite(box, SWT.NONE);
- block.setLayout(CmsUiUtils.noSpaceGridLayout(3));
+ block.setLayout(CmsSwtUtils.noSpaceGridLayout(3));
createHighlight(block);
Text txt = new Text(block, SWT.SINGLE | SWT.BORDER);
- CmsUiUtils.style(txt, style == null ? FormStyle.propertyText.style() : style);
+ CmsSwtUtils.style(txt, style == null ? FormStyle.propertyText.style() : style);
ToolBar toolBar = new ToolBar(block, SWT.HORIZONTAL);
ToolItem deleteItem = new ToolItem(toolBar, SWT.PUSH);
return block;
} else {
Composite block = new Composite(box, SWT.NONE);
- block.setLayout(CmsUiUtils.noSpaceGridLayout(2));
+ block.setLayout(CmsSwtUtils.noSpaceGridLayout(2));
Term currentValue = getValue();
if (currentValue != null) {
Label lbl = new Label(block, SWT.SINGLE);
String display = getTermLabel(currentValue);
lbl.setText(display);
- CmsUiUtils.style(lbl, style == null ? FormStyle.propertyText.style() : style);
+ CmsSwtUtils.style(lbl, style == null ? FormStyle.propertyText.style() : style);
processTermListLabel(currentValue, lbl);
if (isEditable()) {
lbl.addMouseListener((MouseDoubleClick) (e) -> {
@Override
protected void refresh(ContextOverlay contextArea, String filter, Text txt) {
- CmsUiUtils.clear(contextArea);
+ CmsSwtUtils.clear(contextArea);
List<? extends Term> terms = termsManager.listAllTerms(typology.getId());
terms: for (Term term : terms) {
String display = getTermLabel(term);
package org.argeo.support.openlayers;
-import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
public OLMap(Composite parent, int style) {
super(parent, style);
- setLayout(CmsUiUtils.noSpaceGridLayout());
+ setLayout(CmsSwtUtils.noSpaceGridLayout());
div = new Label(this, SWT.NONE);
- CmsUiUtils.markup(div);
- CmsUiUtils.disableMarkupValidation(div);
+ CmsSwtUtils.markup(div);
+ CmsSwtUtils.disableMarkupValidation(div);
div.setText("<div id='map'></div>");
- div.setLayoutData(CmsUiUtils.fillAll());
+ div.setLayoutData(CmsSwtUtils.fillAll());
}
}
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.argeo.api.NodeConstants;
-import org.argeo.cms.ui.CmsView;
-import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.api.cms.CmsView;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.entity.EntityNames;
import org.argeo.entity.EntityType;
import org.argeo.suite.ui.SuiteEvent;
public OpenLayersMap(Composite parent, int style, URL mapHtml) {
super(parent, style);
- cmsView = CmsView.getCmsView(parent);
+ cmsView = CmsSwtUtils.getCmsView(parent);
setLayout(new GridLayout());
browser = new Browser(this, SWT.BORDER);
- browser.setLayoutData(CmsUiUtils.fillAll());
+ browser.setLayoutData(CmsSwtUtils.fillAll());
String html;
try (InputStream in = mapHtml.openStream()) {
html = IOUtils.toString(in, StandardCharsets.UTF_8);
import javax.jcr.observation.EventListener;
import javax.jcr.query.Query;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.entity.EntityType;
import org.argeo.jcr.JcrException;
import org.argeo.jcr.JcrUtils;
}
protected void refreshUi(Composite parent, Node context) throws RepositoryException {
- CmsUiUtils.clear(parent);
+ CmsSwtUtils.clear(parent);
Query query = context.getSession().getWorkspace().getQueryManager()
.createQuery("SELECT * FROM [" + EntityType.geopoint.get() + "]", Query.JCR_SQL2);
List<Node> geoPoints = JcrUtils.nodeIteratorToList(query.execute().getNodes());
OpenLayersMap map = new OpenLayersMap(parent, SWT.NONE, getClass().getResource("map-osm.html"));
- map.setLayoutData(CmsUiUtils.fillAll());
+ map.setLayoutData(CmsSwtUtils.fillAll());
// apafMap.setZoom(7);
// apafMap.setCenter(-2.472, 8.010);
import javax.jcr.nodetype.NodeType;
import javax.jcr.query.Query;
-import org.argeo.cms.ui.CmsTheme;
+import org.argeo.api.cms.CmsTheme;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.cms.ui.CmsView;
-import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.entity.EntityType;
import org.argeo.jcr.Jcr;
import org.argeo.jcr.JcrException;
@Override
public Control createUi(Composite parent, Node context) throws RepositoryException {
- CmsTheme theme = CmsTheme.getCmsTheme(parent);
+ CmsTheme theme = CmsSwtUtils.getCmsTheme(parent);
parent.setLayout(new GridLayout());
Ui ui = new Ui(parent, SWT.NONE);
- ui.setLayoutData(CmsUiUtils.fillAll());
+ ui.setLayoutData(CmsSwtUtils.fillAll());
TreeViewerColumn nameCol = new TreeViewerColumn(ui.getTreeViewer(), SWT.NONE);
nameCol.getColumn().setWidth(400);
public void doubleClick(DoubleClickEvent event) {
Node user = (Node) ui.getTreeViewer().getStructuredSelection().getFirstElement();
if (user != null) {
- CmsView.getCmsView(parent).sendEvent(SuiteEvent.openNewPart.topic(),
+ CmsSwtUtils.getCmsView(parent).sendEvent(SuiteEvent.openNewPart.topic(),
SuiteEvent.eventProperties(user));
}
public void selectionChanged(SelectionChangedEvent event) {
Node user = (Node) ui.getTreeViewer().getStructuredSelection().getFirstElement();
if (user != null) {
- CmsView.getCmsView(parent).sendEvent(SuiteEvent.refreshPart.topic(),
+ CmsSwtUtils.getCmsView(parent).sendEvent(SuiteEvent.refreshPart.topic(),
SuiteEvent.eventProperties(user));
}
}
import java.nio.file.spi.FileSystemProvider;
import javax.jcr.Node;
-import javax.jcr.RepositoryException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
// UI Parts for the browser
private Composite rightPannelCmp;
- public DocumentsFileComposite(Composite parent, int style, Node context,
- FileSystemProvider fsp) {
+ public DocumentsFileComposite(Composite parent, int style, Node context, FileSystemProvider fsp) {
super(parent, style);
this.currentBaseContext = context;
this.setLayout(EclipseUiUtils.noSpaceGridLayout());
// browser.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, true,
// true));
browser.setLayoutData(EclipseUiUtils.fillAll());
- try {
- // FIXME make it more robust
- String url = CmsUiUtils.getDataUrl(currentBaseContext, UiContext.getHttpRequest());
- // FIXME issue with the redirection to https
- if (url.startsWith("http://") && !url.startsWith("http://localhost"))
- url = "https://" + url.substring("http://".length(), url.length());
- if (log.isTraceEnabled())
- log.debug("Trying to display " + url);
- browser.setUrl(url);
- browser.layout(true, true);
- } catch (RepositoryException re) {
- throw new IllegalStateException("Cannot open file at " + currentBaseContext, re);
- }
+ // FIXME make it more robust
+ String url = CmsUiUtils.getDataUrl(currentBaseContext, UiContext.getHttpRequest());
+ // FIXME issue with the redirection to https
+ if (url.startsWith("http://") && !url.startsWith("http://localhost"))
+ url = "https://" + url.substring("http://".length(), url.length());
+ if (log.isTraceEnabled())
+ log.debug("Trying to display " + url);
+ browser.setUrl(url);
+ browser.layout(true, true);
}
/**
// Simplify UI implementation
private void addProperty(Composite parent, String propName, String value) {
Label propLbl = new Label(parent, SWT.NONE);
- //propLbl.setText(ConnectUtils.replaceAmpersand(propName + ": " + value));
+ // propLbl.setText(ConnectUtils.replaceAmpersand(propName + ": " + value));
propLbl.setText(value);
- //CmsUiUtils.markup(propLbl);
+ // CmsUiUtils.markup(propLbl);
}
}
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.ui.fs.FileDrop;
import org.argeo.cms.ui.fs.FsStyles;
-import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.eclipse.ui.ColumnDefinition;
import org.argeo.eclipse.ui.EclipseUiUtils;
import org.argeo.eclipse.ui.fs.FileIconNameLabelProvider;
nameStr = path.getFileName().toString();
// elemBtn.setText(nameStr + " >> ");
elemBtn.setText(nameStr);
- CmsUiUtils.style(elemBtn, FsStyles.BREAD_CRUMB_BTN);
+ CmsSwtUtils.style(elemBtn, FsStyles.BREAD_CRUMB_BTN);
elemBtn.addSelectionListener(new SelectionAdapter() {
private static final long serialVersionUID = -4103695476023480651L;
// Bread crumbs
breadCrumbCmp = new Composite(filterCmp, SWT.NO_FOCUS);
- CmsUiUtils.style(breadCrumbCmp, FsStyles.BREAD_CRUMB_BTN);
+ CmsSwtUtils.style(breadCrumbCmp, FsStyles.BREAD_CRUMB_BTN);
RowLayout breadCrumbLayout = new RowLayout();
breadCrumbLayout.spacing = 0;
breadCrumbLayout.marginTop = 0;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import org.argeo.api.cms.CmsView;
import org.argeo.cms.fs.CmsFsUtils;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.cms.ui.CmsView;
-import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.jcr.Jcr;
import org.argeo.suite.ui.SuiteEvent;
import org.eclipse.swt.SWT;
@Override
public Control createUi(Composite parent, Node context) throws RepositoryException {
- CmsView cmsView = CmsView.getCmsView(parent);
+ CmsView cmsView = CmsSwtUtils.getCmsView(parent);
DocumentsFolderComposite dfc = new DocumentsFolderComposite(parent, SWT.NONE, context) {
@Override
cmsView.sendEvent(SuiteEvent.openNewPart.topic(), SuiteEvent.eventProperties(folderNode));
}
};
- dfc.setLayoutData(CmsUiUtils.fillAll());
+ dfc.setLayoutData(CmsSwtUtils.fillAll());
dfc.populate(cmsView.doAs(() -> CmsFsUtils.getPath(nodeFileSystemProvider, context)));
return dfc;
}
import javax.jcr.RepositoryException;
import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsView;
import org.argeo.cms.fs.CmsFsUtils;
import org.argeo.cms.jcr.CmsJcrUtils;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.cms.ui.CmsView;
-import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.eclipse.ui.fs.FsTreeViewer;
import org.argeo.jcr.Jcr;
import org.argeo.suite.ui.SuiteEvent;
parent.setLayout(new GridLayout());
FsTreeViewer fsTreeViewer = new FsTreeViewer(parent, SWT.NONE);
fsTreeViewer.configureDefaultSingleColumnTable(500);
- CmsView cmsView = CmsView.getCmsView(parent);
+ CmsView cmsView = CmsSwtUtils.getCmsView(parent);
Node homeNode = CmsJcrUtils.getUserHome(cmsView.doAs(() -> Jcr.login(repository, NodeConstants.HOME_WORKSPACE)));
parent.addDisposeListener((e1) -> Jcr.logout(homeNode));
Path homePath = CmsFsUtils.getPath(nodeFileSystemProvider, homeNode);
}
});
fsTreeViewer.setPathsInput(homePath);
- fsTreeViewer.getControl().setLayoutData(CmsUiUtils.fillAll());
+ fsTreeViewer.getControl().setLayoutData(CmsSwtUtils.fillAll());
fsTreeViewer.getControl().getParent().layout(true, true);
return fsTreeViewer.getControl();
}
package org.argeo.library.ui;
-import static org.argeo.cms.ui.dialogs.CmsMessageDialog.openConfirm;
-import static org.argeo.cms.ui.dialogs.CmsMessageDialog.openError;
-import static org.argeo.cms.ui.dialogs.SingleValueDialog.ask;
+import static org.argeo.cms.swt.dialogs.CmsMessageDialog.openConfirm;
+import static org.argeo.cms.swt.dialogs.CmsMessageDialog.openError;
+import static org.argeo.cms.swt.dialogs.SingleValueDialog.ask;
import java.io.File;
import java.io.FileInputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.argeo.cms.ui.dialogs.CmsFeedback;
+import org.argeo.cms.swt.dialogs.CmsFeedback;
import org.argeo.eclipse.ui.EclipseUiUtils;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.swt.SWT;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import org.argeo.api.cms.CmsTheme;
import org.argeo.cms.CmsUserManager;
-import org.argeo.cms.ui.CmsTheme;
+import org.argeo.cms.swt.CmsSwtUtils;
+import org.argeo.cms.swt.Selected;
+import org.argeo.cms.swt.dialogs.CmsWizardDialog;
import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.cms.ui.CmsView;
-import org.argeo.cms.ui.dialogs.CmsWizardDialog;
-import org.argeo.cms.ui.util.CmsUiUtils;
-import org.argeo.eclipse.ui.Selected;
import org.argeo.naming.LdapAttrs;
import org.argeo.suite.SuiteRole;
import org.argeo.suite.ui.SuiteEvent;
@Override
public Control createUi(Composite parent, Node context) throws RepositoryException {
- CmsTheme theme = CmsTheme.getCmsTheme(parent);
+ CmsTheme theme = CmsSwtUtils.getCmsTheme(parent);
parent.setLayout(new GridLayout());
TableViewer usersViewer = new TableViewer(parent);
usersViewer.setContentProvider(new UsersContentProvider());
});
Composite bottom = new Composite(parent, SWT.NONE);
- bottom.setLayoutData(CmsUiUtils.fillWidth());
- bottom.setLayout(CmsUiUtils.noSpaceGridLayout());
+ bottom.setLayoutData(CmsSwtUtils.fillWidth());
+ bottom.setLayout(CmsSwtUtils.noSpaceGridLayout());
ToolBar bottomToolBar = new ToolBar(bottom, SWT.NONE);
bottomToolBar.setLayoutData(new GridData(SWT.END, SWT.FILL, true, false));
ToolItem deleteItem = new ToolItem(bottomToolBar, SWT.FLAT);
User user = (User) usersViewer.getStructuredSelection().getFirstElement();
if (user != null) {
// Node userNode = getOrCreateUserNode(user, context);
- CmsView.getCmsView(parent).sendEvent(SuiteEvent.openNewPart.topic(),
+ CmsSwtUtils.getCmsView(parent).sendEvent(SuiteEvent.openNewPart.topic(),
SuiteEvent.eventProperties(user));
}
User user = (User) usersViewer.getStructuredSelection().getFirstElement();
if (user != null) {
// Node userNode = getOrCreateUserNode(user, context);
- CmsView.getCmsView(parent).sendEvent(SuiteEvent.refreshPart.topic(),
+ CmsSwtUtils.getCmsView(parent).sendEvent(SuiteEvent.refreshPart.topic(),
SuiteEvent.eventProperties(user));
deleteItem.setEnabled(true);
} else {
}
});
- usersViewer.getTable().setLayoutData(CmsUiUtils.fillAll());
+ usersViewer.getTable().setLayoutData(CmsSwtUtils.fillAll());
usersViewer.setInput(cmsUserManager);
return usersViewer.getTable();
import javax.jcr.RepositoryException;
import org.argeo.cms.CmsUserManager;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.cms.ui.viewers.Section;
import org.argeo.naming.LdapAttrs;
import org.argeo.suite.ui.SuiteMsg;
@Override
public Control createUi(Composite parent, Node context) throws RepositoryException {
Section main = new Section(parent, SWT.NONE, context);
- main.setLayoutData(CmsUiUtils.fillAll());
+ main.setLayoutData(CmsSwtUtils.fillAll());
String uid = context.getName();
User user = cmsUserManager.getUserFromLocalId(uid);
// Section rolesSection = new Section(main, SWT.NONE, context);
Group rolesSection = new Group(main, SWT.NONE);
rolesSection.setText("Roles");
- rolesSection.setLayoutData(CmsUiUtils.fillWidth());
+ rolesSection.setLayoutData(CmsSwtUtils.fillWidth());
rolesSection.setLayout(new GridLayout());
// new Label(rolesSection, SWT.NONE).setText("Roles:");
List<String> roles = Arrays.asList(cmsUserManager.getUserRoles(user.getName()));
import javax.jcr.RepositoryException;
import org.argeo.cms.CmsUserManager;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.cms.ui.viewers.Section;
import org.argeo.naming.LdapAttrs;
import org.argeo.suite.ui.SuiteMsg;
@Override
public Control createUi(Composite parent, Node context) throws RepositoryException {
Section main = new Section(parent, SWT.NONE, context);
- main.setLayoutData(CmsUiUtils.fillAll());
+ main.setLayoutData(CmsSwtUtils.fillAll());
String uid = context.getName();
User user = cmsUserManager.getUserFromLocalId(uid);
// Section rolesSection = new Section(main, SWT.NONE, context);
Group rolesSection = new Group(main, SWT.NONE);
rolesSection.setText("Roles");
- rolesSection.setLayoutData(CmsUiUtils.fillWidth());
+ rolesSection.setLayoutData(CmsSwtUtils.fillWidth());
rolesSection.setLayout(new GridLayout());
// new Label(rolesSection, SWT.NONE).setText("Roles:");
List<String> roles = Arrays.asList(cmsUserManager.getUserRoles(user.getName()));
import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import org.argeo.api.cms.CmsTheme;
import org.argeo.cms.CmsUserManager;
-import org.argeo.cms.ui.CmsTheme;
+import org.argeo.cms.swt.CmsSwtUtils;
+import org.argeo.cms.swt.Selected;
+import org.argeo.cms.swt.dialogs.CmsWizardDialog;
import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.cms.ui.CmsView;
-import org.argeo.cms.ui.dialogs.CmsWizardDialog;
-import org.argeo.cms.ui.util.CmsUiUtils;
-import org.argeo.eclipse.ui.Selected;
import org.argeo.naming.LdapAttrs;
import org.argeo.suite.SuiteRole;
import org.argeo.suite.ui.SuiteEvent;
@Override
public Control createUi(Composite parent, Node context) throws RepositoryException {
- CmsTheme theme = CmsTheme.getCmsTheme(parent);
+ CmsTheme theme = CmsSwtUtils.getCmsTheme(parent);
parent.setLayout(new GridLayout());
TableViewer usersViewer = new TableViewer(parent);
usersViewer.setContentProvider(new UsersContentProvider());
});
Composite bottom = new Composite(parent, SWT.NONE);
- bottom.setLayoutData(CmsUiUtils.fillWidth());
- bottom.setLayout(CmsUiUtils.noSpaceGridLayout());
+ bottom.setLayoutData(CmsSwtUtils.fillWidth());
+ bottom.setLayout(CmsSwtUtils.noSpaceGridLayout());
ToolBar bottomToolBar = new ToolBar(bottom, SWT.NONE);
bottomToolBar.setLayoutData(new GridData(SWT.END, SWT.FILL, true, false));
ToolItem deleteItem = new ToolItem(bottomToolBar, SWT.FLAT);
User user = (User) usersViewer.getStructuredSelection().getFirstElement();
if (user != null) {
// Node userNode = getOrCreateUserNode(user, context);
- CmsView.getCmsView(parent).sendEvent(SuiteEvent.openNewPart.topic(),
+ CmsSwtUtils.getCmsView(parent).sendEvent(SuiteEvent.openNewPart.topic(),
SuiteEvent.eventProperties(user));
}
User user = (User) usersViewer.getStructuredSelection().getFirstElement();
if (user != null) {
// Node userNode = getOrCreateUserNode(user, context);
- CmsView.getCmsView(parent).sendEvent(SuiteEvent.refreshPart.topic(),
+ CmsSwtUtils.getCmsView(parent).sendEvent(SuiteEvent.refreshPart.topic(),
SuiteEvent.eventProperties(user));
deleteItem.setEnabled(true);
} else {
}
});
- usersViewer.getTable().setLayoutData(CmsUiUtils.fillAll());
+ usersViewer.getTable().setLayoutData(CmsSwtUtils.fillAll());
usersViewer.setInput(cmsUserManager);
return usersViewer.getTable();
package org.argeo.docbook.ui;
-import static org.argeo.cms.ui.util.CmsUiUtils.fillWidth;
import static org.argeo.docbook.DbkType.para;
import static org.argeo.docbook.DbkUtils.addDbk;
import static org.argeo.docbook.DbkUtils.isDbk;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.argeo.cms.ui.CmsEditable;
-import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.api.cms.Cms2DSize;
+import org.argeo.api.cms.CmsEditable;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.ui.viewers.AbstractPageViewer;
import org.argeo.cms.ui.viewers.EditablePart;
import org.argeo.cms.ui.viewers.NodePart;
long begin = System.currentTimeMillis();
Section section = (Section) control;
if (section instanceof TextSection) {
- CmsUiUtils.clear(section);
+ CmsSwtUtils.clear(section);
Node node = section.getNode();
TextSection textSection = (TextSection) section;
String style = node.hasProperty(DbkAttr.role.name()) ? node.getProperty(DbkAttr.role.name()).getString()
: getDefaultSectionStyle();
if (style != null)
- CmsUiUtils.style(textSection, style);
+ CmsSwtUtils.style(textSection, style);
// Title
Node titleNode = null;
if (section.getHeader() == null)
section.createHeader();
DbkSectionTitle title = newSectionTitle(textSection, titleNode);
- title.setLayoutData(CmsUiUtils.fillWidth());
+ title.setLayoutData(CmsSwtUtils.fillWidth());
updateContent(title);
}
}
throw new IllegalArgumentException("Unsupported node type for " + child);
}
if (sectionPart != null && sectionPart instanceof Control)
- ((Control) sectionPart).setLayoutData(CmsUiUtils.fillWidth());
+ ((Control) sectionPart).setLayoutData(CmsSwtUtils.fillWidth());
}
// if (!flat)
Node child = ni.nextNode();
if (isDbk(child, DbkType.section)) {
TextSection newSection = newTextSection(section, child);
- newSection.setLayoutData(CmsUiUtils.fillWidth());
+ newSection.setLayoutData(CmsSwtUtils.fillWidth());
refresh(newSection);
}
}
protected Paragraph newParagraph(TextSection parent, Node node) throws RepositoryException {
Paragraph paragraph = new Paragraph(parent, parent.getStyle(), node);
updateContent(paragraph);
- paragraph.setLayoutData(fillWidth());
+ paragraph.setLayoutData(CmsSwtUtils.fillWidth());
paragraph.setMouseListener(getMouseListener());
paragraph.setFocusListener(getFocusListener());
return paragraph;
if (maxMediaWidth != null) {
imgGd = new GridData(SWT.CENTER, SWT.FILL, false, false);
imgGd.widthHint = maxMediaWidth;
- img.setPreferredSize(new Point(maxMediaWidth, 0));
+ img.setPreferredSize(new Cms2DSize(maxMediaWidth, 0));
} else {
- imgGd = CmsUiUtils.grabWidth(SWT.CENTER, SWT.DEFAULT);
+ imgGd = CmsSwtUtils.grabWidth(SWT.CENTER, SWT.DEFAULT);
}
img.setLayoutData(imgGd);
updateContent(img);
getTextInterpreter().write(titleNode, txt);
TextSection newSection = new TextSection(section, section.getStyle(), newSectionNode);
- newSection.setLayoutData(CmsUiUtils.fillWidth());
+ newSection.setLayoutData(CmsSwtUtils.fillWidth());
newSection.moveBelow(paragraph);
// dispose
Section section = paragraph.getSection();
updateContent(paragraph);
Paragraph newParagraph = newParagraph((TextSection) section, newNode);
- newParagraph.setLayoutData(CmsUiUtils.fillWidth());
+ newParagraph.setLayoutData(CmsSwtUtils.fillWidth());
newParagraph.moveBelow(paragraph);
layout(paragraph.getControl(), newParagraph.getControl());
return newParagraph;
import javax.jcr.Node;
-import org.argeo.cms.ui.CmsEditable;
+import org.argeo.api.cms.CmsEditable;
import org.argeo.cms.ui.viewers.Section;
import org.eclipse.swt.widgets.Composite;
import javax.jcr.Node;
-import org.argeo.cms.ui.CmsEditable;
-import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.api.cms.CmsEditable;
+import org.argeo.cms.swt.CmsSwtUtils;
+import org.argeo.cms.swt.MouseDown;
import org.argeo.cms.ui.viewers.EditablePart;
import org.argeo.cms.ui.viewers.NodePart;
import org.argeo.cms.ui.viewers.Section;
import org.argeo.cms.ui.widgets.Img;
import org.argeo.docbook.DbkMsg;
import org.argeo.docbook.DbkUtils;
-import org.argeo.eclipse.ui.MouseDown;
import org.argeo.jcr.Jcr;
import org.eclipse.rap.rwt.RWT;
import org.eclipse.swt.SWT;
void show(EditablePart editablePart, Point location, List<String> availableStyles) {
if (shell.isVisible())
shell.setVisible(false);
- CmsUiUtils.clear(shell);
+ CmsSwtUtils.clear(shell);
Composite parent = shell;
CmsEditable cmsEditable = textViewer.getCmsEditable();
// if (availableStyles.isEmpty())
import javax.jcr.RepositoryException;
import javax.jcr.nodetype.NodeType;
-import org.argeo.cms.ui.CmsImageManager;
+import org.argeo.api.cms.Cms2DSize;
+import org.argeo.api.cms.CmsImageManager;
import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.cms.ui.util.DefaultImageManager;
-import org.argeo.docbook.DbkUtils;
import org.argeo.docbook.DbkAttr;
import org.argeo.docbook.DbkType;
+import org.argeo.docbook.DbkUtils;
import org.argeo.entity.EntityNames;
import org.argeo.entity.EntityType;
import org.argeo.jcr.JcrException;
import org.argeo.jcr.JcrUtils;
import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
/** Add DocBook images support to {@link CmsImageManager}. */
public class DbkImageManager extends DefaultImageManager {
this.baseFolder = baseFolder;
}
- Node getImageDataNode(Node mediaObjectNode) throws RepositoryException {
- if (mediaObjectNode.hasNode(DbkType.imageobject.get())) {
- Node imageDataNode = mediaObjectNode.getNode(DbkType.imageobject.get()).getNode(DbkType.imagedata.get());
- return imageDataNode;
- } else {
- throw new IllegalStateException("No image data found for " + mediaObjectNode);
+ Node getImageDataNode(Node mediaObjectNode) {
+ try {
+ if (mediaObjectNode.hasNode(DbkType.imageobject.get())) {
+ Node imageDataNode = mediaObjectNode.getNode(DbkType.imageobject.get())
+ .getNode(DbkType.imagedata.get());
+ return imageDataNode;
+ } else {
+ throw new IllegalStateException("No image data found for " + mediaObjectNode);
+ }
+ } catch (RepositoryException e) {
+ throw new JcrException(e);
}
}
@Override
- public Binary getImageBinary(Node node) throws RepositoryException {
+ public Binary getImageBinary(Node node) {
Node fileNode = null;
if (DbkUtils.isDbk(node, DbkType.mediaobject)) {
Node imageDataNode = getImageDataNode(node);
fileNode = getFileNode(imageDataNode);
}
- if (node.isNodeType(NT_FILE)) {
- fileNode = node;
- }
- if (fileNode != null) {
- return node.getNode(JCR_CONTENT).getProperty(JCR_DATA).getBinary();
- } else {
- return null;
+ try {
+ if (node.isNodeType(NT_FILE)) {
+ fileNode = node;
+ }
+ if (fileNode != null) {
+ return node.getNode(JCR_CONTENT).getProperty(JCR_DATA).getBinary();
+ } else {
+ return null;
+ }
+ } catch (RepositoryException e) {
+ throw new JcrException(e);
}
}
- public Point getImageSize(Node mediaObjectNode) throws RepositoryException {
+ public Cms2DSize getImageSize(Node mediaObjectNode) {
Node imageDataNode = getImageDataNode(mediaObjectNode);
Node fileNode = getFileNode(imageDataNode);
if (fileNode == null)
- return new Point(0, 0);
- Point intrinsicSize;
- if (fileNode.hasProperty(EntityNames.SVG_WIDTH) && fileNode.hasProperty(EntityNames.SVG_HEIGHT)) {
- int width = (int) fileNode.getProperty(EntityNames.SVG_WIDTH).getLong();
- int height = (int) fileNode.getProperty(EntityNames.SVG_HEIGHT).getLong();
- intrinsicSize = new Point(width, height);
- } else {
- try (InputStream in = JcrUtils.getFileAsStream(fileNode)) {
- ImageData id = new ImageData(in);
- intrinsicSize = updateSize(fileNode, id);
- } catch (IOException e) {
- throw new RuntimeException("Cannot load file " + fileNode, e);
+ return new Cms2DSize(0, 0);
+ try {
+ Cms2DSize intrinsicSize;
+ if (fileNode.hasProperty(EntityNames.SVG_WIDTH) && fileNode.hasProperty(EntityNames.SVG_HEIGHT)) {
+ int width = (int) fileNode.getProperty(EntityNames.SVG_WIDTH).getLong();
+ int height = (int) fileNode.getProperty(EntityNames.SVG_HEIGHT).getLong();
+ intrinsicSize = new Cms2DSize(width, height);
+ } else {
+ try (InputStream in = JcrUtils.getFileAsStream(fileNode)) {
+ ImageData id = new ImageData(in);
+ intrinsicSize = updateSize(fileNode, id);
+ } catch (IOException e) {
+ throw new RuntimeException("Cannot load file " + fileNode, e);
+ }
}
+ // TODO interpret image data infos
+ return intrinsicSize;
+ } catch (RepositoryException e) {
+ throw new JcrException(e);
}
- // TODO interpret image data infos
- return intrinsicSize;
}
- protected Point updateSize(Node fileNode, ImageData id) throws RepositoryException {
+ protected Cms2DSize updateSize(Node fileNode, ImageData id) throws RepositoryException {
fileNode.addMixin(EntityType.box.get());
fileNode.setProperty(EntityNames.SVG_WIDTH, id.width);
fileNode.setProperty(EntityNames.SVG_HEIGHT, id.height);
- return new Point(id.width, id.height);
+ return new Cms2DSize(id.width, id.height);
}
@Override
}
@Override
- public String getImageUrl(Node mediaObjectNode) throws RepositoryException {
+ public String getImageUrl(Node mediaObjectNode) {
Node imageDataNode = getImageDataNode(mediaObjectNode);
// TODO factorise
String fileref = null;
- if (imageDataNode.hasProperty(DbkAttr.fileref.name()))
- fileref = imageDataNode.getProperty(DbkAttr.fileref.name()).getString();
+ try {
+ if (imageDataNode.hasProperty(DbkAttr.fileref.name()))
+ fileref = imageDataNode.getProperty(DbkAttr.fileref.name()).getString();
+ } catch (RepositoryException e) {
+ throw new JcrException(e);
+ }
if (fileref == null)
return null;
URI fileUri;
return url;
}
- protected Node getFileNode(Node imageDataNode) throws RepositoryException {
+ protected Node getFileNode(Node imageDataNode) {
// FIXME make URL use case more robust
- String fileref = null;
- if (imageDataNode.hasProperty(DbkAttr.fileref.name()))
- fileref = imageDataNode.getProperty(DbkAttr.fileref.name()).getString();
- if (fileref == null)
- return null;
- Node fileNode;
- if (fileref.startsWith("/"))
- fileNode = baseFolder.getSession().getNode(fileref);
- else
- fileNode = baseFolder.getNode(fileref);
- return fileNode;
+ try {
+ String fileref = null;
+ if (imageDataNode.hasProperty(DbkAttr.fileref.name()))
+ fileref = imageDataNode.getProperty(DbkAttr.fileref.name()).getString();
+ if (fileref == null)
+ return null;
+ Node fileNode;
+ if (fileref.startsWith("/"))
+ fileNode = baseFolder.getSession().getNode(fileref);
+ else
+ fileNode = baseFolder.getNode(fileref);
+ return fileNode;
+ } catch (RepositoryException e) {
+ throw new JcrException(e);
+ }
}
protected Node getMediaFolder() {
import javax.jcr.Node;
import javax.jcr.RepositoryException;
-import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.ui.widgets.Img;
import org.eclipse.rap.fileupload.FileUploadEvent;
import org.eclipse.rap.fileupload.FileUploadHandler;
@Override
protected void setContainerLayoutData(Composite composite) {
- composite.setLayoutData(CmsUiUtils.grabWidth(SWT.CENTER, SWT.DEFAULT));
+ composite.setLayoutData(CmsSwtUtils.grabWidth(SWT.CENTER, SWT.DEFAULT));
}
@Override
protected void setControlLayoutData(Control control) {
- control.setLayoutData(CmsUiUtils.grabWidth(SWT.CENTER, SWT.DEFAULT));
+ control.setLayoutData(CmsSwtUtils.grabWidth(SWT.CENTER, SWT.DEFAULT));
}
@Override
import javax.jcr.Node;
import javax.jcr.RepositoryException;
-import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.cms.swt.CmsSwtUtils;
+import org.argeo.cms.swt.Selected;
import org.argeo.cms.ui.viewers.NodePart;
import org.argeo.cms.ui.viewers.Section;
import org.argeo.cms.ui.viewers.SectionPart;
import org.argeo.docbook.DbkAttr;
import org.argeo.docbook.DbkType;
import org.argeo.docbook.DbkUtils;
-import org.argeo.eclipse.ui.Selected;
import org.argeo.jcr.Jcr;
import org.argeo.jcr.JcrException;
import org.argeo.naming.NamingUtils;
protected Control createControl(Composite box, String style) {
Node mediaobject = getNode();
Composite wrapper = new Composite(box, SWT.NONE);
- wrapper.setLayout(CmsUiUtils.noSpaceGridLayout());
+ wrapper.setLayout(CmsSwtUtils.noSpaceGridLayout());
Composite browserC = new Composite(wrapper, SWT.NONE);
- browserC.setLayout(CmsUiUtils.noSpaceGridLayout());
+ browserC.setLayout(CmsSwtUtils.noSpaceGridLayout());
GridData gd = new GridData(SWT.CENTER, SWT.FILL, true, true);
gd.widthHint = getWidth();
gd.heightHint = getHeight();
@Override
protected void setControlLayoutData(Control control) {
- control.setLayoutData(CmsUiUtils.fillAll());
+ control.setLayoutData(CmsSwtUtils.fillAll());
}
@Override
import javax.jcr.Session;
import javax.jcr.nodetype.NodeType;
-import org.argeo.cms.ui.CmsEditable;
+import org.argeo.api.cms.CmsEditable;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.ui.CmsUiProvider;
import org.argeo.cms.ui.util.CmsLink;
-import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.cms.ui.viewers.JcrVersionCmsEditable;
import org.argeo.cms.ui.widgets.ScrolledPage;
import org.argeo.docbook.DbkType;
public Control createUi(Composite parent, Node context) throws RepositoryException {
ScrolledPage page = new ScrolledPage(parent, SWT.NONE);
- page.setLayout(CmsUiUtils.noSpaceGridLayout());
- GridData textGd = CmsUiUtils.fillAll();
+ page.setLayout(CmsSwtUtils.noSpaceGridLayout());
+ GridData textGd = CmsSwtUtils.fillAll();
page.setLayoutData(textGd);
if (context.isNodeType(DbkType.article.get())) {
CmsEditable cmsEditable = new JcrVersionCmsEditable(context);
if (cmsEditable.canEdit())
- new TextEditorHeader(cmsEditable, parent, SWT.NONE).setLayoutData(CmsUiUtils.fillWidth());
+ new TextEditorHeader(cmsEditable, parent, SWT.NONE).setLayoutData(CmsSwtUtils.fillWidth());
if (!cmsEditable.isEditing())
cmsEditable.startEditing();
new DocumentTextEditor(page, SWT.FLAT, context, cmsEditable);
import javax.jcr.Node;
import javax.jcr.RepositoryException;
-import org.argeo.cms.ui.CmsEditable;
-import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.api.cms.CmsEditable;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.docbook.DbkUtils;
import org.argeo.docbook.DbkType;
import org.eclipse.swt.widgets.Composite;
public DocumentTextEditor(Composite parent, int style, Node textNode, CmsEditable cmsEditable) {
super(new TextSection(parent, style, textNode), style, cmsEditable);
// refresh();
- getMainSection().setLayoutData(CmsUiUtils.fillWidth());
+ getMainSection().setLayoutData(CmsSwtUtils.fillWidth());
}
@Override
import javax.jcr.Node;
import javax.jcr.RepositoryException;
-import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.ui.viewers.SectionPart;
import org.argeo.cms.ui.widgets.EditableText;
import org.argeo.cms.ui.widgets.TextStyles;
public Paragraph(TextSection section, int style, Node node) throws RepositoryException {
super(section, style, node);
this.section = section;
- CmsUiUtils.style(this, DbkType.para.name());
+ CmsSwtUtils.style(this, DbkType.para.name());
}
public TextSection getSection() {
@Override
protected Label createLabel(Composite box, String style) {
Label lbl = super.createLabel(box, style);
- CmsUiUtils.disableMarkupValidation(lbl);
+ CmsSwtUtils.disableMarkupValidation(lbl);
return lbl;
}
import java.util.Observable;
import java.util.Observer;
-import org.argeo.cms.ui.CmsEditable;
-import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.api.cms.CmsEditable;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.ui.widgets.TextStyles;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
display = new Composite(parent, SWT.NONE);
// display.setBackgroundMode(SWT.INHERIT_NONE);
display.setLayoutData(layoutData);
- display.setLayout(CmsUiUtils.noSpaceGridLayout());
- CmsUiUtils.style(display, TextStyles.TEXT_EDITOR_HEADER);
+ display.setLayout(CmsSwtUtils.noSpaceGridLayout());
+ CmsSwtUtils.style(display, TextStyles.TEXT_EDITOR_HEADER);
publish = new Button(display, SWT.FLAT | SWT.PUSH);
publish.setText(getPublishButtonLabel());
- CmsUiUtils.style(publish, TextStyles.TEXT_EDITOR_HEADER);
+ CmsSwtUtils.style(publish, TextStyles.TEXT_EDITOR_HEADER);
publish.addSelectionListener(this);
display.moveAbove(null);
}
import javax.jcr.Node;
-import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.ui.viewers.EditablePart;
import org.argeo.cms.ui.viewers.Section;
import org.argeo.cms.ui.widgets.TextStyles;
} else {
level = 0;
}
- CmsUiUtils.style(this, DbkType.section.name());
+ CmsSwtUtils.style(this, DbkType.section.name());
}
public String getDefaultTextStyle() {
import org.apache.commons.io.IOUtils;
import org.apache.xalan.processor.TransformerFactoryImpl;
+import org.argeo.api.cms.CmsTheme;
import org.argeo.cms.servlet.ServletAuthUtils;
-import org.argeo.cms.ui.CmsTheme;
import org.argeo.docbook.DbkType;
import org.argeo.docbook.DbkUtils;
import org.argeo.jcr.Jcr;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.io.IOUtils;
-import org.argeo.cms.ui.CmsTheme;
+import org.argeo.api.cms.CmsTheme;
/** Serves fonts locally. */
public class FontsServlet extends HttpServlet {
import javax.jcr.RepositoryException;
import javax.jcr.nodetype.NodeType;
-import org.argeo.cms.ui.CmsEditable;
+import org.argeo.api.cms.CmsEditable;
+import org.argeo.api.cms.CmsView;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.cms.ui.CmsView;
import org.argeo.cms.ui.util.CmsLink;
import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.cms.ui.viewers.JcrVersionCmsEditable;
@Override
public Control createUi(Composite parent, Node context) throws RepositoryException {
- CmsView cmsView = CmsView.getCmsView(parent);
+ CmsView cmsView = CmsSwtUtils.getCmsView(parent);
CmsEditable cmsEditable = new JcrVersionCmsEditable(context);
if (context.hasNode(DbkType.article.get())) {
Node textNode = context.getNode(DbkType.article.get());
// Title
- parent.setLayout(CmsUiUtils.noSpaceGridLayout());
+ parent.setLayout(CmsSwtUtils.noSpaceGridLayout());
CmsLink toHtml = new CmsLink("To HTML", "/html/dbk" + context.getPath()+"/index.html");
toHtml.createUiPart(parent, context);
ScrolledPage page = new ScrolledPage(parent, SWT.NONE);
- page.setLayoutData(CmsUiUtils.fillAll());
- page.setLayout(CmsUiUtils.noSpaceGridLayout());
+ page.setLayoutData(CmsSwtUtils.fillAll());
+ page.setLayout(CmsSwtUtils.noSpaceGridLayout());
cmsView.runAs(() -> {
AbstractDbkViewer dbkEditor = new DocumentTextEditor(page, SWT.NONE, textNode, cmsEditable);
Browser browser = new Browser(parent, SWT.NONE);
String dataPath = CmsUiUtils.getDataPath(context);
browser.setUrl(dataPath);
- browser.setLayoutData(CmsUiUtils.fillAll());
+ browser.setLayoutData(CmsSwtUtils.fillAll());
return browser;
}
}
import java.util.Set;
import javax.jcr.Node;
+import javax.jcr.Repository;
import javax.jcr.Session;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.argeo.cms.ui.AbstractCmsApp;
-import org.argeo.cms.ui.CmsApp;
+import org.argeo.api.cms.CmsApp;
+import org.argeo.api.cms.CmsUi;
+import org.argeo.cms.AbstractCmsApp;
import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.docbook.ui.DocumentPage;
import org.argeo.jcr.Jcr;
import org.argeo.suite.ui.SuiteApp;
import org.argeo.util.LangUtils;
private CmsUiProvider landingPage;
private CmsUiProvider defaultProvider = new DocumentUiProvider();
+ private Repository repository;
+
public void init(Map<String, String> properties) {
if (properties.containsKey(DEFAULT_UI_NAME_PROPERTY))
defaultUiName = LangUtils.get(properties, DEFAULT_UI_NAME_PROPERTY);
}
@Override
- public Composite initUi(Composite parent) {
+ public CmsUi initUi(Object uiParent) {
+ Composite parent = (Composite) uiParent;
// Session adminSession = NodeUtils.openDataAdminSession(getRepository(), null);
Session session = Jcr.login(getRepository(), null);
parent.setLayout(new GridLayout());
} else {
page = defaultProvider.createUiPart(parent, indexNode);
}
- return (Composite) page;
+ return (CmsUi) page;
}
@Override
- public void refreshUi(Composite parent, String state) {
+ public void refreshUi(CmsUi cmsUi, String state) {
+ Composite parent = (Composite) cmsUi;
parent.setLayout(new GridLayout());
if (landingPage != null)
landingPage.createUiPart(parent, null);
}
@Override
- public void setState(Composite parent, String state) {
+ public void setState(CmsUi cmsUi, String state) {
}
}
+ public Repository getRepository() {
+ return repository;
+ }
+
+ public void setRepository(Repository repository) {
+ this.repository = repository;
+ }
+
}
package org.argeo.publishing.ui;
-import org.argeo.cms.ui.util.CmsStyle;
+import org.argeo.api.cms.CmsStyle;
/** Publishing styles. */
public enum PublishingStyle implements CmsStyle {
import javax.security.auth.x500.X500Principal;
import org.argeo.api.NodeConstants;
-import org.argeo.cms.auth.CmsSession;
+import org.argeo.api.cms.CmsSession;
import org.argeo.entity.EntityType;
import org.argeo.jackrabbit.security.JackrabbitSecurityUtils;
import org.argeo.jcr.JcrException;
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" name="Argeo Suite Default Theme">
- <implementation class="org.argeo.cms.ui.util.BundleCmsTheme"/>
+ <implementation class="org.argeo.cms.swt.osgi.BundleCmsSwtTheme"/>
<service>
- <provide interface="org.argeo.cms.ui.CmsTheme"/>
+ <provide interface="org.argeo.api.cms.CmsTheme"/>
</service>
</scr:component>
OSGI-INF/cmsTheme.xml
Import-Package:\
-org.argeo.cms.ui.util,\
+org.argeo.cms.swt.osgi,\
*
\ No newline at end of file
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" name="Argeo Suite Web App">
<implementation class="org.argeo.cms.web.CmsWebApp"/>
<property name="contextName" type="String" value="argeo"/>
- <reference bind="setCmsApp" cardinality="1..1" interface="org.argeo.cms.ui.CmsApp" name="CmsApp" policy="dynamic" target="(service.pid=argeo.suite.ui.app)" unbind="unsetCmsApp"/>
+ <reference bind="setCmsApp" cardinality="1..1" interface="org.argeo.api.cms.CmsApp" name="CmsApp" policy="dynamic" target="(service.pid=argeo.suite.ui.app)" unbind="unsetCmsApp"/>
<reference bind="setEventAdmin" cardinality="1..1" interface="org.osgi.service.event.EventAdmin" name="EventAdmin" policy="static"/>
</scr:component>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" name="Argeo Suite App">
<implementation class="org.argeo.suite.ui.SuiteApp"/>
<service>
- <provide interface="org.argeo.cms.ui.CmsApp"/>
+ <provide interface="org.argeo.api.cms.CmsApp"/>
<provide interface="org.osgi.service.event.EventHandler"/>
</service>
<properties entry="config/cmsApp.properties"/>
<reference bind="addUiProvider" cardinality="0..n" interface="org.argeo.cms.ui.CmsUiProvider" name="CmsUiProvider" policy="dynamic" unbind="removeUiProvider"/>
- <reference bind="addTheme" cardinality="1..n" interface="org.argeo.cms.ui.CmsTheme" name="CmsTheme" policy="dynamic" unbind="removeTheme"/>
+ <reference bind="addTheme" cardinality="1..n" interface="org.argeo.api.cms.CmsTheme" name="CmsTheme" policy="dynamic" unbind="removeTheme"/>
<reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="dynamic" target="(cn=ego)"/>
<reference bind="addLayer" cardinality="1..n" interface="org.argeo.suite.ui.SuiteLayer" name="SuiteLayer" policy="dynamic" unbind="removeLayer"/>
<reference bind="setCmsUserManager" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" name="CmsUserManager" policy="static"/>
import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import org.argeo.api.cms.CmsView;
import org.argeo.cms.auth.CurrentUser;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.cms.ui.CmsView;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
@Override
public Control createUi(Composite parent, Node context) throws RepositoryException {
parent.setLayout(new GridLayout());
- CmsView cmsView = CmsView.getCmsView(parent);
+ CmsView cmsView = CmsSwtUtils.getCmsView(parent);
if (cmsView.isAnonymous())
throw new IllegalStateException("No user is not logged in");
import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import org.argeo.api.cms.CmsTheme;
import org.argeo.cms.Localized;
-import org.argeo.cms.ui.CmsTheme;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.jcr.JcrException;
import org.argeo.suite.ui.widgets.TabbedArea;
import org.argeo.util.LangUtils;
if (fixedEntryArea) {
FixedEditionArea editionArea = new FixedEditionArea(parent, parent.getStyle());
Control entryAreaC = entryArea.createUi(editionArea.getEntryArea(), context);
- CmsUiUtils.style(entryAreaC, SuiteStyle.entryArea);
+ CmsSwtUtils.style(entryAreaC, SuiteStyle.entryArea);
if (this.defaultView != null) {
editionArea.getTabbedArea().view(defaultView, context);
}
this.workArea.createUi(area, context);
return area;
}
- CmsTheme theme = CmsTheme.getCmsTheme(parent);
+ CmsTheme theme = CmsSwtUtils.getCmsTheme(parent);
TabbedArea tabbedArea = createTabbedArea(parent, theme);
return tabbedArea;
}
public void view(CmsUiProvider uiProvider, Composite workAreaC, Node context) {
if (workArea != null) {
try {
- CmsUiUtils.clear(workAreaC);
+ CmsSwtUtils.clear(workAreaC);
workArea.createUi(workAreaC, context);
workAreaC.layout(true, true);
return;
tabbedArea.setTabStyle(SuiteStyle.mainTab.style());
tabbedArea.setTabSelectedStyle(SuiteStyle.mainTabSelected.style());
tabbedArea.setCloseIcon(SuiteIcon.close.getSmallIcon(theme));
- tabbedArea.setLayoutData(CmsUiUtils.fillAll());
+ tabbedArea.setLayoutData(CmsSwtUtils.fillAll());
return tabbedArea;
}
SashFormEditionArea(Composite parent, int style) {
super(parent, SWT.HORIZONTAL);
- CmsTheme theme = CmsTheme.getCmsTheme(parent);
+ CmsTheme theme = CmsSwtUtils.getCmsTheme(parent);
Composite editorC;
if (SWT.RIGHT_TO_LEFT == (style & SWT.RIGHT_TO_LEFT)) {// arabic, hebrew, etc.
if (startMaximized)
setMaximizedControl(editorC);
- GridLayout editorAreaLayout = CmsUiUtils.noSpaceGridLayout();
+ GridLayout editorAreaLayout = CmsSwtUtils.noSpaceGridLayout();
// editorAreaLayout.verticalSpacing = 0;
// editorAreaLayout.marginBottom = 0;
// editorAreaLayout.marginHeight = 0;
public FixedEditionArea(Composite parent, int style) {
super(parent, style);
- CmsTheme theme = CmsTheme.getCmsTheme(parent);
+ CmsTheme theme = CmsSwtUtils.getCmsTheme(parent);
- setLayout(CmsUiUtils.noSpaceGridLayout(2));
+ setLayout(CmsSwtUtils.noSpaceGridLayout(2));
Composite editorC;
if (SWT.RIGHT_TO_LEFT == (style & SWT.RIGHT_TO_LEFT)) {// arabic, hebrew, etc.
entryC = new Composite(this, SWT.NONE);
editorC = new Composite(this, SWT.NONE);
}
- entryC.setLayoutData(CmsUiUtils.fillHeight());
+ entryC.setLayoutData(CmsSwtUtils.fillHeight());
- GridLayout editorAreaLayout = CmsUiUtils.noSpaceGridLayout();
+ GridLayout editorAreaLayout = CmsSwtUtils.noSpaceGridLayout();
// editorAreaLayout.verticalSpacing = 0;
// editorAreaLayout.marginBottom = 0;
// editorAreaLayout.marginHeight = 0;
// editorAreaLayout.marginLeft = 0;
// editorAreaLayout.marginRight = 0;
editorC.setLayout(editorAreaLayout);
- editorC.setLayoutData(CmsUiUtils.fillAll());
+ editorC.setLayoutData(CmsSwtUtils.fillAll());
tabbedArea = createTabbedArea(editorC, theme);
}
import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.cms.ui.util.CmsUiUtils;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
public class DefaultFooter implements CmsUiProvider {
@Override
public Control createUi(Composite parent, Node context) throws RepositoryException {
- parent.setLayout(CmsUiUtils.noSpaceGridLayout());
+ parent.setLayout(CmsSwtUtils.noSpaceGridLayout());
Composite content = new Composite(parent, SWT.NONE);
content.setLayoutData(new GridData(0, 0));
Control contentControl = createContent(content, context);
import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import org.argeo.api.cms.CmsTheme;
+import org.argeo.api.cms.CmsView;
import org.argeo.cms.Localized;
import org.argeo.cms.auth.CurrentUser;
-import org.argeo.cms.ui.CmsTheme;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.cms.ui.CmsView;
-import org.argeo.cms.ui.util.CmsUiUtils;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@Override
public Control createUi(Composite parent, Node context) throws RepositoryException {
- CmsView cmsView = CmsView.getCmsView(parent);
- CmsTheme theme = CmsTheme.getCmsTheme(parent);
+ CmsView cmsView = CmsSwtUtils.getCmsView(parent);
+ CmsTheme theme = CmsSwtUtils.getCmsTheme(parent);
- parent.setLayout(CmsUiUtils.noSpaceGridLayout(new GridLayout(3, true)));
+ parent.setLayout(CmsSwtUtils.noSpaceGridLayout(new GridLayout(3, true)));
// TODO right to left
Composite lead = new Composite(parent, SWT.NONE);
- CmsUiUtils.style(lead, SuiteStyle.header);
+ CmsSwtUtils.style(lead, SuiteStyle.header);
lead.setLayoutData(new GridData(SWT.LEAD, SWT.CENTER, true, false));
lead.setLayout(new GridLayout());
Label lbl = new Label(lead, SWT.NONE);
// lbl.setText(LocaleUtils.isLocaleKey(title) ? LocaleUtils.local(title, getClass().getClassLoader()).toString()
// : title);
lbl.setText(title.lead());
- CmsUiUtils.style(lbl, SuiteStyle.headerTitle);
- lbl.setLayoutData(CmsUiUtils.fillWidth());
+ CmsSwtUtils.style(lbl, SuiteStyle.headerTitle);
+ lbl.setLayoutData(CmsSwtUtils.fillWidth());
Composite middle = new Composite(parent, SWT.NONE);
- CmsUiUtils.style(middle, SuiteStyle.header);
+ CmsSwtUtils.style(middle, SuiteStyle.header);
middle.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, true, false));
middle.setLayout(new GridLayout());
Composite end = new Composite(parent, SWT.NONE);
- CmsUiUtils.style(end, SuiteStyle.header);
+ CmsSwtUtils.style(end, SuiteStyle.header);
end.setLayoutData(new GridData(SWT.END, SWT.CENTER, true, false));
if (!cmsView.isAnonymous()) {
end.setLayout(new GridLayout(2, false));
Label userL = new Label(end, SWT.NONE);
- CmsUiUtils.style(userL, SuiteStyle.header);
+ CmsSwtUtils.style(userL, SuiteStyle.header);
userL.setText(CurrentUser.getDisplayName());
Button logoutB = new Button(end, SWT.FLAT);
// CmsUiUtils.style(logoutB, SuiteStyle.header);
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsView;
import org.argeo.cms.Localized;
import org.argeo.cms.auth.CurrentUser;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.cms.ui.CmsView;
-import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.suite.RankedObject;
import org.argeo.suite.SuiteUtils;
import org.eclipse.swt.SWT;
@Override
public Control createUi(Composite parent, Node node) throws RepositoryException {
- CmsView cmsView = CmsView.getCmsView(parent);
- parent.setLayout(CmsUiUtils.noSpaceGridLayout());
+ CmsView cmsView = CmsSwtUtils.getCmsView(parent);
+ parent.setLayout(CmsSwtUtils.noSpaceGridLayout());
Composite appLayersC = new Composite(parent, SWT.NONE);
- CmsUiUtils.style(appLayersC, SuiteStyle.leadPane);
+ CmsSwtUtils.style(appLayersC, SuiteStyle.leadPane);
GridLayout layout = new GridLayout();
layout.verticalSpacing = 10;
layout.marginTop = 10;
Composite adminLayersC;
if (!adminLayers.isEmpty()) {
adminLayersC = new Composite(parent, SWT.NONE);
- CmsUiUtils.style(adminLayersC, SuiteStyle.leadPane);
+ CmsSwtUtils.style(adminLayersC, SuiteStyle.leadPane);
GridLayout adminLayout = new GridLayout();
adminLayout.verticalSpacing = 10;
adminLayout.marginBottom = 10;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import org.argeo.api.cms.CmsView;
import org.argeo.cms.auth.CurrentUser;
+import org.argeo.cms.swt.CmsSwtUtils;
+import org.argeo.cms.swt.auth.CmsLogin;
import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.cms.ui.CmsView;
-import org.argeo.cms.ui.widgets.auth.CmsLogin;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@Override
public Control createUi(Composite parent, Node context) throws RepositoryException {
- CmsView cmsView = CmsView.getCmsView(parent);
+ CmsView cmsView = CmsSwtUtils.getCmsView(parent);
if (!cmsView.isAnonymous())
throw new IllegalStateException(CurrentUser.getUsername() + " is already logged in");
import javax.jcr.query.Query;
import javax.jcr.query.QueryResult;
-import org.argeo.cms.ui.CmsTheme;
+import org.argeo.api.cms.CmsTheme;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.cms.ui.CmsView;
-import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.eclipse.ui.EclipseUiUtils;
import org.argeo.entity.EntityType;
import org.argeo.jcr.Jcr;
@Override
public Control createUi(Composite parent, Node context) throws RepositoryException {
- theme = CmsTheme.getCmsTheme(parent);
+ theme = CmsSwtUtils.getCmsTheme(parent);
parent.setLayout(new GridLayout());
// parent.setLayout(CmsUiUtils.noSpaceGridLayout());
parent.setLayout(new GridLayout());
return null;
SingleEntityViewer entityViewer = new SingleEntityViewer(parent, SWT.NONE, context.getSession());
entityViewer.createUi();
- entityViewer.getViewer().getTable().setLayoutData(CmsUiUtils.fillAll());
+ entityViewer.getViewer().getTable().setLayoutData(CmsSwtUtils.fillAll());
Composite bottom = new Composite(parent, SWT.NONE);
- bottom.setLayoutData(CmsUiUtils.fillWidth());
- bottom.setLayout(CmsUiUtils.noSpaceGridLayout());
+ bottom.setLayoutData(CmsSwtUtils.fillWidth());
+ bottom.setLayout(CmsSwtUtils.noSpaceGridLayout());
ToolBar bottomToolBar = new ToolBar(bottom, SWT.NONE);
bottomToolBar.setLayoutData(new GridData(SWT.END, SWT.FILL, true, false));
ToolItem deleteItem = new ToolItem(bottomToolBar, SWT.FLAT);
public void doubleClick(DoubleClickEvent event) {
Node node = (Node) entityViewer.getViewer().getStructuredSelection().getFirstElement();
if (node != null)
- CmsView.getCmsView(parent).sendEvent(SuiteEvent.openNewPart.topic(),
+ CmsSwtUtils.getCmsView(parent).sendEvent(SuiteEvent.openNewPart.topic(),
SuiteEvent.eventProperties(node));
}
public void selectionChanged(SelectionChangedEvent event) {
Node node = (Node) entityViewer.getViewer().getStructuredSelection().getFirstElement();
if (node != null) {
- CmsView.getCmsView(parent).sendEvent(SuiteEvent.refreshPart.topic(),
+ CmsSwtUtils.getCmsView(parent).sendEvent(SuiteEvent.refreshPart.topic(),
SuiteEvent.eventProperties(node));
deleteItem.setEnabled(true);
} else {
package org.argeo.suite.ui;
-import static org.argeo.cms.ui.CmsView.CMS_VIEW_UID_PROPERTY;
+import static org.argeo.api.cms.CmsView.CMS_VIEW_UID_PROPERTY;
import java.util.Collections;
import java.util.HashMap;
import java.util.TreeSet;
import javax.jcr.Node;
+import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.nodetype.NodeType;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsSession;
+import org.argeo.api.cms.CmsTheme;
+import org.argeo.api.cms.CmsUi;
+import org.argeo.api.cms.CmsView;
+import org.argeo.cms.AbstractCmsApp;
import org.argeo.cms.CmsUserManager;
import org.argeo.cms.LocaleUtils;
import org.argeo.cms.Localized;
-import org.argeo.cms.auth.CmsSession;
import org.argeo.cms.jcr.CmsJcrUtils;
-import org.argeo.cms.ui.AbstractCmsApp;
-import org.argeo.cms.ui.CmsTheme;
+import org.argeo.cms.swt.CmsSwtUtils;
+import org.argeo.cms.swt.dialogs.CmsFeedback;
import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.cms.ui.CmsView;
-import org.argeo.cms.ui.dialogs.CmsFeedback;
-import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.eclipse.ui.specific.UiContext;
import org.argeo.entity.EntityConstants;
import org.argeo.entity.EntityNames;
// TODO make more optimal or via CmsSession/CmsView
private Map<String, SuiteUi> managedUis = new HashMap<>();
+ private Repository repository;
+
+
public void init(Map<String, Object> properties) {
if (log.isDebugEnabled())
log.info("Argeo Suite App started");
}
@Override
- public Composite initUi(Composite parent) {
- String uiName = parent.getData(UI_NAME_PROPERTY) != null ? parent.getData(UI_NAME_PROPERTY).toString() : null;
- CmsView cmsView = CmsView.getCmsView(parent);
+ public CmsUi initUi(Object parent) {
+ Composite uiParent =(Composite) parent;
+ String uiName = uiParent.getData(UI_NAME_PROPERTY) != null ? uiParent.getData(UI_NAME_PROPERTY).toString() : null;
+ CmsView cmsView = CmsSwtUtils.getCmsView(uiParent);
if (cmsView == null)
throw new IllegalStateException("No CMS view is registered.");
CmsTheme theme = getTheme(uiName);
if (theme != null)
- CmsTheme.registerCmsTheme(parent.getShell(), theme);
- SuiteUi argeoSuiteUi = new SuiteUi(parent, SWT.INHERIT_DEFAULT);
+ CmsSwtUtils.registerCmsTheme(uiParent.getShell(), theme);
+ SuiteUi argeoSuiteUi = new SuiteUi(uiParent, SWT.INHERIT_DEFAULT);
String uid = cmsView.getUid();
managedUis.put(uid, argeoSuiteUi);
argeoSuiteUi.addDisposeListener((e) -> {
}
@Override
- public void refreshUi(Composite parent, String state) {
+ public void refreshUi(CmsUi cmsUi, String state) {
try {
Node context = null;
- SuiteUi ui = (SuiteUi) parent;
+ SuiteUi ui = (SuiteUi) cmsUi;
String uiName = Objects.toString(ui.getParent().getData(UI_NAME_PROPERTY), null);
if (uiName == null)
throw new IllegalStateException("UI name should not be null");
- CmsView cmsView = CmsView.getCmsView(parent);
+ CmsView cmsView = CmsSwtUtils.getCmsView(ui);
CmsUiProvider headerUiProvider = findUiProvider(headerPid);
CmsUiProvider footerUiProvider = findUiProvider(footerPid);
CmsUiProvider leadPaneUiProvider;
if (footerUiProvider != null)
refreshPart(footerUiProvider, ui.getFooter(), context);
ui.layout(true, true);
- setState(parent, state != null ? state : defaultLayerPid);
+ setState(ui, state != null ? state : defaultLayerPid);
}
} catch (Exception e) {
CmsFeedback.show("Unexpected exception", e);
}
private void refreshPart(CmsUiProvider uiProvider, Composite part, Node context) {
- CmsUiUtils.clear(part);
+ CmsSwtUtils.clear(part);
uiProvider.createUiPart(part, context);
}
}
@Override
- public void setState(Composite parent, String state) {
+ public void setState(CmsUi cmsUi, String state) {
if (state == null)
return;
if (!state.startsWith("/")) {
- if (parent instanceof SuiteUi) {
- SuiteUi ui = (SuiteUi) parent;
+ if (cmsUi instanceof SuiteUi) {
+ SuiteUi ui = (SuiteUi) cmsUi;
if (LOGIN.equals(state)) {
String appTitle = "";
if (ui.getTitle() != null)
}
return;
}
- SuiteUi suiteUi = (SuiteUi) parent;
+ SuiteUi suiteUi = (SuiteUi) cmsUi;
Node node = stateToNode(suiteUi, state);
if (node == null) {
suiteUi.getCmsView().navigateTo(HOME_STATE);
this.cmsUserManager = cmsUserManager;
}
+ public Repository getRepository() {
+ return repository;
+ }
+
+ public void setRepository(Repository repository) {
+ this.repository = repository;
+ }
+
+
}
import javax.jcr.Node;
-import org.argeo.cms.ui.util.CmsEvent;
+import org.argeo.api.cms.CmsEvent;
import org.argeo.jcr.Jcr;
import org.osgi.service.useradmin.User;
package org.argeo.suite.ui;
-import org.argeo.cms.ui.util.CmsIcon;
+import org.argeo.cms.swt.CmsIcon;
/** Icon names used by Argeo Suite. */
public enum SuiteIcon implements CmsIcon {
package org.argeo.suite.ui;
-import org.argeo.cms.ui.util.CmsStyle;
+import org.argeo.api.cms.CmsStyle;
/** Styles used by Argeo Suite work UI. */
public enum SuiteStyle implements CmsStyle {
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsUi;
+import org.argeo.api.cms.CmsView;
import org.argeo.cms.Localized;
-import org.argeo.cms.ui.CmsView;
-import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.jcr.Jcr;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FormLayout;
import org.eclipse.swt.widgets.Composite;
/** The view for the default ergonomics of Argeo Suite. */
-class SuiteUi extends Composite {
+class SuiteUi extends Composite implements CmsUi {
private static final long serialVersionUID = 6207018859086689108L;
private final static Log log = LogFactory.getLog(SuiteUi.class);
public SuiteUi(Composite parent, int style) {
super(parent, style);
- cmsView = CmsView.getCmsView(parent);
- this.setLayout(CmsUiUtils.noSpaceGridLayout());
+ cmsView = CmsSwtUtils.getCmsView(parent);
+ this.setLayout(CmsSwtUtils.noSpaceGridLayout());
header = new Composite(this, SWT.NONE);
- header.setLayout(CmsUiUtils.noSpaceGridLayout());
- CmsUiUtils.style(header, SuiteStyle.header);
- header.setLayoutData(CmsUiUtils.fillWidth());
+ header.setLayout(CmsSwtUtils.noSpaceGridLayout());
+ CmsSwtUtils.style(header, SuiteStyle.header);
+ header.setLayoutData(CmsSwtUtils.fillWidth());
belowHeader = new Composite(this, SWT.NONE);
- belowHeader.setLayoutData(CmsUiUtils.fillAll());
+ belowHeader.setLayoutData(CmsSwtUtils.fillAll());
footer = new Composite(this, SWT.NONE);
- footer.setLayout(CmsUiUtils.noSpaceGridLayout());
- CmsUiUtils.style(footer, SuiteStyle.footer);
- footer.setLayoutData(CmsUiUtils.fillWidth());
+ footer.setLayout(CmsSwtUtils.noSpaceGridLayout());
+ CmsSwtUtils.style(footer, SuiteStyle.footer);
+ footer.setLayoutData(CmsSwtUtils.fillWidth());
}
public void refreshBelowHeader(boolean initApp) {
- CmsUiUtils.clear(belowHeader);
+ CmsSwtUtils.clear(belowHeader);
int style = getStyle();
if (initApp) {
- belowHeader.setLayout(CmsUiUtils.noSpaceGridLayout(3));
+ belowHeader.setLayout(CmsSwtUtils.noSpaceGridLayout(3));
if (SWT.RIGHT_TO_LEFT == (style & SWT.RIGHT_TO_LEFT)) {// arabic, hebrew, etc.
sidePane = new Composite(belowHeader, SWT.NONE);
- sidePane.setLayout(CmsUiUtils.noSpaceGridLayout());
- sidePane.setLayoutData(CmsUiUtils.fillHeight());
+ sidePane.setLayout(CmsSwtUtils.noSpaceGridLayout());
+ sidePane.setLayoutData(CmsSwtUtils.fillHeight());
dynamicArea = new Composite(belowHeader, SWT.NONE);
leadPane = new Composite(belowHeader, SWT.NONE);
} else {
leadPane = new Composite(belowHeader, SWT.NONE);
dynamicArea = new Composite(belowHeader, SWT.NONE);
sidePane = new Composite(belowHeader, SWT.NONE);
- sidePane.setLayout(CmsUiUtils.noSpaceGridLayout());
- sidePane.setLayoutData(CmsUiUtils.fillHeight());
+ sidePane.setLayout(CmsSwtUtils.noSpaceGridLayout());
+ sidePane.setLayoutData(CmsSwtUtils.fillHeight());
}
- leadPane.setLayoutData(CmsUiUtils.fillHeight());
- leadPane.setLayout(CmsUiUtils.noSpaceGridLayout());
- CmsUiUtils.style(leadPane, SuiteStyle.leadPane);
+ leadPane.setLayoutData(CmsSwtUtils.fillHeight());
+ leadPane.setLayout(CmsSwtUtils.noSpaceGridLayout());
+ CmsSwtUtils.style(leadPane, SuiteStyle.leadPane);
- dynamicArea.setLayoutData(CmsUiUtils.fillAll());
+ dynamicArea.setLayoutData(CmsSwtUtils.fillAll());
dynamicArea.setLayout(new FormLayout());
} else {
- belowHeader.setLayout(CmsUiUtils.noSpaceGridLayout());
+ belowHeader.setLayout(CmsSwtUtils.noSpaceGridLayout());
}
}
protected Composite initLayer(String id, SuiteLayer layer, Node context) {
Composite workArea = cmsView.doAs(() -> (Composite) layer.createUiPart(dynamicArea, context));
- CmsUiUtils.style(workArea, SuiteStyle.workArea);
- workArea.setLayoutData(CmsUiUtils.coverAll());
+ CmsSwtUtils.style(workArea, SuiteStyle.workArea);
+ workArea.setLayoutData(CmsSwtUtils.coverAll());
workAreas.put(id, workArea);
return workArea;
}
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import org.argeo.api.cms.CmsEditable;
+import org.argeo.api.cms.CmsEvent;
+import org.argeo.api.cms.CmsStyle;
+import org.argeo.api.cms.CmsTheme;
+import org.argeo.api.cms.CmsView;
import org.argeo.cms.LocaleUtils;
import org.argeo.cms.Localized;
import org.argeo.cms.auth.CurrentUser;
-import org.argeo.cms.ui.CmsEditable;
-import org.argeo.cms.ui.CmsTheme;
-import org.argeo.cms.ui.CmsView;
-import org.argeo.cms.ui.dialogs.LightweightDialog;
-import org.argeo.cms.ui.util.CmsEvent;
-import org.argeo.cms.ui.util.CmsIcon;
+import org.argeo.cms.swt.CmsIcon;
+import org.argeo.cms.swt.CmsSwtUtils;
+import org.argeo.cms.swt.dialogs.LightweightDialog;
import org.argeo.cms.ui.util.CmsLink;
-import org.argeo.cms.ui.util.CmsStyle;
import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.eclipse.ui.EclipseUiUtils;
import org.argeo.entity.EntityNames;
/** creates a title bar composite with label and optional button */
public static void addTitleBar(Composite parent, String title, Boolean isEditable) {
Composite titleBar = new Composite(parent, SWT.NONE);
- titleBar.setLayoutData(CmsUiUtils.fillWidth());
- CmsUiUtils.style(titleBar, SuiteStyle.titleContainer);
+ titleBar.setLayoutData(CmsSwtUtils.fillWidth());
+ CmsSwtUtils.style(titleBar, SuiteStyle.titleContainer);
- titleBar.setLayout(CmsUiUtils.noSpaceGridLayout(new GridLayout(2, false)));
+ titleBar.setLayout(CmsSwtUtils.noSpaceGridLayout(new GridLayout(2, false)));
Label titleLbl = new Label(titleBar, SWT.NONE);
titleLbl.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
- CmsUiUtils.style(titleLbl, SuiteStyle.titleLabel);
+ CmsSwtUtils.style(titleLbl, SuiteStyle.titleLabel);
titleLbl.setText(title);
if (isEditable) {
Button editBtn = new Button(titleBar, SWT.PUSH);
editBtn.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false));
- CmsUiUtils.style(editBtn, SuiteStyle.inlineButton);
+ CmsSwtUtils.style(editBtn, SuiteStyle.inlineButton);
editBtn.setText("Edit");
}
}
Label lbl = new Label(parent, SWT.WRAP);
lbl.setText(label);
// lbl.setLayoutData(new GridData(SWT.LEAD, SWT.CENTER, true, true));
- CmsUiUtils.style(lbl, SuiteStyle.simpleLabel);
+ CmsSwtUtils.style(lbl, SuiteStyle.simpleLabel);
return lbl;
}
if (message != null)
txt.setMessage(message);
txt.setLayoutData(new GridData(SWT.LEAD, SWT.CENTER, true, true));
- CmsUiUtils.style(txt, SuiteStyle.simpleText);
+ CmsSwtUtils.style(txt, SuiteStyle.simpleText);
return txt;
}
public static Text addFormInputField(Composite parent, String placeholder) {
Text txt = new Text(parent, SWT.BORDER);
- GridData gridData = CmsUiUtils.fillWidth();
+ GridData gridData = CmsSwtUtils.fillWidth();
txt.setLayoutData(gridData);
if (placeholder != null)
txt.setText(placeholder);
- CmsUiUtils.style(txt, SuiteStyle.simpleInput);
+ CmsSwtUtils.style(txt, SuiteStyle.simpleInput);
return txt;
}
Composite lineComposite = new Composite(parent, SWT.NONE);
lineComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
lineComposite.setLayout(new GridLayout(2, false));
- CmsUiUtils.style(lineComposite, SuiteStyle.formLine);
+ CmsSwtUtils.style(lineComposite, SuiteStyle.formLine);
addFormLabel(lineComposite, label);
Text txt = addFormTextField(lineComposite, text, null);
txt.setEditable(false);
- txt.setLayoutData(CmsUiUtils.fillWidth());
+ txt.setLayoutData(CmsSwtUtils.fillWidth());
return txt;
}
Composite lineComposite = new Composite(parent, SWT.NONE);
lineComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
lineComposite.setLayout(new GridLayout(2, false));
- CmsUiUtils.style(lineComposite, SuiteStyle.formLine);
+ CmsSwtUtils.style(lineComposite, SuiteStyle.formLine);
addFormLabel(lineComposite, label);
String text = Jcr.get(node, property);
// int style = cmsEditable.isEditing() ? SWT.WRAP : SWT.WRAP;
} else {
txt.setEditable(false);
}
- txt.setLayoutData(CmsUiUtils.fillWidth());
+ txt.setLayoutData(CmsSwtUtils.fillWidth());
return txt;
}
Composite lineComposite = new Composite(parent, SWT.NONE);
lineComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
lineComposite.setLayout(new GridLayout(2, false));
- CmsUiUtils.style(lineComposite, SuiteStyle.formLine);
+ CmsSwtUtils.style(lineComposite, SuiteStyle.formLine);
addFormLabel(lineComposite, label);
Text txt = addFormInputField(lineComposite, placeholder);
- txt.setLayoutData(CmsUiUtils.fillWidth());
+ txt.setLayoutData(CmsSwtUtils.fillWidth());
return txt;
}
Composite lineComposite = new Composite(parent, SWT.NONE);
lineComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
lineComposite.setLayout(new GridLayout(3, false));
- CmsUiUtils.style(lineComposite, SuiteStyle.formLine);
+ CmsSwtUtils.style(lineComposite, SuiteStyle.formLine);
Label offsetLbl = new Label(lineComposite, SWT.NONE);
GridData gridData = new GridData();
gridData.widthHint = offset;
offsetLbl.setLayoutData(gridData);
addFormLabel(lineComposite, label);
Text txt = addFormTextField(lineComposite, text, null);
- txt.setLayoutData(CmsUiUtils.fillWidth());
+ txt.setLayoutData(CmsSwtUtils.fillWidth());
return txt;
}
addFormLabel(parent, label);
Text txt = addFormTextField(parent, text, null);
txt.setEditable(false);
- txt.setLayoutData(CmsUiUtils.fillWidth());
+ txt.setLayoutData(CmsSwtUtils.fillWidth());
return txt;
}
} else {
txt.setEditable(false);
}
- txt.setLayoutData(CmsUiUtils.fillWidth());
+ txt.setLayoutData(CmsSwtUtils.fillWidth());
return txt;
}
Composite lineComposite = new Composite(parent, SWT.NONE);
lineComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
lineComposite.setLayout(new GridLayout(2, true));
- CmsUiUtils.style(lineComposite, SuiteStyle.formLine);
+ CmsSwtUtils.style(lineComposite, SuiteStyle.formLine);
addFormLabel(lineComposite, label);
return addPicture(lineComposite, fileNode);
height = Math.round(ratio * height);
}
Label img = new Label(parent, SWT.NONE);
- CmsUiUtils.markup(img);
+ CmsSwtUtils.markup(img);
StringBuffer txt = new StringBuffer();
String target = toLink(link);
if (target != null)
protected Control createDialogArea(Composite parent) {
parent.setLayout(new GridLayout());
ScrolledComposite scroll = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
- scroll.setLayoutData(CmsUiUtils.fillAll());
- scroll.setLayout(CmsUiUtils.noSpaceGridLayout());
+ scroll.setLayoutData(CmsSwtUtils.fillAll());
+ scroll.setLayout(CmsSwtUtils.noSpaceGridLayout());
scroll.setExpandHorizontal(true);
scroll.setExpandVertical(true);
// scroll.setAlwaysShowScrollBars(true);
Composite c = new Composite(scroll, SWT.NONE);
scroll.setContent(c);
c.setLayout(new GridLayout());
- c.setLayoutData(CmsUiUtils.fillAll());
+ c.setLayoutData(CmsSwtUtils.fillAll());
Label bigImg = new Label(c, SWT.NONE);
- CmsUiUtils.markup(bigImg);
+ CmsSwtUtils.markup(bigImg);
bigImg.setText(CmsUiUtils.img(fileNode, Jcr.get(content, EntityNames.SVG_WIDTH),
Jcr.get(content, EntityNames.SVG_HEIGHT)));
bigImg.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, true, true));
}
public static String toLink(Node node) {
- try {
return node != null ? "#" + CmsUiUtils.cleanPathForUrl(SuiteApp.nodeToState(node)) : null;
- } catch (RepositoryException e) {
- throw new JcrException("Cannot get link from " + node, e);
- }
}
public static Control addLink(Composite parent, String label, Node node, CmsStyle style)
public static Control addExternalLink(Composite parent, String label, String url, String plainCssAnchorClass,
boolean newWindow) throws RepositoryException {
Label lbl = new Label(parent, SWT.NONE);
- CmsUiUtils.markup(lbl);
+ CmsSwtUtils.markup(lbl);
StringBuilder txt = new StringBuilder();
txt.append("<a class='" + plainCssAnchorClass + "'");
txt.append(" href='").append(url).append("'");
public static Button createLayerButton(Composite parent, String layer, Localized msg, CmsIcon icon,
ClassLoader l10nClassLoader) {
- CmsTheme theme = CmsTheme.getCmsTheme(parent);
+ CmsTheme theme = CmsSwtUtils.getCmsTheme(parent);
Button button = new Button(parent, SWT.PUSH);
- CmsUiUtils.style(button, SuiteStyle.leadPane);
+ CmsSwtUtils.style(button, SuiteStyle.leadPane);
if (icon != null)
button.setImage(icon.getBigIcon(theme));
button.setLayoutData(new GridData(SWT.CENTER, SWT.BOTTOM, true, false));
// button.setToolTipText(msg.lead());
if (msg != null) {
Label lbl = new Label(parent, SWT.CENTER);
- CmsUiUtils.style(lbl, SuiteStyle.leadPane);
+ CmsSwtUtils.style(lbl, SuiteStyle.leadPane);
String txt = LocaleUtils.lead(msg, l10nClassLoader);
// String txt = msg.lead();
lbl.setText(txt);
lbl.setLayoutData(new GridData(SWT.CENTER, SWT.TOP, true, false));
}
- CmsUiUtils.sendEventOnSelect(button, SuiteEvent.switchLayer.topic(), SuiteEvent.LAYER, layer);
+ CmsSwtUtils.sendEventOnSelect(button, SuiteEvent.switchLayer.topic(), SuiteEvent.LAYER, layer);
return button;
}
import java.util.HashMap;
import java.util.Map;
-import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.eclipse.ui.EclipseUiUtils;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.swt.SWT;
Button btn = new Button(boxCmp, SWT.FLAT | SWT.LEAD);
btn.setText(getLabel(actionId));
btn.setLayoutData(EclipseUiUtils.fillWidth());
- CmsUiUtils.markup(btn);
+ CmsSwtUtils.markup(btn);
// CmsUiUtils.style(btn, actionId + ConnectUiStyles.BUTTON_SUFFIX);
btn.setData(KEY_ACTION_ID, actionId);
btn.addSelectionListener(asl);
import java.util.Arrays;
import java.util.List;
-import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.eclipse.ui.EclipseUiUtils;
import org.eclipse.rap.rwt.widgets.DropDown;
import org.eclipse.swt.SWT;
dropDown = new DropDown(text);
Object obj = dropDown;
if (obj instanceof Widget)
- CmsUiUtils.markup((Widget) obj);
+ CmsSwtUtils.markup((Widget) obj);
readOnly = (style & SWT.READ_ONLY) != 0;
this.refreshOnFocus = refreshOnFocus;
addListeners();
import javax.jcr.Node;
+import org.argeo.cms.swt.CmsSwtUtils;
+import org.argeo.cms.swt.Selected;
import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.cms.ui.viewers.Section;
-import org.argeo.eclipse.ui.Selected;
import org.argeo.jcr.Jcr;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StackLayout;
public TabbedArea(Composite parent, int style) {
super(parent, SWT.NONE);
- CmsUiUtils.style(parent, bodyStyle);
+ CmsSwtUtils.style(parent, bodyStyle);
- setLayout(CmsUiUtils.noSpaceGridLayout());
+ setLayout(CmsSwtUtils.noSpaceGridLayout());
// TODO manage tabs at bottom or sides
headers = new Composite(this, SWT.NONE);
- headers.setLayoutData(CmsUiUtils.fillWidth());
+ headers.setLayoutData(CmsSwtUtils.fillWidth());
body = new Composite(this, SWT.NONE);
- body.setLayoutData(CmsUiUtils.fillAll());
+ body.setLayoutData(CmsSwtUtils.fillAll());
// body.setLayout(new FormLayout());
stackLayout = new StackLayout();
body.setLayout(stackLayout);
for (Control tab : headers.getChildren())
tab.dispose();
- headers.setLayout(CmsUiUtils.noSpaceGridLayout(new GridLayout(tabCount, true)));
+ headers.setLayout(CmsSwtUtils.noSpaceGridLayout(new GridLayout(tabCount, true)));
if (sections.size() == 0) {
Composite emptyHeader = new Composite(headers, SWT.NONE);
- emptyHeader.setLayoutData(CmsUiUtils.fillAll());
+ emptyHeader.setLayoutData(CmsSwtUtils.fillAll());
emptyHeader.setLayout(new GridLayout());
Label lbl = new Label(emptyHeader, SWT.NONE);
lbl.setText("");
for (Section section : sections) {
boolean selected = section == currentSection;
Composite sectionHeader = section.createHeader(headers);
- CmsUiUtils.style(sectionHeader, selected ? tabSelectedStyle : tabStyle);
+ CmsSwtUtils.style(sectionHeader, selected ? tabSelectedStyle : tabStyle);
int headerColumns = singleTab ? 1 : 2;
sectionHeader.setLayout(new GridLayout(headerColumns, false));
- sectionHeader.setLayout(CmsUiUtils.noSpaceGridLayout(headerColumns));
+ sectionHeader.setLayout(CmsSwtUtils.noSpaceGridLayout(headerColumns));
Button title = new Button(sectionHeader, SWT.FLAT);
- CmsUiUtils.style(title, selected ? tabSelectedStyle : tabStyle);
- title.setLayoutData(CmsUiUtils.fillWidth());
+ CmsSwtUtils.style(title, selected ? tabSelectedStyle : tabStyle);
+ title.setLayoutData(CmsSwtUtils.fillWidth());
title.addSelectionListener((Selected) (e) -> showTab(tabIndex(section.getNode())));
Node node = section.getNode();
String titleStr = Jcr.getTitle(node);
closeItem.setImage(closeIcon);
else
closeItem.setText("X");
- CmsUiUtils.style(closeItem, selected ? tabSelectedStyle : tabStyle);
+ CmsSwtUtils.style(closeItem, selected ? tabSelectedStyle : tabStyle);
closeItem.addSelectionListener((Selected) (e) -> closeTab(section));
}
}
return;
}
if (sections.size() == 0)
- CmsUiUtils.clear(body);
+ CmsSwtUtils.clear(body);
Section currentSection = getCurrentSection();
int currentIndex = sections.indexOf(currentSection);
Section previousSection = new Section(body, SWT.NONE, context);
protected void build(Section section, CmsUiProvider uiProvider, Node context) {
for (Control child : section.getChildren())
child.dispose();
- CmsUiUtils.style(section, bodyStyle);
+ CmsSwtUtils.style(section, bodyStyle);
section.setNode(context);
uiProvider.createUiPart(section, context);
package org.argeo.suite.ui.widgets;
-import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StackLayout;
parent.setLayout(new GridLayout());
Composite searchC = new Composite(parent, SWT.NONE);
searchC.setLayout(new GridLayout());
- searchC.setLayoutData(CmsUiUtils.fillWidth());
+ searchC.setLayoutData(CmsSwtUtils.fillWidth());
createSearchUi(searchC);
Composite bodyC = new Composite(parent, SWT.NONE);
- bodyC.setLayoutData(CmsUiUtils.fillAll());
+ bodyC.setLayoutData(CmsSwtUtils.fillAll());
bodyLayout = new StackLayout();
bodyC.setLayout(bodyLayout);
Composite treeC = new Composite(bodyC, SWT.NONE);
}
protected void createSearchUi(Composite parent) {
- parent.setLayout(CmsUiUtils.noSpaceGridLayout());
+ parent.setLayout(CmsSwtUtils.noSpaceGridLayout());
searchT = new Text(parent, SWT.MULTI | SWT.BORDER);
- searchT.setLayoutData(CmsUiUtils.fillWidth());
+ searchT.setLayoutData(CmsSwtUtils.fillWidth());
}
protected void createTreeUi(Composite parent) {
- parent.setLayout(CmsUiUtils.noSpaceGridLayout());
+ parent.setLayout(CmsSwtUtils.noSpaceGridLayout());
treeViewer = new TreeViewer(parent);
- treeViewer.getTree().setLayoutData(CmsUiUtils.fillAll());
+ treeViewer.getTree().setLayoutData(CmsSwtUtils.fillAll());
}
protected void createSearchResultsUi(Composite parent) {
- parent.setLayout(CmsUiUtils.noSpaceGridLayout());
+ parent.setLayout(CmsSwtUtils.noSpaceGridLayout());
searchResultsViewer = new TreeViewer(parent);
- searchResultsViewer.getTree().setLayoutData(CmsUiUtils.fillAll());
+ searchResultsViewer.getTree().setLayoutData(CmsSwtUtils.fillAll());
}
public TreeViewer getTreeViewer() {
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.argeo.cms.auth.CmsSession;
+import org.argeo.api.cms.CmsSession;
import org.argeo.cms.jcr.CmsJcrUtils;
import org.argeo.cms.servlet.ServletAuthUtils;
import org.argeo.jcr.Jcr;