diff options
author | Florian Noyrit | 2014-03-14 14:38:02 +0000 |
---|---|---|
committer | Florian Noyrit | 2014-03-14 14:38:02 +0000 |
commit | db966ff2184bb3fd4d74a33ef497cfdad3af515e (patch) | |
tree | dbaf3f8fa665e44ac0a857e0129597e6d4aed357 /plugins/developer/org.eclipse.papyrus.def/xtend | |
parent | 2cb1f82522505bb59b545e0e6abffea895ef7669 (diff) | |
parent | cc47080b9acbd5c4abdc9043a19b7216eaf3197b (diff) | |
download | org.eclipse.papyrus-db966ff2184bb3fd4d74a33ef497cfdad3af515e.tar.gz org.eclipse.papyrus-db966ff2184bb3fd4d74a33ef497cfdad3af515e.tar.xz org.eclipse.papyrus-db966ff2184bb3fd4d74a33ef497cfdad3af515e.zip |
Merge branch 'master' into committers/fnoyrit/gmft
Conflicts:
plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/factory/CustomUMLeditPartFactory.java
plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml
plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintBodyEditPart.java
plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintBodyEditPartCN.java
Diffstat (limited to 'plugins/developer/org.eclipse.papyrus.def/xtend')
3 files changed, 10 insertions, 8 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/ChildNodeLabelEditPart.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/ChildNodeLabelEditPart.xtend index a87811437d1..1bedd0232ec 100644 --- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/ChildNodeLabelEditPart.xtend +++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/ChildNodeLabelEditPart.xtend @@ -39,5 +39,5 @@ extends «FOR extendedObject : it.eResource.allContents.filter(typeof (ExtendedGe def specifyInheritance (ExtendedGenView it)'''«superOwnedEditPart»'''
//END: PapyrusGenCode
-override implementsList(GenChildLabelNode it) '''implements org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart, org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart'''
+override implementsList(GenChildLabelNode it) '''implements org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart, org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart, org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit'''
}
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/NodeLabelEditPart.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/NodeLabelEditPart.xtend index 78eef62c007..1baa2dab3d2 100644 --- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/NodeLabelEditPart.xtend +++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/NodeLabelEditPart.xtend @@ -25,7 +25,7 @@ import xpt.Common @Inject impl.diagram.editparts.NodeLabelEditPart xptNodeLabelEditPart; - +override implementsList(GenNodeLabel it)'''implements org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart, org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit''' //BEGIN: PapyrusGenCode //Definition of the inheritance diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/TextAware.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/TextAware.xtend index fd4e8a01415..d27c5cf767c 100644 --- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/TextAware.xtend +++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/TextAware.xtend @@ -428,7 +428,12 @@ override setManager (GenCommonBase it)''' override performDirectEdit (GenCommonBase it)''' «generatedMemberComment» protected void performDirectEdit() { - getManager().show(); + org.eclipse.swt.custom.BusyIndicator.showWhile(org.eclipse.swt.widgets.Display.getDefault(), new java.lang.Runnable() { + + public void run() { + getManager().show(); + } + }); } ''' @@ -478,7 +483,6 @@ def performDirectEditRequest(GenCommonBase it, GenDiagram diagram ) ''' org.eclipse.jface.dialogs.Dialog dialog = null; if (configuration instanceof org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration) { setManager(((org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); - setParser(((org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration) configuration).createParser(this.resolveSemanticElement())); initializeDirectEditManager(theRequest); return; } else if (configuration instanceof org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration) { @@ -530,10 +534,8 @@ def initializeDirectEditManager (GenCommonBase it)''' org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { Character initialChar = (Character) request.getExtendedData().get(org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((request instanceof org.eclipse.gef.requests.DirectEditRequest) && (getEditText().equals(getLabelText()))) { - org.eclipse.gef.requests.DirectEditRequest editRequest = (org.eclipse.gef.requests.DirectEditRequest) request; - performDirectEdit(editRequest.getLocation()); - } else { + } + else { performDirectEdit(); } } |