import java.util.List;
import java.util.Map;
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-
-import org.argeo.api.cms.CmsTheme;
-import org.argeo.app.ui.widgets.TabbedArea;
+import org.argeo.api.acr.Content;
import org.argeo.cms.Localized;
+import org.argeo.cms.swt.CmsSwtTheme;
import org.argeo.cms.swt.CmsSwtUtils;
-import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.jcr.JcrException;
+import org.argeo.cms.swt.acr.SwtTabbedArea;
+import org.argeo.cms.swt.acr.SwtUiProvider;
import org.argeo.util.LangUtils;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
import org.osgi.framework.wiring.BundleWiring;
/** An app layer based on an entry area and an editor area. */
public class DefaultEditionLayer implements SuiteLayer {
- private CmsUiProvider entryArea;
- private CmsUiProvider defaultView;
- private CmsUiProvider workArea;
+ private String id;
+ private SwtUiProvider entryArea;
+ private SwtUiProvider defaultView;
+ private SwtUiProvider workArea;
private List<String> weights = new ArrayList<>();
private boolean startMaximized = false;
private boolean fixedEntryArea = false;
private Localized title = null;
@Override
- public Control createUi(Composite parent, Node context) throws RepositoryException {
+ public Control createUiPart(Composite parent, Content context) {
// TODO Factorize more, or split into more specialised classes?
if (entryArea != null) {
if (fixedEntryArea) {
FixedEditionArea editionArea = new FixedEditionArea(parent, parent.getStyle());
- Control entryAreaC = entryArea.createUi(editionArea.getEntryArea(), context);
+ Control entryAreaC = entryArea.createUiPart(editionArea.getEntryArea(), context);
CmsSwtUtils.style(entryAreaC, SuiteStyle.entryArea);
if (this.defaultView != null) {
editionArea.getTabbedArea().view(defaultView, context);
return editionArea;
} else {
SashFormEditionArea editionArea = new SashFormEditionArea(parent, parent.getStyle());
- entryArea.createUi(editionArea.getEntryArea(), context);
+ entryArea.createUiPart(editionArea.getEntryArea(), context);
if (this.defaultView != null) {
editionArea.getTabbedArea().view(defaultView, context);
}
} else {
if (this.workArea != null) {
Composite area = new Composite(parent, SWT.NONE);
- this.workArea.createUi(area, context);
+ this.workArea.createUiPart(area, context);
return area;
}
- CmsTheme theme = CmsSwtUtils.getCmsTheme(parent);
- TabbedArea tabbedArea = createTabbedArea(parent, theme);
+ CmsSwtTheme theme = CmsSwtUtils.getCmsTheme(parent);
+ SwtTabbedArea tabbedArea = createTabbedArea(parent, theme);
return tabbedArea;
}
}
@Override
- public void view(CmsUiProvider uiProvider, Composite workAreaC, Node context) {
+ public void view(SwtUiProvider uiProvider, Composite workAreaC, Content context) {
if (workArea != null) {
- try {
- CmsSwtUtils.clear(workAreaC);
- workArea.createUi(workAreaC, context);
- workAreaC.layout(true, true);
- return;
- } catch (RepositoryException e) {
- throw new JcrException("Cannot rebuild work area", e);
- }
+ CmsSwtUtils.clear(workAreaC);
+ workArea.createUiPart(workAreaC, context);
+ workAreaC.layout(true, true);
+ return;
}
// tabbed area
- TabbedArea tabbedArea = findTabbedArea(workAreaC);
+ SwtTabbedArea tabbedArea = findTabbedArea(workAreaC);
if (tabbedArea == null)
throw new IllegalArgumentException("Unsupported work area " + workAreaC.getClass().getName());
if (uiProvider == null) {
}
@Override
- public Node getCurrentContext(Composite workArea) {
- TabbedArea tabbedArea = findTabbedArea(workArea);
+ public Content getCurrentContext(Composite workArea) {
+ SwtTabbedArea tabbedArea = findTabbedArea(workArea);
if (tabbedArea == null)
return null;
return tabbedArea.getCurrentContext();
}
- private TabbedArea findTabbedArea(Composite workArea) {
- TabbedArea tabbedArea = null;
+ private SwtTabbedArea findTabbedArea(Composite workArea) {
+ SwtTabbedArea tabbedArea = null;
if (workArea instanceof SashFormEditionArea) {
tabbedArea = ((SashFormEditionArea) workArea).getTabbedArea();
} else if (workArea instanceof FixedEditionArea) {
tabbedArea = ((FixedEditionArea) workArea).getTabbedArea();
- } else if (workArea instanceof TabbedArea) {
- tabbedArea = (TabbedArea) workArea;
+ } else if (workArea instanceof SwtTabbedArea) {
+ tabbedArea = (SwtTabbedArea) workArea;
}
return tabbedArea;
}
@Override
- public void open(CmsUiProvider uiProvider, Composite workArea, Node context) {
- TabbedArea tabbedArea = ((SashFormEditionArea) workArea).getTabbedArea();
+ public void open(SwtUiProvider uiProvider, Composite workArea, Content context) {
+ SwtTabbedArea tabbedArea = ((SashFormEditionArea) workArea).getTabbedArea();
tabbedArea.open(uiProvider, context);
}
return title;
}
+ @Override
+ public String getId() {
+ return id;
+ }
+
public void init(BundleContext bundleContext, Map<String, Object> properties) {
+ String pid = (String) properties.get(Constants.SERVICE_PID);
+ id = pid;
+
weights = LangUtils.toStringList(properties.get(Property.weights.name()));
startMaximized = properties.containsKey(Property.startMaximized.name())
&& "true".equals(properties.get(Property.startMaximized.name()));
}
- public void setEntryArea(CmsUiProvider entryArea) {
+ public void setEntryArea(SwtUiProvider entryArea) {
this.entryArea = entryArea;
}
- public void setWorkArea(CmsUiProvider workArea) {
+ public void setWorkArea(SwtUiProvider workArea) {
this.workArea = workArea;
}
- public void setDefaultView(CmsUiProvider defaultView) {
+ public void setDefaultView(SwtUiProvider defaultView) {
this.defaultView = defaultView;
}
- TabbedArea createTabbedArea(Composite parent, CmsTheme theme) {
- TabbedArea tabbedArea = new TabbedArea(parent, SWT.NONE);
+ SwtTabbedArea createTabbedArea(Composite parent, CmsSwtTheme theme) {
+ SwtTabbedArea tabbedArea = new SwtTabbedArea(parent, SWT.NONE);
tabbedArea.setSingleTab(singleTab);
tabbedArea.setBodyStyle(SuiteStyle.mainTabBody.style());
tabbedArea.setTabStyle(SuiteStyle.mainTab.style());
tabbedArea.setTabSelectedStyle(SuiteStyle.mainTabSelected.style());
- tabbedArea.setCloseIcon(SuiteIcon.close.getSmallIcon(theme));
+ tabbedArea.setCloseIcon(theme.getSmallIcon(SuiteIcon.close));
tabbedArea.setLayoutData(CmsSwtUtils.fillAll());
return tabbedArea;
}
// /** A work area based on an entry area and and a tabbed area. */
class SashFormEditionArea extends SashForm {
private static final long serialVersionUID = 2219125778722702618L;
- private TabbedArea tabbedArea;
+ private SwtTabbedArea tabbedArea;
private Composite entryC;
SashFormEditionArea(Composite parent, int style) {
super(parent, SWT.HORIZONTAL);
- CmsTheme theme = CmsSwtUtils.getCmsTheme(parent);
+ CmsSwtTheme theme = CmsSwtUtils.getCmsTheme(parent);
Composite editorC;
if (SWT.RIGHT_TO_LEFT == (style & SWT.RIGHT_TO_LEFT)) {// arabic, hebrew, etc.
tabbedArea = createTabbedArea(editorC, theme);
}
- TabbedArea getTabbedArea() {
+ SwtTabbedArea getTabbedArea() {
return tabbedArea;
}
class FixedEditionArea extends Composite {
private static final long serialVersionUID = -5525672639277322465L;
- private TabbedArea tabbedArea;
+ private SwtTabbedArea tabbedArea;
private Composite entryC;
public FixedEditionArea(Composite parent, int style) {
super(parent, style);
- CmsTheme theme = CmsSwtUtils.getCmsTheme(parent);
+ CmsSwtTheme theme = CmsSwtUtils.getCmsTheme(parent);
setLayout(CmsSwtUtils.noSpaceGridLayout(2));
tabbedArea = createTabbedArea(editorC, theme);
}
- TabbedArea getTabbedArea() {
+ SwtTabbedArea getTabbedArea() {
return tabbedArea;
}
projects / gpl / argeo-suite.git / blobdiff