Attachment #207359 for bug #357618

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 357618
Collapse All | Expand All

Lines 45-50 public class MEBoolControl extends AbstractMEControl { Link Here

(-)a/org.eclipse.emf.ecp.editor/src/org/eclipse/emf/ecp/editor/mecontrols/MEBoolControl.java (+3 lines)
45	Object feature = getItemPropertyDescriptor().getFeature(getModelElement());	45	Object feature = getItemPropertyDescriptor().getFeature(getModelElement());
46	this.attribute = (EAttribute) feature;	46	this.attribute = (EAttribute) feature;
47	check = getToolkit().createButton(parent, "", SWT.CHECK);	47	check = getToolkit().createButton(parent, "", SWT.CHECK);
		48	if (!getItemPropertyDescriptor().canSetProperty(getModelElement())) {
		49	check.setEnabled(false);
		50	}
48	IObservableValue model = EMFEditObservables.observeValue(getEditingDomain(), getModelElement(), attribute);	51	IObservableValue model = EMFEditObservables.observeValue(getEditingDomain(), getModelElement(), attribute);
49	EMFDataBindingContext dbc = new EMFDataBindingContext();	52	EMFDataBindingContext dbc = new EMFDataBindingContext();
50	dbc.bindValue(SWTObservables.observeSelection(check), model, null, null);	53	dbc.bindValue(SWTObservables.observeSelection(check), model, null, null);

Lines 65-70 public class MEDoubleControl extends AbstractMEControl { Link Here

(-)a/org.eclipse.emf.ecp.editor/src/org/eclipse/emf/ecp/editor/mecontrols/MEDoubleControl.java (+3 lines)
65	spinner.setDigits(digits);	65	spinner.setDigits(digits);
66	spinner.setMinimum(-1000000);	66	spinner.setMinimum(-1000000);
67	spinner.setMaximum(1000000);	67	spinner.setMaximum(1000000);
		68	if (!getItemPropertyDescriptor().canSetProperty(getModelElement())) {
		69	spinner.setEnabled(false);
		70	}
68	IObservableValue model = EMFEditObservables.observeValue(getEditingDomain(), getModelElement(), attribute);	71	IObservableValue model = EMFEditObservables.observeValue(getEditingDomain(), getModelElement(), attribute);
69	EMFDataBindingContext dbc = new EMFDataBindingContext();	72	EMFDataBindingContext dbc = new EMFDataBindingContext();
70	DoubleSpinnerObservable spinnerObservable = new DoubleSpinnerObservable(spinner);	73	DoubleSpinnerObservable spinnerObservable = new DoubleSpinnerObservable(spinner);

Lines 46-51 public class MEIntControl extends AbstractMEControl { Link Here

(-)a/org.eclipse.emf.ecp.editor/src/org/eclipse/emf/ecp/editor/mecontrols/MEIntControl.java (+3 lines)
46	spinner = new Spinner(parent, style);	46	spinner = new Spinner(parent, style);
47	spinner.setMinimum(-1000);	47	spinner.setMinimum(-1000);
48	spinner.setMaximum(1000);	48	spinner.setMaximum(1000);
		49	if (!getItemPropertyDescriptor().canSetProperty(getModelElement())) {
		50	spinner.setEnabled(false);
		51	}
49	IObservableValue model = EMFEditObservables.observeValue(getEditingDomain(), getModelElement(), attribute);	52	IObservableValue model = EMFEditObservables.observeValue(getEditingDomain(), getModelElement(), attribute);
50	EMFDataBindingContext dbc = new EMFDataBindingContext();	53	EMFDataBindingContext dbc = new EMFDataBindingContext();
51	dbc.bindValue(SWTObservables.observeSelection(spinner), model, null, null);	54	dbc.bindValue(SWTObservables.observeSelection(spinner), model, null, null);





	private void createText() {
		text = new Text(composite, SWT.BORDER | SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);

		text.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
		text.setSize(10, 100);
		text.addFocusListener(new FocusAdapter() {

		spec.grabExcessVerticalSpace = true;
		spec.heightHint = 200;
		text.setLayoutData(spec);

		if (!getItemPropertyDescriptor().canSetProperty(getModelElement())) {
			text.setEnabled(false);
		}
	}

	private void createToolBar() {

Lines 80-85 public class MESWTDateAndTimeControl extends AbstractMEControl { Link Here

(-)a/org.eclipse.emf.ecp.editor/src/org/eclipse/emf/ecp/editor/mecontrols/MESWTDateAndTimeControl.java (+4 lines)
80	timeWidget = new DateTime(dateComposite, SWT.TIME \| SWT.SHORT);	80	timeWidget = new DateTime(dateComposite, SWT.TIME \| SWT.SHORT);
81	timeWidget.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));	81	timeWidget.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
82		82
		83	if (!getItemPropertyDescriptor().canSetProperty(getModelElement())) {
		84	dateWidget.setEnabled(false);
		85	timeWidget.setEnabled(false);
		86	}
83	dateDeleteButton = new ImageHyperlink(dateComposite, SWT.TOP);	87	dateDeleteButton = new ImageHyperlink(dateComposite, SWT.TOP);
84	dateDeleteButton.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_TOOL_DELETE));	88	dateDeleteButton.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_TOOL_DELETE));
85	dateDeleteButton.addMouseListener(new MouseAdapter() {	89	dateDeleteButton.addMouseListener(new MouseAdapter() {




	protected FormToolkit toolkit;
	private org.eclipse.emf.ecp.editor.ModelElementChangeListener modelElementChangeListener;
	private ECPModelelementContext context;
	private IItemPropertyDescriptor pDescriptor;
	public ECPModelelementContext getContext() {
		return context;
	}

		this.context = context;
	}

	
	/**
	 * {@inheritDoc}
	 */
	public Control createControl(final Composite parent, int style, IItemPropertyDescriptor itemPropertyDescriptor,
		final EObject link, EObject contextModelElement, FormToolkit toolkit, ECPModelelementContext context) {
		this.context = context;
		pDescriptor=itemPropertyDescriptor;
		Object feature = itemPropertyDescriptor.getFeature(link);
		this.eReference = (EReference) feature;
		this.link = link;

	protected Control createControl(final Composite parent, int style) {
		linkComposite = toolkit.createComposite(parent, style);
		linkComposite.setLayout(new GridLayout(3, false));
		if (!pDescriptor.canSetProperty(contextModelElement)) {
			linkComposite.setEnabled(false);
		}
		createHyperlink(parent, style);
		createDeleteAction(style);
		return linkComposite;

Lines 190-195 public class MEMultiLinkControl extends AbstractMEControl { Link Here

(-)a/org.eclipse.emf.ecp.editor/src/org/eclipse/emf/ecp/editor/mecontrols/melinkcontrol/MEMultiLinkControl.java (+3 lines)
190	createSectionToolbar(section, getToolkit());	190	createSectionToolbar(section, getToolkit());
191	composite = getToolkit().createComposite(section, style);	191	composite = getToolkit().createComposite(section, style);
192	composite.setLayout(tableLayout);	192	composite.setLayout(tableLayout);
		193	if (!getItemPropertyDescriptor().canSetProperty(getModelElement())) {
		194	composite.setEnabled(false);
		195	}
193		196
194	rebuildLinkSection();	197	rebuildLinkSection();
195		198

Lines 72-77 public class MESingleLinkControl extends AbstractMEControl { Link Here

(-)a/org.eclipse.emf.ecp.editor/src/org/eclipse/emf/ecp/editor/mecontrols/melinkcontrol/MESingleLinkControl.java (+3 lines)
72	this.eReference = (EReference) feature;	72	this.eReference = (EReference) feature;
73	composite = getToolkit().createComposite(parent, style);	73	composite = getToolkit().createComposite(parent, style);
74	composite.setLayout(new GridLayout(3, false));	74	composite.setLayout(new GridLayout(3, false));
		75	if (!getItemPropertyDescriptor().canSetProperty(getModelElement())) {
		76	composite.setEnabled(false);
		77	}
75	GridLayoutFactory.fillDefaults().spacing(0, 0).numColumns(3).equalWidth(false).applyTo(composite);	78	GridLayoutFactory.fillDefaults().spacing(0, 0).numColumns(3).equalWidth(false).applyTo(composite);
76	this.parent = parent;	79	this.parent = parent;
77	this.style = style;	80	this.style = style;

Lines 95-101 public abstract class MultiAttributeControl extends AbstractMEControl { Link Here

(-)a/org.eclipse.emf.ecp.editor/src/org/eclipse/emf/ecp/editor/mecontrols/multiattributecontrol/MultiAttributeControl.java (-1 / +3 lines)
95	setComposite(getToolkit().createComposite(parent, style \| SWT.BORDER));	95	setComposite(getToolkit().createComposite(parent, style \| SWT.BORDER));
96	configureGridLayout();	96	configureGridLayout();
97	getComposite().setLayout(gridLayout);	97	getComposite().setLayout(gridLayout);
98		98	if (!getItemPropertyDescriptor().canSetProperty(getModelElement())) {
		99	getComposite().setEnabled(false);
		100	}
99	// re-set upper bound... needed because canRender() was called in an other instance	101	// re-set upper bound... needed because canRender() was called in an other instance
100	upperBound = feature.getUpperBound();	102	upperBound = feature.getUpperBound();
101		103

Return to bug 357618

Lines 91-97 public class MERichTextControl extends AbstractMEControl { Link Here

(-)a/org.eclipse.emf.ecp.editor/src/org/eclipse/emf/ecp/editor/mecontrols/MERichTextControl.java (-1 / +4 lines)
91		91
92	private void createText() {	92	private void createText() {
93	text = new Text(composite, SWT.BORDER \| SWT.MULTI \| SWT.WRAP \| SWT.V_SCROLL);	93	text = new Text(composite, SWT.BORDER \| SWT.MULTI \| SWT.WRAP \| SWT.V_SCROLL);
94
95	text.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));	94	text.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
96	text.setSize(10, 100);	95	text.setSize(10, 100);
97	text.addFocusListener(new FocusAdapter() {	96	text.addFocusListener(new FocusAdapter() {
Lines 110-115 public class MERichTextControl extends AbstractMEControl { Link Here
110	spec.grabExcessVerticalSpace = true;	109	spec.grabExcessVerticalSpace = true;
111	spec.heightHint = 200;	110	spec.heightHint = 200;
112	text.setLayoutData(spec);	111	text.setLayoutData(spec);
		112
		113	if (!getItemPropertyDescriptor().canSetProperty(getModelElement())) {
		114	text.setEnabled(false);
		115	}
113	}	116	}
114		117
115	private void createToolBar() {	118	private void createToolBar() {

Lines 57-63 public class MELinkControl { Link Here

(-)a/org.eclipse.emf.ecp.editor/src/org/eclipse/emf/ecp/editor/mecontrols/melinkcontrol/MELinkControl.java (-2 / +6 lines)
57	protected FormToolkit toolkit;	57	protected FormToolkit toolkit;
58	private org.eclipse.emf.ecp.editor.ModelElementChangeListener modelElementChangeListener;	58	private org.eclipse.emf.ecp.editor.ModelElementChangeListener modelElementChangeListener;
59	private ECPModelelementContext context;	59	private ECPModelelementContext context;
60		60	private IItemPropertyDescriptor pDescriptor;
61	public ECPModelelementContext getContext() {	61	public ECPModelelementContext getContext() {
62	return context;	62	return context;
63	}	63	}
Lines 66-77 public class MELinkControl { Link Here
66	this.context = context;	66	this.context = context;
67	}	67	}
68		68
		69
69	/**	70	/**
70	* {@inheritDoc}	71	* {@inheritDoc}
71	*/	72	*/
72	public Control createControl(final Composite parent, int style, IItemPropertyDescriptor itemPropertyDescriptor,	73	public Control createControl(final Composite parent, int style, IItemPropertyDescriptor itemPropertyDescriptor,
73	final EObject link, EObject contextModelElement, FormToolkit toolkit, ECPModelelementContext context) {	74	final EObject link, EObject contextModelElement, FormToolkit toolkit, ECPModelelementContext context) {
74	this.context = context;	75	this.context = context;
		76	pDescriptor=itemPropertyDescriptor;
75	Object feature = itemPropertyDescriptor.getFeature(link);	77	Object feature = itemPropertyDescriptor.getFeature(link);
76	this.eReference = (EReference) feature;	78	this.eReference = (EReference) feature;
77	this.link = link;	79	this.link = link;
Lines 84-90 public class MELinkControl { Link Here
84	protected Control createControl(final Composite parent, int style) {	86	protected Control createControl(final Composite parent, int style) {
85	linkComposite = toolkit.createComposite(parent, style);	87	linkComposite = toolkit.createComposite(parent, style);
86	linkComposite.setLayout(new GridLayout(3, false));	88	linkComposite.setLayout(new GridLayout(3, false));
87		89	if (!pDescriptor.canSetProperty(contextModelElement)) {
		90	linkComposite.setEnabled(false);
		91	}
88	createHyperlink(parent, style);	92	createHyperlink(parent, style);
89	createDeleteAction(style);	93	createDeleteAction(style);
90	return linkComposite;	94	return linkComposite;