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 | |
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')
15 files changed, 37 insertions, 19 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/diagram/editparts/ChildNodeLabelEditPart.xpt b/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/diagram/editparts/ChildNodeLabelEditPart.xpt index 063ddf4759f..20564c3cb9a 100644 --- a/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/diagram/editparts/ChildNodeLabelEditPart.xpt +++ b/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/diagram/editparts/ChildNodeLabelEditPart.xpt @@ -76,7 +76,7 @@ public class «editPartClassName» «EXPAND extendsList» «EXPAND implementsLis «DEFINE specifyInheritance FOR papyrusgmfgenextension::ExtendedGenView-»«superOwnedEditPart»«ENDDEFINE» «REM»END: BEGIN: PapyrusGenCode«ENDREM» -«DEFINE implementsList FOR gmfgen::GenChildLabelNode»implements org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart, org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart«ENDDEFINE» +«DEFINE implementsList FOR gmfgen::GenChildLabelNode»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«ENDDEFINE» «DEFINE attributes FOR gmfgen::GenChildLabelNode-» «EXPAND xpt::diagram::editparts::Common::visualIDConstant FOR self-» diff --git a/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/diagram/editparts/NodeLabelEditPart.xpt b/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/diagram/editparts/NodeLabelEditPart.xpt index 41c452226e1..5e38a2226f9 100644 --- a/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/diagram/editparts/NodeLabelEditPart.xpt +++ b/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/diagram/editparts/NodeLabelEditPart.xpt @@ -47,7 +47,7 @@ public class «editPartClassName» «EXPAND extendsList» «EXPAND implementsLis «DEFINE extendsList FOR gmfgen::GenNodeLabel»extends org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart«ENDDEFINE»
«REM»END: PapyrusGenCode«ENDREM»
-«DEFINE implementsList FOR gmfgen::GenNodeLabel»implements org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart«ENDDEFINE»
+«DEFINE implementsList FOR gmfgen::GenNodeLabel»implements org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart, org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit«ENDDEFINE»
«DEFINE attributes FOR gmfgen::GenNodeLabel-»
«EXPAND xpt::diagram::editparts::Common::visualIDConstant FOR self-»
@@ -104,4 +104,4 @@ private static final String ADD_PARENT_MODEL = "AddParentModel"; }
«REM»END: PapyrusGenCode«ENDREM»
-«ENDDEFINE»
\ No newline at end of file +«ENDDEFINE»
diff --git a/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/impl/diagram/editparts/TextAware.xpt b/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/impl/diagram/editparts/TextAware.xpt index b94c0a95635..4a4c8713f9d 100644 --- a/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/impl/diagram/editparts/TextAware.xpt +++ b/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/impl/diagram/editparts/TextAware.xpt @@ -408,7 +408,12 @@ «DEFINE performDirectEdit FOR gmfgen::GenCommonBase-»
«EXPAND xpt::Common::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();
+ }
+ });
}
«ENDDEFINE»
@@ -458,7 +463,6 @@ 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) {
@@ -510,10 +514,8 @@ 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 DirectEditRequest) && (getEditText().equals(getLabelText()))) {
- org.eclipse.gef.requests.DirectEditRequest editRequest = (org.eclipse.gef.requests.DirectEditRequest) request;
- performDirectEdit(editRequest.getLocation());
- } else {
+ }
+ else {
performDirectEdit();
}
}
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/impl/diagram/update/.gitignore b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/impl/diagram/update/.gitignore new file mode 100644 index 00000000000..ed6fc740e88 --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/impl/diagram/update/.gitignore @@ -0,0 +1 @@ +/CanonicalUpdate.java diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/impl/parsers/.gitignore b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/impl/parsers/.gitignore new file mode 100644 index 00000000000..c89b20955f1 --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/impl/parsers/.gitignore @@ -0,0 +1 @@ +/ParserProvider.java diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/diagram/editpolicies/.gitignore b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/diagram/editpolicies/.gitignore index 57853ad8884..5a3675f1bba 100644 --- a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/diagram/editpolicies/.gitignore +++ b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/diagram/editpolicies/.gitignore @@ -5,3 +5,5 @@ /NodeItemSemanticEditPolicy.java /childContainerCreateCommand.java /linkCommands.java +/TextNonResizableEditPolicy.java +/Utils_qvto.java diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/diagram/updater/.gitignore b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/diagram/updater/.gitignore index 5491bb95b62..3819cbf1bdf 100644 --- a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/diagram/updater/.gitignore +++ b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/diagram/updater/.gitignore @@ -1 +1,2 @@ /DiagramUpdater.java +/UpdateCommand.java diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/editor/.gitignore b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/editor/.gitignore index a3e47795394..e9026f74121 100644 --- a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/editor/.gitignore +++ b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/editor/.gitignore @@ -3,3 +3,4 @@ /DiagramEditorContextMenuProvider.java /VisualIDRegistry.java /extensions.java +/ActionBarContributor.java diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/navigator/.gitignore b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/navigator/.gitignore index f437eccedca..8dde5108fd1 100644 --- a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/navigator/.gitignore +++ b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/navigator/.gitignore @@ -1,2 +1,7 @@ /NavigatorContentProvider.java /NavigatorLinkHelper.java +/AbstractNavigatorItem.java +/DomainNavigatorContentProvider.java +/DomainNavigatorItem.java +/NavigatorGroup.java +/NavigatorItem.java diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/providers/.gitignore b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/providers/.gitignore index f452148cde7..34c0b8e53a8 100644 --- a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/providers/.gitignore +++ b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/providers/.gitignore @@ -3,3 +3,5 @@ /ValidationDecoratorProvider.java /ValidationProvider.java /extensions.java +/ElementTypes.java +/MarkerNavigationProvider.java 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(); } } diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/plugin.xml b/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/plugin.xml index 05909592bae..db438f5684a 100644 --- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/plugin.xml +++ b/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/plugin.xml @@ -23,7 +23,7 @@ <extension
point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
<metamodel
- nsURI="http://www.eclipse.org/uml2/4.0.0/UML">
+ nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
<adviceBinding
class="org.eclipse.papyrus.dev.view.services.edit.request.helper.ViewEditHelperAdvice"
id="org.eclipse.papyrus.infra.services.edit.request.helper.ViewEditHelperAdvice"
diff --git a/plugins/developer/org.eclipse.papyrus.diagramdev.modelexplorer/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.diagramdev.modelexplorer/META-INF/MANIFEST.MF index 9940a2828ac..203bb9b97d8 100644 --- a/plugins/developer/org.eclipse.papyrus.diagramdev.modelexplorer/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.diagramdev.modelexplorer/META-INF/MANIFEST.MF @@ -11,7 +11,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.emf.facet.infra.query.core,
org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",
org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0"
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .,
|