Skip to content

Commit

Permalink
Set kind property read only on connector
Browse files Browse the repository at this point in the history
  • Loading branch information
mbats committed Apr 9, 2014
1 parent 07aab2d commit cf50693
Show file tree
Hide file tree
Showing 11 changed files with 202 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@
<properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_Mfht5FwGEeKZBNASYbV97A" name="leaf" views="_nujsAFv7EeKZBNASYbV97A">
<model xsi:type="ecore:EAttribute" href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//RedefinableElement/isLeaf"/>
</properties>
<properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_RQlpIFwGEeKZBNASYbV97A" name="kind" views="_aI7i0FwGEeKZBNASYbV97A">
<properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_RQlpIFwGEeKZBNASYbV97A" name="kind" views="_-Sk5sL_4EeOrofMqOn37iw">
<model xsi:type="ecore:EAttribute" href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Connector/kind"/>
</properties>
<properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_VWOo0FwGEeKZBNASYbV97A" name="static" views="_0YtDYFv7EeKZBNASYbV97A">
Expand Down Expand Up @@ -825,6 +825,9 @@
<elements xsi:type="eef-views:ElementEditor" xmi:id="_aI7i0FwGEeKZBNASYbV97A" name="kind">
<representation href="platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.2"/>
</elements>
<elements xsi:type="eef-views:ElementEditor" xmi:id="_-Sk5sL_4EeOrofMqOn37iw" name="kind_readonly" readOnly="true">
<representation href="platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.2"/>
</elements>
<elements xsi:type="eef-views:ElementEditor" xmi:id="_4NPrcHbAEeOwBvC6b4NfOg" name="trigger">
<representation href="platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.8"/>
</elements>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
*******************************************************************************/
package org.obeonetwork.dsl.uml2.properties.uml.components;

import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Package;
import org.eclipse.uml2.uml.VisibilityKind;

import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.BasicDiagnostic;
import org.eclipse.emf.common.util.Diagnostic;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ protected NotificationFilter[] getNotificationFilters() {
* @generated
*/
public boolean isRequired(Object key, int kind) {
return key == UmlViewsRepository.General.Qualifiers.leaf || key == UmlViewsRepository.General.kind || key == UmlViewsRepository.General.Qualifiers.static_ || key == UmlViewsRepository.Ends.ends_;
return key == UmlViewsRepository.General.Qualifiers.leaf || key == UmlViewsRepository.General.kind_readonly || key == UmlViewsRepository.General.Qualifiers.static_ || key == UmlViewsRepository.Ends.ends_;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ public void initPart(Object key, int kind, EObject elt, ResourceSet allResource)
}
generalPart.setLeaf(connector.isLeaf());

if (isAccessible(UmlViewsRepository.General.kind)) {
generalPart.initKind(EEFUtils.choiceOfValues(connector, UMLPackage.eINSTANCE.getConnector_Kind()), connector.getKind());
if (isAccessible(UmlViewsRepository.General.kind_readonly)) {
generalPart.initKind_readonly(EEFUtils.choiceOfValues(connector, UMLPackage.eINSTANCE.getConnector_Kind()), connector.getKind());
}
generalPart.setStatic_(connector.isStatic());

Expand Down Expand Up @@ -138,7 +138,7 @@ public EStructuralFeature associatedFeature(Object editorKey) {
if (editorKey == UmlViewsRepository.General.Qualifiers.leaf) {
return UMLPackage.eINSTANCE.getRedefinableElement_IsLeaf();
}
if (editorKey == UmlViewsRepository.General.kind) {
if (editorKey == UmlViewsRepository.General.kind_readonly) {
return UMLPackage.eINSTANCE.getConnector_Kind();
}
if (editorKey == UmlViewsRepository.General.Qualifiers.static_) {
Expand Down Expand Up @@ -189,8 +189,8 @@ public void updatePart(Notification msg) {
if (UMLPackage.eINSTANCE.getRedefinableElement_IsLeaf().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && generalPart != null && isAccessible(UmlViewsRepository.General.Qualifiers.leaf))
generalPart.setLeaf((Boolean)msg.getNewValue());

if (UMLPackage.eINSTANCE.getConnector_Kind().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && isAccessible(UmlViewsRepository.General.kind))
generalPart.setKind((ConnectorKind)msg.getNewValue());
if (UMLPackage.eINSTANCE.getConnector_Kind().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && isAccessible(UmlViewsRepository.General.kind_readonly))
generalPart.setKind_readonly((ConnectorKind)msg.getNewValue());

if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && generalPart != null && isAccessible(UmlViewsRepository.General.Qualifiers.static_))
generalPart.setStatic_((Boolean)msg.getNewValue());
Expand Down Expand Up @@ -220,7 +220,7 @@ protected NotificationFilter[] getNotificationFilters() {
* @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#mustBeComposed(java.lang.Object, int)
*/
public boolean mustBeComposed(Object key, int kind) {
return key == UmlViewsRepository.General.name || key == UmlViewsRepository.General.visibility || key == UmlViewsRepository.General.Qualifiers.leaf || key == UmlViewsRepository.General.kind || key == UmlViewsRepository.General.Qualifiers.static_ || key == UmlViewsRepository.General.Qualifiers.class;
return key == UmlViewsRepository.General.name || key == UmlViewsRepository.General.visibility || key == UmlViewsRepository.General.Qualifiers.leaf || key == UmlViewsRepository.General.kind_readonly || key == UmlViewsRepository.General.Qualifiers.static_ || key == UmlViewsRepository.General.Qualifiers.class;
}

/**
Expand All @@ -230,7 +230,7 @@ public boolean mustBeComposed(Object key, int kind) {
* @generated
*/
public boolean isRequired(Object key, int kind) {
return key == UmlViewsRepository.General.Qualifiers.leaf || key == UmlViewsRepository.General.kind || key == UmlViewsRepository.General.Qualifiers.static_ || key == UmlViewsRepository.Ends.ends_;
return key == UmlViewsRepository.General.Qualifiers.leaf || key == UmlViewsRepository.General.kind_readonly || key == UmlViewsRepository.General.Qualifiers.static_ || key == UmlViewsRepository.Ends.ends_;
}

/**
Expand Down Expand Up @@ -264,7 +264,7 @@ public Diagnostic validateValue(IPropertiesEditionEvent event) {
}
ret = Diagnostician.INSTANCE.validate(UMLPackage.eINSTANCE.getRedefinableElement_IsLeaf().getEAttributeType(), newValue);
}
if (UmlViewsRepository.General.kind == event.getAffectedEditor()) {
if (UmlViewsRepository.General.kind_readonly == event.getAffectedEditor()) {
Object newValue = event.getNewValue();
if (newValue instanceof String) {
newValue = EEFConverterUtil.createFromString(UMLPackage.eINSTANCE.getConnector_Kind().getEAttributeType(), (String)newValue);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,27 @@ public interface GeneralPropertiesEditionPart {
public void setKind(Enumerator newValue);


/**
* @return the kind_readonly
* @generated
*/
public Enumerator getKind_readonly();

/**
* Init the kind_readonly
* @param input the viewer input
* @param current the current value
*/
public void initKind_readonly(Object input, Enumerator current);

/**
* Defines a new kind_readonly
* @param newValue the new kind_readonly to set
* @generated
*/
public void setKind_readonly(Enumerator newValue);




/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,12 @@ public static class Qualifiers {

public static String kind = "uml::General::kind";

/**
* @generated
*/

public static String kind_readonly = "uml::General::kind_readonly";

/**
* @generated
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ public class GeneralPropertiesEditionPartForm extends SectionPropertiesEditingPa
protected List<ViewerFilter> clientBusinessFilters = new ArrayList<ViewerFilter>();
protected List<ViewerFilter> clientFilters = new ArrayList<ViewerFilter>();
protected EMFComboViewer kind;
protected EMFComboViewer kind_readonly;
protected ReferencesTable trigger;
protected List<ViewerFilter> triggerBusinessFilters = new ArrayList<ViewerFilter>();
protected List<ViewerFilter> triggerFilters = new ArrayList<ViewerFilter>();
Expand Down Expand Up @@ -256,6 +257,7 @@ public void createControls(final FormToolkit widgetFactory, Composite view) {
generalStep.addStep(UmlViewsRepository.General.supplier);
generalStep.addStep(UmlViewsRepository.General.client);
generalStep.addStep(UmlViewsRepository.General.kind);
generalStep.addStep(UmlViewsRepository.General.kind_readonly);
generalStep.addStep(UmlViewsRepository.General.trigger);
generalStep.addStep(UmlViewsRepository.General.effect);
generalStep.addStep(UmlViewsRepository.General.guard);
Expand Down Expand Up @@ -362,6 +364,9 @@ public Composite addToPart(Composite parent, Object key) {
if (key == UmlViewsRepository.General.kind) {
return createKindEMFComboViewer(widgetFactory, parent);
}
if (key == UmlViewsRepository.General.kind_readonly) {
return createKind_readonlyEMFComboViewer(widgetFactory, parent);
}
if (key == UmlViewsRepository.General.trigger) {
return createTriggerReferencesTable(widgetFactory, parent);
}
Expand Down Expand Up @@ -1620,6 +1625,39 @@ public void selectionChanged(SelectionChangedEvent event) {
FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(UmlViewsRepository.General.kind, UmlViewsRepository.FORM_KIND), null); //$NON-NLS-1$
// Start of user code for createKindEMFComboViewer

// End of user code
return parent;
}

/**
* @generated
*/

protected Composite createKind_readonlyEMFComboViewer(FormToolkit widgetFactory, Composite parent) {
createDescription(parent, UmlViewsRepository.General.kind_readonly, UmlMessages.GeneralPropertiesEditionPart_Kind_readonlyLabel);
kind_readonly = new EMFComboViewer(parent);
kind_readonly.setContentProvider(new ArrayContentProvider());
kind_readonly.setLabelProvider(new AdapterFactoryLabelProvider(EEFRuntimePlugin.getDefault().getAdapterFactory()));
GridData kind_readonlyData = new GridData(GridData.FILL_HORIZONTAL);
kind_readonly.getCombo().setLayoutData(kind_readonlyData);
kind_readonly.addSelectionChangedListener(new ISelectionChangedListener() {

/**
* {@inheritDoc}
*
* @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
* @generated
*/
public void selectionChanged(SelectionChangedEvent event) {
if (propertiesEditionComponent != null)
propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(GeneralPropertiesEditionPartForm.this, UmlViewsRepository.General.kind_readonly, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, getKind_readonly()));
}

});
kind_readonly.setID(UmlViewsRepository.General.kind_readonly);
FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(UmlViewsRepository.General.kind_readonly, UmlViewsRepository.FORM_KIND), null); //$NON-NLS-1$
// Start of user code for createKind_readonlyEMFComboViewer

// End of user code
return parent;
}
Expand Down Expand Up @@ -3530,6 +3568,43 @@ public void setKind(Enumerator newValue) {

}

/**
* {@inheritDoc}
*
* @see org.obeonetwork.dsl.uml2.properties.uml.parts.GeneralPropertiesEditionPart#getKind_readonly()
* @generated
*/
public Enumerator getKind_readonly() {
Enumerator selection = (Enumerator) ((StructuredSelection) kind_readonly.getSelection()).getFirstElement();
return selection;
}

/**
* {@inheritDoc}
*
* @see org.obeonetwork.dsl.uml2.properties.uml.parts.GeneralPropertiesEditionPart#initKind_readonly(Object input, Enumerator current)
*/
public void initKind_readonly(Object input, Enumerator current) {
kind_readonly.setInput(input);
kind_readonly.modelUpdating(new StructuredSelection(current));
kind_readonly.setEnabled(false);
kind_readonly.setToolTipText(UmlMessages.General_ReadOnly);

}

/**
* {@inheritDoc}
*
* @see org.obeonetwork.dsl.uml2.properties.uml.parts.GeneralPropertiesEditionPart#setKind_readonly(Enumerator newValue)
* @generated
*/
public void setKind_readonly(Enumerator newValue) {
kind_readonly.modelUpdating(new StructuredSelection(newValue));
kind_readonly.setEnabled(false);
kind_readonly.setToolTipText(UmlMessages.General_ReadOnly);

}



/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ public class GeneralPropertiesEditionPartImpl extends CompositePropertiesEdition
protected List<ViewerFilter> clientBusinessFilters = new ArrayList<ViewerFilter>();
protected List<ViewerFilter> clientFilters = new ArrayList<ViewerFilter>();
protected EMFComboViewer kind;
protected EMFComboViewer kind_readonly;
protected ReferencesTable trigger;
protected List<ViewerFilter> triggerBusinessFilters = new ArrayList<ViewerFilter>();
protected List<ViewerFilter> triggerFilters = new ArrayList<ViewerFilter>();
Expand Down Expand Up @@ -243,6 +244,7 @@ public void createControls(Composite view) {
generalStep.addStep(UmlViewsRepository.General.supplier);
generalStep.addStep(UmlViewsRepository.General.client);
generalStep.addStep(UmlViewsRepository.General.kind);
generalStep.addStep(UmlViewsRepository.General.kind_readonly);
generalStep.addStep(UmlViewsRepository.General.trigger);
generalStep.addStep(UmlViewsRepository.General.effect);
generalStep.addStep(UmlViewsRepository.General.guard);
Expand Down Expand Up @@ -349,6 +351,9 @@ public Composite addToPart(Composite parent, Object key) {
if (key == UmlViewsRepository.General.kind) {
return createKindEMFComboViewer(parent);
}
if (key == UmlViewsRepository.General.kind_readonly) {
return createKind_readonlyEMFComboViewer(parent);
}
if (key == UmlViewsRepository.General.trigger) {
return createTriggerAdvancedReferencesTable(parent);
}
Expand Down Expand Up @@ -1537,6 +1542,39 @@ public void selectionChanged(SelectionChangedEvent event) {
SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(UmlViewsRepository.General.kind, UmlViewsRepository.SWT_KIND), null); //$NON-NLS-1$
// Start of user code for createKindEMFComboViewer

// End of user code
return parent;
}

/**
* @generated
*/

protected Composite createKind_readonlyEMFComboViewer(Composite parent) {
createDescription(parent, UmlViewsRepository.General.kind_readonly, UmlMessages.GeneralPropertiesEditionPart_Kind_readonlyLabel);
kind_readonly = new EMFComboViewer(parent);
kind_readonly.setContentProvider(new ArrayContentProvider());
kind_readonly.setLabelProvider(new AdapterFactoryLabelProvider(EEFRuntimePlugin.getDefault().getAdapterFactory()));
GridData kind_readonlyData = new GridData(GridData.FILL_HORIZONTAL);
kind_readonly.getCombo().setLayoutData(kind_readonlyData);
kind_readonly.addSelectionChangedListener(new ISelectionChangedListener() {

/**
* {@inheritDoc}
*
* @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
* @generated
*/
public void selectionChanged(SelectionChangedEvent event) {
if (propertiesEditionComponent != null)
propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(GeneralPropertiesEditionPartImpl.this, UmlViewsRepository.General.kind_readonly, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, getKind_readonly()));
}

});
kind_readonly.setID(UmlViewsRepository.General.kind_readonly);
SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(UmlViewsRepository.General.kind_readonly, UmlViewsRepository.SWT_KIND), null); //$NON-NLS-1$
// Start of user code for createKind_readonlyEMFComboViewer

// End of user code
return parent;
}
Expand Down Expand Up @@ -3393,6 +3431,43 @@ public void setKind(Enumerator newValue) {

}

/**
* {@inheritDoc}
*
* @see org.obeonetwork.dsl.uml2.properties.uml.parts.GeneralPropertiesEditionPart#getKind_readonly()
* @generated
*/
public Enumerator getKind_readonly() {
Enumerator selection = (Enumerator) ((StructuredSelection) kind_readonly.getSelection()).getFirstElement();
return selection;
}

/**
* {@inheritDoc}
*
* @see org.obeonetwork.dsl.uml2.properties.uml.parts.GeneralPropertiesEditionPart#initKind_readonly(Object input, Enumerator current)
*/
public void initKind_readonly(Object input, Enumerator current) {
kind_readonly.setInput(input);
kind_readonly.modelUpdating(new StructuredSelection(current));
kind_readonly.setEnabled(false);
kind_readonly.setToolTipText(UmlMessages.General_ReadOnly);

}

/**
* {@inheritDoc}
*
* @see org.obeonetwork.dsl.uml2.properties.uml.parts.GeneralPropertiesEditionPart#setKind_readonly(Enumerator newValue)
* @generated
*/
public void setKind_readonly(Enumerator newValue) {
kind_readonly.modelUpdating(new StructuredSelection(newValue));
kind_readonly.setEnabled(false);
kind_readonly.setToolTipText(UmlMessages.General_ReadOnly);

}



/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,12 @@ public class UmlMessages extends NLS {

public static String GeneralPropertiesEditionPart_KindLabel;

/**
* @generated
*/

public static String GeneralPropertiesEditionPart_Kind_readonlyLabel;

/**
* @generated
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ GeneralPropertiesEditionPart_MemberEndLabel=MemberEnd :
GeneralPropertiesEditionPart_SupplierLabel=Supplier :
GeneralPropertiesEditionPart_ClientLabel=Client :
GeneralPropertiesEditionPart_KindLabel=Kind :
GeneralPropertiesEditionPart_Kind_readonlyLabel=Kind_readonly :
GeneralPropertiesEditionPart_TriggerLabel=Trigger :
GeneralPropertiesEditionPart_EffectLabel=Effect :
GeneralPropertiesEditionPart_GuardLabel=Guard :
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ GeneralPropertiesEditionPart_MemberEndLabel=MemberEnd :
GeneralPropertiesEditionPart_SupplierLabel=Supplier :
GeneralPropertiesEditionPart_ClientLabel=Client :
GeneralPropertiesEditionPart_KindLabel=Kind :
GeneralPropertiesEditionPart_Kind_readonlyLabel=Kind_readonly :
GeneralPropertiesEditionPart_TriggerLabel=Trigger :
GeneralPropertiesEditionPart_EffectLabel=Effect :
GeneralPropertiesEditionPart_GuardLabel=Guard :
Expand Down

0 comments on commit cf50693

Please sign in to comment.