diff options
author | Laurent Redor | 2018-07-06 15:40:19 +0000 |
---|---|---|
committer | Laurent Redor | 2018-07-06 16:02:17 +0000 |
commit | 9f4cf60a6d49b0ef3f01dcc3ca29e8c4c0b9603e (patch) | |
tree | 84f0e58bec960b3ae3639d55c690c9cf41280122 | |
parent | 82d70dd3354ab0d446342b077230a26344de43af (diff) | |
download | org.eclipse.sirius-9f4cf60a6d49b0ef3f01dcc3ca29e8c4c0b9603e.tar.gz org.eclipse.sirius-9f4cf60a6d49b0ef3f01dcc3ca29e8c4c0b9603e.tar.xz org.eclipse.sirius-9f4cf60a6d49b0ef3f01dcc3ca29e8c4c0b9603e.zip |
[535861] Fix pb of Blank regeneration of VSM editor
2 generated classes have been manually modified for bug 517073. This
blank generation has erased the manual modification. It is normal.
Another approach must be done later to avoid the same problem at the
next generation.
Bug: 535861
Change-Id: I6addf5c5cfe7e14a37e6b7060f83cf15265f7c53
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
2 files changed, 9 insertions, 3 deletions
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createinstance/CreateInstanceReferenceNamePropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createinstance/CreateInstanceReferenceNamePropertySection.java index 6e3fc113d2..ade9ae918f 100644 --- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createinstance/CreateInstanceReferenceNamePropertySection.java +++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createinstance/CreateInstanceReferenceNamePropertySection.java @@ -17,6 +17,7 @@ import org.eclipse.sirius.editor.editorPlugin.SiriusEditor; import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection; import org.eclipse.sirius.editor.tools.api.assist.TypeContentProposalProvider; import org.eclipse.sirius.editor.tools.internal.assist.CreateInstanceSiriusFeatureContentProposalProvider; +import org.eclipse.sirius.ui.tools.api.assist.ContentProposalClient; import org.eclipse.sirius.viewpoint.description.tool.ToolPackage; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CLabel; @@ -30,7 +31,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage; /** * A section for the referenceName property of a CreateInstance object. */ -public class CreateInstanceReferenceNamePropertySection extends AbstractTextPropertySection { +public class CreateInstanceReferenceNamePropertySection extends AbstractTextPropertySection implements ContentProposalClient { /** Help control of the section. */ protected CLabel help; diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createinstance/CreateInstanceTypeNamePropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createinstance/CreateInstanceTypeNamePropertySection.java index e2d09d6f7f..095e8b32cf 100644 --- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createinstance/CreateInstanceTypeNamePropertySection.java +++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createinstance/CreateInstanceTypeNamePropertySection.java @@ -14,8 +14,12 @@ package org.eclipse.sirius.editor.properties.sections.tool.createinstance; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.sirius.editor.editorPlugin.SiriusEditor; +import org.eclipse.sirius.editor.editorPlugin.SiriusEditorPlugin; import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection; import org.eclipse.sirius.editor.tools.api.assist.TypeContentProposalProvider; +import org.eclipse.sirius.editor.tools.internal.assist.CreateInstanceTypeContentProposalProvider; +import org.eclipse.sirius.editor.tools.internal.assist.TypeAssistant; +import org.eclipse.sirius.ui.tools.api.assist.ContentProposalClient; import org.eclipse.sirius.viewpoint.description.tool.ToolPackage; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CLabel; @@ -29,7 +33,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage; /** * A section for the typeName property of a CreateInstance object. */ -public class CreateInstanceTypeNamePropertySection extends AbstractTextPropertySection { +public class CreateInstanceTypeNamePropertySection extends AbstractTextPropertySection implements ContentProposalClient { /** Help control of the section. */ protected CLabel help; @@ -113,7 +117,8 @@ public class CreateInstanceTypeNamePropertySection extends AbstractTextPropertyS help.setImage(getHelpIcon()); help.setToolTipText(getToolTipText()); - TypeContentProposalProvider.bindCompletionProcessor(this, text); + TypeAssistant typeAssistant = new TypeAssistant(SiriusEditorPlugin.getPlugin().getWorkspaceEPackageRegistry(), this); + TypeContentProposalProvider.bindCompletionProcessor(this, new CreateInstanceTypeContentProposalProvider(typeAssistant), text); // Start of user code create controls |