X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fwidgets%2FStyledControl.java;h=0455d2cdc9e1f0669b8e5eecd521f1a5c53c83d3;hb=fea7cd546f9c04c00f961918919dd6307c32cc8e;hp=b085fdf9ce770ddceded5c63650b61d86ce0d8a8;hpb=5b3108fe285bca50565b58b63fa4feddc96c0765;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/StyledControl.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/StyledControl.java index b085fdf9c..0455d2cdc 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/StyledControl.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/StyledControl.java @@ -1,10 +1,10 @@ package org.argeo.cms.ui.widgets; import javax.jcr.Item; -import javax.jcr.RepositoryException; import org.argeo.cms.ui.CmsConstants; import org.argeo.cms.ui.util.CmsUiUtils; +import org.argeo.eclipse.ui.specific.EclipseUiSpecificUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.events.FocusListener; import org.eclipse.swt.events.MouseListener; @@ -29,11 +29,11 @@ public abstract class StyledControl extends JcrComposite implements CmsConstants setLayout(CmsUiUtils.noSpaceGridLayout()); } - public StyledControl(Composite parent, int style, Item item) throws RepositoryException { + public StyledControl(Composite parent, int style, Item item) { super(parent, style, item); } - public StyledControl(Composite parent, int style, Item item, boolean cacheImmediately) throws RepositoryException { + public StyledControl(Composite parent, int style, Item item, boolean cacheImmediately) { super(parent, style, item, cacheImmediately); } @@ -59,7 +59,7 @@ public abstract class StyledControl extends JcrComposite implements CmsConstants assert !isEditing(); editing = true; // int height = control.getSize().y; - String style = (String) control.getData(STYLE); + String style = (String) EclipseUiSpecificUtils.getStyleData(control); clear(false); control = createControl(box, style); setControlLayoutData(control); @@ -72,7 +72,7 @@ public abstract class StyledControl extends JcrComposite implements CmsConstants public synchronized void stopEditing() { assert isEditing(); editing = false; - String style = (String) control.getData(STYLE); + String style = (String) EclipseUiSpecificUtils.getStyleData(control); clear(false); control = createControl(box, style); setControlLayoutData(control); @@ -81,7 +81,7 @@ public abstract class StyledControl extends JcrComposite implements CmsConstants public void setStyle(String style) { Object currentStyle = null; if (control != null) - currentStyle = control.getData(STYLE); + currentStyle = EclipseUiSpecificUtils.getStyleData(control); if (currentStyle != null && currentStyle.equals(style)) return; @@ -91,8 +91,10 @@ public abstract class StyledControl extends JcrComposite implements CmsConstants control = createControl(box, style); setControlLayoutData(control); - control.getParent().setData(STYLE, style + "_box"); - control.getParent().getParent().setData(STYLE, style + "_container"); +// control.getParent().setData(STYLE, style + "_box"); + EclipseUiSpecificUtils.setStyleData(control.getParent(), style + "_box"); +// control.getParent().getParent().setData(STYLE, style + "_container"); + EclipseUiSpecificUtils.setStyleData(control.getParent().getParent(), style + "_container"); } /** To be overridden */