diff options
author | Francois Le Fevre | 2017-04-12 14:49:34 +0000 |
---|---|---|
committer | Gerrit Code Review @ Eclipse.org | 2017-04-18 10:27:02 +0000 |
commit | ad97e7f33460e2c17a3b5e1b11d064a094e497e7 (patch) | |
tree | cc23acd376778351e27747f641fb32b0f38f950e /examples | |
parent | d568f94c8e8d0c3631fc4e62ea21098fa1766adf (diff) | |
download | org.eclipse.papyrus-ad97e7f33460e2c17a3b5e1b11d064a094e497e7.tar.gz org.eclipse.papyrus-ad97e7f33460e2c17a3b5e1b11d064a094e497e7.tar.xz org.eclipse.papyrus-ad97e7f33460e2c17a3b5e1b11d064a094e497e7.zip |
Bug 515171 - [Examples] Fix example projects for Oxygen release
Actions
- Update extensions to respect new extension point definitions
- Fix example code to match new API
Change-Id: I5ac042f03f82de93188590ee46ec8d3a56deb3d8
Signed-off-by: Francois Le Fevre <francois.le-fevre@cea.fr>
Diffstat (limited to 'examples')
30 files changed, 2980 insertions, 2965 deletions
diff --git a/examples/infra/pom.xml b/examples/infra/pom.xml index cb184cc2dfe..61b8081b4c5 100644 --- a/examples/infra/pom.xml +++ b/examples/infra/pom.xml @@ -10,7 +10,7 @@ <artifactId>org.eclipse.papyrus.examples.infra</artifactId> <packaging>pom</packaging> <modules> - <!-- module>org.eclipse.papyrus.example.infra.servicesregistry.retrieval</module--> + <module>org.eclipse.papyrus.example.infra.servicesregistry.retrieval</module> <module>org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences</module> </modules> </project>
\ No newline at end of file diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/META-INF/MANIFEST.MF b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/META-INF/MANIFEST.MF index cc045b08a9d..e9578d4e628 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/META-INF/MANIFEST.MF +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/META-INF/MANIFEST.MF @@ -36,11 +36,10 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.extensionpoints.editors, org.eclipse.gmf.runtime.draw2d.ui;visibility:=reexport, org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", - org.eclipse.gmf.tooling.runtime;visibility:=reexport, - org.eclipse.gmf.codegen.xtend, org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0", org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0", - org.eclipse.papyrus.infra.core;bundle-version="1.1.0" + org.eclipse.papyrus.infra.core;bundle-version="1.1.0", + org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="[3.0.0,4.0.0)" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/plugin.xml b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/plugin.xml index 0702ebb060b..15ab7bdf033 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/plugin.xml +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/plugin.xml @@ -82,7 +82,7 @@ </menuContribution> </extension> <extension - point="org.eclipse.papyrus.infra.core.papyrusDiagram"> + point="org.eclipse.papyrus.infra.ui.papyrusDiagram"> <editorDiagram actionBarContributorId="org.eclipse.papyrus.diagram.common.part.UMLDiagramActionBarContributor" factoryClass="org.eclipse.papyrus.example.diagram.simplediagram.DiagramEditorFactory" diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/helpers/UMLBaseEditHelper.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/helpers/UMLBaseEditHelper.java index 13b851314b0..a308c39c56d 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/helpers/UMLBaseEditHelper.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/helpers/UMLBaseEditHelper.java @@ -1,10 +1,10 @@ -package org.eclipse.papyrus.example.diagram.simplediagram.edit.helpers; - -import org.eclipse.gmf.tooling.runtime.edit.helpers.GeneratedEditHelperBase; - -/** - * @generated - */ -public class UMLBaseEditHelper extends GeneratedEditHelperBase { - -} +package org.eclipse.papyrus.example.diagram.simplediagram.edit.helpers;
+
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.helpers.GeneratedEditHelperBase;
+
+/**
+ * @generated
+ */
+public class UMLBaseEditHelper extends GeneratedEditHelperBase {
+
+}
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/ComponentNameEditPart.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/ComponentNameEditPart.java index 3eac86c5fdf..48d0f013a65 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/ComponentNameEditPart.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/ComponentNameEditPart.java @@ -1,626 +1,626 @@ -package org.eclipse.papyrus.example.diagram.simplediagram.edit.parts; - -import java.util.Collections; -import java.util.List; - -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.Label; -import org.eclipse.draw2d.geometry.Point; -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.transaction.RunnableWithResult; -import org.eclipse.gef.AccessibleEditPart; -import org.eclipse.gef.EditPolicy; -import org.eclipse.gef.Request; -import org.eclipse.gef.requests.DirectEditRequest; -import org.eclipse.gef.tools.DirectEditManager; -import org.eclipse.gmf.runtime.common.ui.services.parser.IParser; -import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus; -import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus; -import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions; -import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart; -import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; -import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart; -import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy; -import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry; -import org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate; -import org.eclipse.gmf.runtime.diagram.ui.label.WrappingLabelDelegate; -import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants; -import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager; -import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel; -import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter; -import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser; -import org.eclipse.gmf.runtime.notation.FontStyle; -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.gmf.tooling.runtime.draw2d.labels.SimpleLabelDelegate; -import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; -import org.eclipse.gmf.tooling.runtime.edit.policies.labels.IRefreshableFeedbackEditPolicy; -import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.eclipse.jface.viewers.ICellEditorValidator; -import org.eclipse.papyrus.example.diagram.simplediagram.edit.policies.UMLTextSelectionEditPolicy; -import org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry; -import org.eclipse.papyrus.example.diagram.simplediagram.providers.UMLElementTypes; -import org.eclipse.papyrus.example.diagram.simplediagram.providers.UMLParserProvider; -import org.eclipse.swt.SWT; -import org.eclipse.swt.accessibility.AccessibleEvent; -import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.graphics.FontData; -import org.eclipse.swt.graphics.Image; - -/** - * @generated - */ -public class ComponentNameEditPart extends CompartmentEditPart implements - ITextAwareEditPart { - - /** - * @generated - */ - public static final int VISUAL_ID = 5001; - - /** - * @generated - */ - private DirectEditManager manager; - - /** - * @generated - */ - private IParser parser; - - /** - * @generated - */ - private List<?> parserElements; - - /** - * @generated - */ - private String defaultText; - - /** - * @generated - */ - private ILabelDelegate labelDelegate; - - /** - * @generated - */ - public ComponentNameEditPart(View view) { - super(view); - } - - /** - * @generated - */ - protected void createDefaultEditPolicies() { - super.createDefaultEditPolicies(); - installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, - new UMLTextSelectionEditPolicy()); - installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, - new LabelDirectEditPolicy()); - installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, - new DefaultNodeLabelDragPolicy()); - } - - /** - * @generated - */ - protected String getLabelTextHelper(IFigure figure) { - if (figure instanceof WrappingLabel) { - return ((WrappingLabel) figure).getText(); - } else if (figure instanceof Label) { - return ((Label) figure).getText(); - } else { - return getLabelDelegate().getText(); - } - } - - /** - * @generated - */ - protected void setLabelTextHelper(IFigure figure, String text) { - if (figure instanceof WrappingLabel) { - ((WrappingLabel) figure).setText(text); - } else if (figure instanceof Label) { - ((Label) figure).setText(text); - } else { - getLabelDelegate().setText(text); - } - } - - /** - * @generated - */ - protected Image getLabelIconHelper(IFigure figure) { - if (figure instanceof WrappingLabel) { - return ((WrappingLabel) figure).getIcon(); - } else if (figure instanceof Label) { - return ((Label) figure).getIcon(); - } else { - return getLabelDelegate().getIcon(0); - } - } - - /** - * @generated - */ - protected void setLabelIconHelper(IFigure figure, Image icon) { - if (figure instanceof WrappingLabel) { - ((WrappingLabel) figure).setIcon(icon); - return; - } else if (figure instanceof Label) { - ((Label) figure).setIcon(icon); - return; - } else { - getLabelDelegate().setIcon(icon, 0); - } - } - - /** - * @generated - */ - public void setLabel(WrappingLabel figure) { - unregisterVisuals(); - setFigure(figure); - defaultText = getLabelTextHelper(figure); - registerVisuals(); - refreshVisuals(); - } - - /** - * @generated - */ - @SuppressWarnings("rawtypes") - protected List getModelChildren() { - return Collections.EMPTY_LIST; - } - - /** - * @generated - */ - public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { - return null; - } - - /** - * @generated - */ - protected EObject getParserElement() { - return resolveSemanticElement(); - } - - /** - * @generated - */ - protected Image getLabelIcon() { - EObject parserElement = getParserElement(); - if (parserElement == null) { - return null; - } - return UMLElementTypes.getImage(parserElement.eClass()); - } - - /** - * @generated - */ - protected String getLabelText() { - String text = null; - EObject parserElement = getParserElement(); - if (parserElement != null && getParser() != null) { - text = getParser().getPrintString( - new EObjectAdapter(parserElement), - getParserOptions().intValue()); - } - if (text == null || text.length() == 0) { - text = defaultText; - } - return text; - } - - /** - * @generated - */ - public void setLabelText(String text) { - setLabelTextHelper(getFigure(), text); - refreshSelectionFeedback(); - } - - /** - * @generated - */ - public String getEditText() { - if (getParserElement() == null || getParser() == null) { - return ""; //$NON-NLS-1$ - } - return getParser().getEditString( - new EObjectAdapter(getParserElement()), - getParserOptions().intValue()); - } - - /** - * @generated - */ - protected boolean isEditable() { - return getParser() != null; - } - - /** - * @generated - */ - public ICellEditorValidator getEditTextValidator() { - return new ICellEditorValidator() { - - public String isValid(final Object value) { - if (value instanceof String) { - final EObject element = getParserElement(); - final IParser parser = getParser(); - try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive( - new RunnableWithResult.Impl<IParserEditStatus>() { - - public void run() { - setResult(parser - .isValidEditString( - new EObjectAdapter( - element), - (String) value)); - } - }); - return valid.getCode() == ParserEditStatus.EDITABLE ? null - : valid.getMessage(); - } catch (InterruptedException ie) { - ie.printStackTrace(); - } - } - - // shouldn't get here - return null; - } - }; - } - - /** - * @generated - */ - public IContentAssistProcessor getCompletionProcessor() { - if (getParserElement() == null || getParser() == null) { - return null; - } - return getParser().getCompletionProcessor( - new EObjectAdapter(getParserElement())); - } - - /** - * @generated - */ - public ParserOptions getParserOptions() { - return ParserOptions.NONE; - } - - /** - * @generated - */ - public IParser getParser() { - if (parser == null) { - parser = UMLParserProvider - .getParser( - UMLElementTypes.Component_2001, - getParserElement(), - UMLVisualIDRegistry - .getType(org.eclipse.papyrus.example.diagram.simplediagram.edit.parts.ComponentNameEditPart.VISUAL_ID)); - } - return parser; - } - - /** - * @generated - */ - protected DirectEditManager getManager() { - if (manager == null) { - setManager(new TextDirectEditManager(this, null, - UMLEditPartFactory.getTextCellEditorLocator(this))); - } - return manager; - } - - /** - * @generated - */ - protected void setManager(DirectEditManager manager) { - this.manager = manager; - } - - /** - * @generated - */ - protected void performDirectEdit() { - getManager().show(); - } - - /** - * @generated - */ - protected void performDirectEdit(Point eventLocation) { - if (getManager().getClass() == TextDirectEditManager.class) { - ((TextDirectEditManager) getManager()).show(eventLocation - .getSWTPoint()); - } - } - - /** - * @generated - */ - private void performDirectEdit(char initialCharacter) { - if (getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager) getManager()).show(initialCharacter); - } else // - { - performDirectEdit(); - } - } - - /** - * @generated - */ - protected void performDirectEditRequest(Request request) { - final Request theRequest = request; - try { - getEditingDomain().runExclusive(new Runnable() { - - public void run() { - if (isActive() && isEditable()) { - if (theRequest - .getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest - .getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); - performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest) theRequest; - performDirectEdit(editRequest.getLocation()); - } else { - performDirectEdit(); - } - } - } - }); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - - /** - * @generated - */ - protected void refreshVisuals() { - super.refreshVisuals(); - refreshLabel(); - refreshFont(); - refreshFontColor(); - refreshUnderline(); - refreshStrikeThrough(); - } - - /** - * @generated - */ - protected void refreshLabel() { - setLabelTextHelper(getFigure(), getLabelText()); - setLabelIconHelper(getFigure(), getLabelIcon()); - refreshSelectionFeedback(); - } - - /** - * @generated - */ - protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( - NotationPackage.eINSTANCE.getFontStyle()); - if (style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); - } - } - - /** - * @generated - */ - protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( - NotationPackage.eINSTANCE.getFontStyle()); - if (style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel) getFigure()).setTextStrikeThrough(style - .isStrikeThrough()); - } - } - - /** - * @generated - */ - protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( - NotationPackage.eINSTANCE.getFontStyle()); - if (style != null) { - FontData fontData = new FontData(style.getFontName(), - style.getFontHeight(), (style.isBold() ? SWT.BOLD - : SWT.NORMAL) - | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); - setFont(fontData); - } - } - - /** - * @generated - */ - private void refreshSelectionFeedback() { - requestEditPolicyFeedbackRefresh(EditPolicy.PRIMARY_DRAG_ROLE); - requestEditPolicyFeedbackRefresh(EditPolicy.SELECTION_FEEDBACK_ROLE); - } - - /** - * @generated - */ - private void requestEditPolicyFeedbackRefresh(String editPolicyKey) { - Object editPolicy = getEditPolicy(editPolicyKey); - if (editPolicy instanceof IRefreshableFeedbackEditPolicy) { - ((IRefreshableFeedbackEditPolicy) editPolicy).refreshFeedback(); - } - } - - /** - * @generated - */ - protected void setFontColor(Color color) { - getFigure().setForegroundColor(color); - } - - /** - * @generated - */ - protected void addSemanticListeners() { - if (getParser() instanceof ISemanticParser) { - EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser) getParser()) - .getSemanticElementsBeingParsed(element); - for (int i = 0; i < parserElements.size(); i++) { - addListenerFilter( - "SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ - } - } else { - super.addSemanticListeners(); - } - } - - /** - * @generated - */ - protected void removeSemanticListeners() { - if (parserElements != null) { - for (int i = 0; i < parserElements.size(); i++) { - removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ - } - } else { - super.removeSemanticListeners(); - } - } - - /** - * @generated - */ - protected AccessibleEditPart getAccessibleEditPart() { - if (accessibleEP == null) { - accessibleEP = new AccessibleGraphicalEditPart() { - - public void getName(AccessibleEvent e) { - e.result = getLabelTextHelper(getFigure()); - } - }; - } - return accessibleEP; - } - - /** - * @generated - */ - private View getFontStyleOwnerView() { - return getPrimaryView(); - } - - /** - * @generated - */ - private ILabelDelegate getLabelDelegate() { - if (labelDelegate == null) { - IFigure label = getFigure(); - if (label instanceof WrappingLabel) { - labelDelegate = new WrappingLabelDelegate((WrappingLabel) label); - } else { - labelDelegate = new SimpleLabelDelegate((Label) label); - } - } - return labelDelegate; - } - - /** - * @generated - */ - @Override - public Object getAdapter(Class key) { - if (ILabelDelegate.class.equals(key)) { - return getLabelDelegate(); - } - return super.getAdapter(key); - } - - /** - * @generated - */ - protected void addNotationalListeners() { - super.addNotationalListeners(); - addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ - } - - /** - * @generated - */ - protected void removeNotationalListeners() { - super.removeNotationalListeners(); - removeListenerFilter("PrimaryView"); //$NON-NLS-1$ - } - - /** - * @generated - */ - protected void handleNotificationEvent(Notification event) { - Object feature = event.getFeature(); - if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer) event.getNewValue(); - setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals( - feature)) { - refreshUnderline(); - } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough() - .equals(feature)) { - refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals( - feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals( - feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold() - .equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals( - feature)) { - refreshFont(); - } else { - if (getParser() != null - && getParser().isAffectingEvent(event, - getParserOptions().intValue())) { - refreshLabel(); - } - if (getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser) getParser(); - if (modelParser.areSemanticElementsAffected(null, event)) { - removeSemanticListeners(); - if (resolveSemanticElement() != null) { - addSemanticListeners(); - } - refreshLabel(); - } - } - } - super.handleNotificationEvent(event); - } - - /** - * @generated - */ - protected IFigure createFigure() { - // Parent should assign one using setLabel() method - return null; - } - -} +package org.eclipse.papyrus.example.diagram.simplediagram.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate;
+import org.eclipse.gmf.runtime.diagram.ui.label.WrappingLabelDelegate;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.papyrus.example.diagram.simplediagram.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.example.diagram.simplediagram.providers.UMLElementTypes;
+import org.eclipse.papyrus.example.diagram.simplediagram.providers.UMLParserProvider;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.draw2d.labels.SimpleLabelDelegate;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.labels.IRefreshableFeedbackEditPolicy;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * @generated
+ */
+public class ComponentNameEditPart extends CompartmentEditPart implements
+ ITextAwareEditPart {
+
+ /**
+ * @generated
+ */
+ public static final int VISUAL_ID = 5001;
+
+ /**
+ * @generated
+ */
+ private DirectEditManager manager;
+
+ /**
+ * @generated
+ */
+ private IParser parser;
+
+ /**
+ * @generated
+ */
+ private List<?> parserElements;
+
+ /**
+ * @generated
+ */
+ private String defaultText;
+
+ /**
+ * @generated
+ */
+ private ILabelDelegate labelDelegate;
+
+ /**
+ * @generated
+ */
+ public ComponentNameEditPart(View view) {
+ super(view);
+ }
+
+ /**
+ * @generated
+ */
+ protected void createDefaultEditPolicies() {
+ super.createDefaultEditPolicies();
+ installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,
+ new UMLTextSelectionEditPolicy());
+ installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,
+ new LabelDirectEditPolicy());
+ installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,
+ new DefaultNodeLabelDragPolicy());
+ }
+
+ /**
+ * @generated
+ */
+ protected String getLabelTextHelper(IFigure figure) {
+ if (figure instanceof WrappingLabel) {
+ return ((WrappingLabel) figure).getText();
+ } else if (figure instanceof Label) {
+ return ((Label) figure).getText();
+ } else {
+ return getLabelDelegate().getText();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void setLabelTextHelper(IFigure figure, String text) {
+ if (figure instanceof WrappingLabel) {
+ ((WrappingLabel) figure).setText(text);
+ } else if (figure instanceof Label) {
+ ((Label) figure).setText(text);
+ } else {
+ getLabelDelegate().setText(text);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected Image getLabelIconHelper(IFigure figure) {
+ if (figure instanceof WrappingLabel) {
+ return ((WrappingLabel) figure).getIcon();
+ } else if (figure instanceof Label) {
+ return ((Label) figure).getIcon();
+ } else {
+ return getLabelDelegate().getIcon(0);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void setLabelIconHelper(IFigure figure, Image icon) {
+ if (figure instanceof WrappingLabel) {
+ ((WrappingLabel) figure).setIcon(icon);
+ return;
+ } else if (figure instanceof Label) {
+ ((Label) figure).setIcon(icon);
+ return;
+ } else {
+ getLabelDelegate().setIcon(icon, 0);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ public void setLabel(WrappingLabel figure) {
+ unregisterVisuals();
+ setFigure(figure);
+ defaultText = getLabelTextHelper(figure);
+ registerVisuals();
+ refreshVisuals();
+ }
+
+ /**
+ * @generated
+ */
+ @SuppressWarnings("rawtypes")
+ protected List getModelChildren() {
+ return Collections.EMPTY_LIST;
+ }
+
+ /**
+ * @generated
+ */
+ public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ protected EObject getParserElement() {
+ return resolveSemanticElement();
+ }
+
+ /**
+ * @generated
+ */
+ protected Image getLabelIcon() {
+ EObject parserElement = getParserElement();
+ if (parserElement == null) {
+ return null;
+ }
+ return UMLElementTypes.getImage(parserElement.eClass());
+ }
+
+ /**
+ * @generated
+ */
+ protected String getLabelText() {
+ String text = null;
+ EObject parserElement = getParserElement();
+ if (parserElement != null && getParser() != null) {
+ text = getParser().getPrintString(
+ new EObjectAdapter(parserElement),
+ getParserOptions().intValue());
+ }
+ if (text == null || text.length() == 0) {
+ text = defaultText;
+ }
+ return text;
+ }
+
+ /**
+ * @generated
+ */
+ public void setLabelText(String text) {
+ setLabelTextHelper(getFigure(), text);
+ refreshSelectionFeedback();
+ }
+
+ /**
+ * @generated
+ */
+ public String getEditText() {
+ if (getParserElement() == null || getParser() == null) {
+ return ""; //$NON-NLS-1$
+ }
+ return getParser().getEditString(
+ new EObjectAdapter(getParserElement()),
+ getParserOptions().intValue());
+ }
+
+ /**
+ * @generated
+ */
+ protected boolean isEditable() {
+ return getParser() != null;
+ }
+
+ /**
+ * @generated
+ */
+ public ICellEditorValidator getEditTextValidator() {
+ return new ICellEditorValidator() {
+
+ public String isValid(final Object value) {
+ if (value instanceof String) {
+ final EObject element = getParserElement();
+ final IParser parser = getParser();
+ try {
+ IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
+ .runExclusive(
+ new RunnableWithResult.Impl<IParserEditStatus>() {
+
+ public void run() {
+ setResult(parser
+ .isValidEditString(
+ new EObjectAdapter(
+ element),
+ (String) value));
+ }
+ });
+ return valid.getCode() == ParserEditStatus.EDITABLE ? null
+ : valid.getMessage();
+ } catch (InterruptedException ie) {
+ ie.printStackTrace();
+ }
+ }
+
+ // shouldn't get here
+ return null;
+ }
+ };
+ }
+
+ /**
+ * @generated
+ */
+ public IContentAssistProcessor getCompletionProcessor() {
+ if (getParserElement() == null || getParser() == null) {
+ return null;
+ }
+ return getParser().getCompletionProcessor(
+ new EObjectAdapter(getParserElement()));
+ }
+
+ /**
+ * @generated
+ */
+ public ParserOptions getParserOptions() {
+ return ParserOptions.NONE;
+ }
+
+ /**
+ * @generated
+ */
+ public IParser getParser() {
+ if (parser == null) {
+ parser = UMLParserProvider
+ .getParser(
+ UMLElementTypes.Component_2001,
+ getParserElement(),
+ UMLVisualIDRegistry
+ .getType(org.eclipse.papyrus.example.diagram.simplediagram.edit.parts.ComponentNameEditPart.VISUAL_ID));
+ }
+ return parser;
+ }
+
+ /**
+ * @generated
+ */
+ protected DirectEditManager getManager() {
+ if (manager == null) {
+ setManager(new TextDirectEditManager(this, null,
+ UMLEditPartFactory.getTextCellEditorLocator(this)));
+ }
+ return manager;
+ }
+
+ /**
+ * @generated
+ */
+ protected void setManager(DirectEditManager manager) {
+ this.manager = manager;
+ }
+
+ /**
+ * @generated
+ */
+ protected void performDirectEdit() {
+ getManager().show();
+ }
+
+ /**
+ * @generated
+ */
+ protected void performDirectEdit(Point eventLocation) {
+ if (getManager().getClass() == TextDirectEditManager.class) {
+ ((TextDirectEditManager) getManager()).show(eventLocation
+ .getSWTPoint());
+ }
+ }
+
+ /**
+ * @generated
+ */
+ private void performDirectEdit(char initialCharacter) {
+ if (getManager() instanceof TextDirectEditManager) {
+ ((TextDirectEditManager) getManager()).show(initialCharacter);
+ } else //
+ {
+ performDirectEdit();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void performDirectEditRequest(Request request) {
+ final Request theRequest = request;
+ try {
+ getEditingDomain().runExclusive(new Runnable() {
+
+ public void run() {
+ if (isActive() && isEditable()) {
+ if (theRequest
+ .getExtendedData()
+ .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+ Character initialChar = (Character) theRequest
+ .getExtendedData()
+ .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+ performDirectEdit(initialChar.charValue());
+ } else if ((theRequest instanceof DirectEditRequest)
+ && (getEditText().equals(getLabelText()))) {
+ DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+ performDirectEdit(editRequest.getLocation());
+ } else {
+ performDirectEdit();
+ }
+ }
+ }
+ });
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshLabel();
+ refreshFont();
+ refreshFontColor();
+ refreshUnderline();
+ refreshStrikeThrough();
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshLabel() {
+ setLabelTextHelper(getFigure(), getLabelText());
+ setLabelIconHelper(getFigure(), getLabelIcon());
+ refreshSelectionFeedback();
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshUnderline() {
+ FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
+ NotationPackage.eINSTANCE.getFontStyle());
+ if (style != null && getFigure() instanceof WrappingLabel) {
+ ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshStrikeThrough() {
+ FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
+ NotationPackage.eINSTANCE.getFontStyle());
+ if (style != null && getFigure() instanceof WrappingLabel) {
+ ((WrappingLabel) getFigure()).setTextStrikeThrough(style
+ .isStrikeThrough());
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshFont() {
+ FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
+ NotationPackage.eINSTANCE.getFontStyle());
+ if (style != null) {
+ FontData fontData = new FontData(style.getFontName(),
+ style.getFontHeight(), (style.isBold() ? SWT.BOLD
+ : SWT.NORMAL)
+ | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+ setFont(fontData);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ private void refreshSelectionFeedback() {
+ requestEditPolicyFeedbackRefresh(EditPolicy.PRIMARY_DRAG_ROLE);
+ requestEditPolicyFeedbackRefresh(EditPolicy.SELECTION_FEEDBACK_ROLE);
+ }
+
+ /**
+ * @generated
+ */
+ private void requestEditPolicyFeedbackRefresh(String editPolicyKey) {
+ Object editPolicy = getEditPolicy(editPolicyKey);
+ if (editPolicy instanceof IRefreshableFeedbackEditPolicy) {
+ ((IRefreshableFeedbackEditPolicy) editPolicy).refreshFeedback();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void setFontColor(Color color) {
+ getFigure().setForegroundColor(color);
+ }
+
+ /**
+ * @generated
+ */
+ protected void addSemanticListeners() {
+ if (getParser() instanceof ISemanticParser) {
+ EObject element = resolveSemanticElement();
+ parserElements = ((ISemanticParser) getParser())
+ .getSemanticElementsBeingParsed(element);
+ for (int i = 0; i < parserElements.size(); i++) {
+ addListenerFilter(
+ "SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+ }
+ } else {
+ super.addSemanticListeners();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void removeSemanticListeners() {
+ if (parserElements != null) {
+ for (int i = 0; i < parserElements.size(); i++) {
+ removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+ }
+ } else {
+ super.removeSemanticListeners();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected AccessibleEditPart getAccessibleEditPart() {
+ if (accessibleEP == null) {
+ accessibleEP = new AccessibleGraphicalEditPart() {
+
+ public void getName(AccessibleEvent e) {
+ e.result = getLabelTextHelper(getFigure());
+ }
+ };
+ }
+ return accessibleEP;
+ }
+
+ /**
+ * @generated
+ */
+ private View getFontStyleOwnerView() {
+ return getPrimaryView();
+ }
+
+ /**
+ * @generated
+ */
+ private ILabelDelegate getLabelDelegate() {
+ if (labelDelegate == null) {
+ IFigure label = getFigure();
+ if (label instanceof WrappingLabel) {
+ labelDelegate = new WrappingLabelDelegate((WrappingLabel) label);
+ } else {
+ labelDelegate = new SimpleLabelDelegate((Label) label);
+ }
+ }
+ return labelDelegate;
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public Object getAdapter(Class key) {
+ if (ILabelDelegate.class.equals(key)) {
+ return getLabelDelegate();
+ }
+ return super.getAdapter(key);
+ }
+
+ /**
+ * @generated
+ */
+ protected void addNotationalListeners() {
+ super.addNotationalListeners();
+ addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
+ }
+
+ /**
+ * @generated
+ */
+ protected void removeNotationalListeners() {
+ super.removeNotationalListeners();
+ removeListenerFilter("PrimaryView"); //$NON-NLS-1$
+ }
+
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification event) {
+ Object feature = event.getFeature();
+ if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+ Integer c = (Integer) event.getNewValue();
+ setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+ } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(
+ feature)) {
+ refreshUnderline();
+ } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough()
+ .equals(feature)) {
+ refreshStrikeThrough();
+ } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(
+ feature)
+ || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(
+ feature)
+ || NotationPackage.eINSTANCE.getFontStyle_Bold()
+ .equals(feature)
+ || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(
+ feature)) {
+ refreshFont();
+ } else {
+ if (getParser() != null
+ && getParser().isAffectingEvent(event,
+ getParserOptions().intValue())) {
+ refreshLabel();
+ }
+ if (getParser() instanceof ISemanticParser) {
+ ISemanticParser modelParser = (ISemanticParser) getParser();
+ if (modelParser.areSemanticElementsAffected(null, event)) {
+ removeSemanticListeners();
+ if (resolveSemanticElement() != null) {
+ addSemanticListeners();
+ }
+ refreshLabel();
+ }
+ }
+ }
+ super.handleNotificationEvent(event);
+ }
+
+ /**
+ * @generated
+ */
+ protected IFigure createFigure() {
+ // Parent should assign one using setLabel() method
+ return null;
+ }
+
+}
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/ModelEditPart.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/ModelEditPart.java index f1cc8686540..be41ba5fbee 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/ModelEditPart.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/ModelEditPart.java @@ -1,48 +1,48 @@ -package org.eclipse.papyrus.example.diagram.simplediagram.edit.parts; - -import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart; -import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles; -import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.gmf.tooling.runtime.edit.policies.reparent.CreationEditPolicyWithCustomReparent; -import org.eclipse.papyrus.example.diagram.simplediagram.edit.policies.ModelCanonicalEditPolicy; -import org.eclipse.papyrus.example.diagram.simplediagram.edit.policies.ModelItemSemanticEditPolicy; -import org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry; - -/** - * @generated - */ -public class ModelEditPart extends DiagramEditPart { - - /** - * @generated - */ - public final static String MODEL_ID = "PapyrusNewDiagram"; //$NON-NLS-1$ - - /** - * @generated - */ - public static final int VISUAL_ID = 1000; - - /** - * @generated - */ - public ModelEditPart(View view) { - super(view); - } - - /** - * @generated - */ - protected void createDefaultEditPolicies() { - super.createDefaultEditPolicies(); - installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, - new ModelItemSemanticEditPolicy()); - installEditPolicy(EditPolicyRoles.CANONICAL_ROLE, - new ModelCanonicalEditPolicy()); - installEditPolicy(EditPolicyRoles.CREATION_ROLE, - new CreationEditPolicyWithCustomReparent( - UMLVisualIDRegistry.TYPED_INSTANCE)); - // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE); - } - -} +package org.eclipse.papyrus.example.diagram.simplediagram.edit.parts;
+
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.example.diagram.simplediagram.edit.policies.ModelCanonicalEditPolicy;
+import org.eclipse.papyrus.example.diagram.simplediagram.edit.policies.ModelItemSemanticEditPolicy;
+import org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.reparent.CreationEditPolicyWithCustomReparent;
+
+/**
+ * @generated
+ */
+public class ModelEditPart extends DiagramEditPart {
+
+ /**
+ * @generated
+ */
+ public final static String MODEL_ID = "PapyrusNewDiagram"; //$NON-NLS-1$
+
+ /**
+ * @generated
+ */
+ public static final int VISUAL_ID = 1000;
+
+ /**
+ * @generated
+ */
+ public ModelEditPart(View view) {
+ super(view);
+ }
+
+ /**
+ * @generated
+ */
+ protected void createDefaultEditPolicies() {
+ super.createDefaultEditPolicies();
+ installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,
+ new ModelItemSemanticEditPolicy());
+ installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,
+ new ModelCanonicalEditPolicy());
+ installEditPolicy(EditPolicyRoles.CREATION_ROLE,
+ new CreationEditPolicyWithCustomReparent(
+ UMLVisualIDRegistry.TYPED_INSTANCE));
+ // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE);
+ }
+
+}
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/UMLEditPartFactory.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/UMLEditPartFactory.java index fb276a2959c..03b6613e17e 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/UMLEditPartFactory.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/UMLEditPartFactory.java @@ -1,54 +1,54 @@ -package org.eclipse.papyrus.example.diagram.simplediagram.edit.parts; - -import org.eclipse.gef.EditPart; -import org.eclipse.gef.EditPartFactory; -import org.eclipse.gef.tools.CellEditorLocator; -import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart; -import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.gmf.tooling.runtime.directedit.locator.CellEditorLocatorAccess; -import org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry; - -/** - * @generated - */ -public class UMLEditPartFactory implements EditPartFactory { - - /** - * @generated - */ - public EditPart createEditPart(EditPart context, Object model) { - if (model instanceof View) { - View view = (View) model; - switch (UMLVisualIDRegistry.getVisualID(view)) { - - case ModelEditPart.VISUAL_ID: - return new ModelEditPart(view); - - case ComponentEditPart.VISUAL_ID: - return new ComponentEditPart(view); - - case ComponentNameEditPart.VISUAL_ID: - return new ComponentNameEditPart(view); - } - } - return createUnrecognizedEditPart(context, model); - } - - /** - * @generated - */ - private EditPart createUnrecognizedEditPart(EditPart context, Object model) { - // Handle creation of unrecognized child node EditParts here - return null; - } - - /** - * @generated - */ - public static CellEditorLocator getTextCellEditorLocator( - ITextAwareEditPart source) { - return CellEditorLocatorAccess.INSTANCE - .getTextCellEditorLocator(source); - } - -} +package org.eclipse.papyrus.example.diagram.simplediagram.edit.parts;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPartFactory;
+import org.eclipse.gef.tools.CellEditorLocator;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.directedit.locator.CellEditorLocatorAccess;
+
+/**
+ * @generated
+ */
+public class UMLEditPartFactory implements EditPartFactory {
+
+ /**
+ * @generated
+ */
+ public EditPart createEditPart(EditPart context, Object model) {
+ if (model instanceof View) {
+ View view = (View) model;
+ switch (UMLVisualIDRegistry.getVisualID(view)) {
+
+ case ModelEditPart.VISUAL_ID:
+ return new ModelEditPart(view);
+
+ case ComponentEditPart.VISUAL_ID:
+ return new ComponentEditPart(view);
+
+ case ComponentNameEditPart.VISUAL_ID:
+ return new ComponentNameEditPart(view);
+ }
+ }
+ return createUnrecognizedEditPart(context, model);
+ }
+
+ /**
+ * @generated
+ */
+ private EditPart createUnrecognizedEditPart(EditPart context, Object model) {
+ // Handle creation of unrecognized child node EditParts here
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ public static CellEditorLocator getTextCellEditorLocator(
+ ITextAwareEditPart source) {
+ return CellEditorLocatorAccess.INSTANCE
+ .getTextCellEditorLocator(source);
+ }
+
+}
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/UMLBaseItemSemanticEditPolicy.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/UMLBaseItemSemanticEditPolicy.java index 5a3228cb309..33c0a1b65f2 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/UMLBaseItemSemanticEditPolicy.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/UMLBaseItemSemanticEditPolicy.java @@ -1,295 +1,295 @@ -package org.eclipse.papyrus.example.diagram.simplediagram.edit.policies; - -import java.util.Iterator; - -import org.eclipse.emf.transaction.TransactionalEditingDomain; -import org.eclipse.gef.Request; -import org.eclipse.gef.commands.Command; -import org.eclipse.gef.commands.UnexecutableCommand; -import org.eclipse.gef.requests.ReconnectRequest; -import org.eclipse.gmf.runtime.common.core.command.ICommand; -import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand; -import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand; -import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy; -import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy; -import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; -import org.eclipse.gmf.runtime.diagram.ui.editpolicies.SemanticEditPolicy; -import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand; -import org.eclipse.gmf.runtime.emf.type.core.IElementType; -import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest; -import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; -import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest; -import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest; -import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest; -import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest; -import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest; -import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest; -import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest; -import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest; -import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest; -import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest; -import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest; -import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.gmf.tooling.runtime.edit.helpers.GeneratedEditHelperBase; -import org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry; -import org.eclipse.papyrus.example.diagram.simplediagram.providers.UMLElementTypes; - -/** - * @generated - */ -public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { - - /** - * Extended request data key to hold editpart visual id. - * @generated - */ - public static final String VISUAL_ID_KEY = "visual_id"; //$NON-NLS-1$ - - /** - * @generated - */ - private final IElementType myElementType; - - /** - * @generated - */ - protected UMLBaseItemSemanticEditPolicy(IElementType elementType) { - myElementType = elementType; - } - - /** - * Extended request data key to hold editpart visual id. - * Add visual id of edited editpart to extended data of the request - * so command switch can decide what kind of diagram element is being edited. - * It is done in those cases when it's not possible to deduce diagram - * element kind from domain element. - * - * @generated - */ - public Command getCommand(Request request) { - if (request instanceof ReconnectRequest) { - Object view = ((ReconnectRequest) request).getConnectionEditPart() - .getModel(); - if (view instanceof View) { - Integer id = new Integer( - UMLVisualIDRegistry.getVisualID((View) view)); - request.getExtendedData().put(VISUAL_ID_KEY, id); - } - } - return super.getCommand(request); - } - - /** - * Returns visual id from request parameters. - * @generated - */ - protected int getVisualID(IEditCommandRequest request) { - Object id = request.getParameter(VISUAL_ID_KEY); - return id instanceof Integer ? ((Integer) id).intValue() : -1; - } - - /** - * @generated - */ - protected Command getSemanticCommand(IEditCommandRequest request) { - IEditCommandRequest completedRequest = completeRequest(request); - Command semanticCommand = getSemanticCommandSwitch(completedRequest); - semanticCommand = getEditHelperCommand(completedRequest, - semanticCommand); - if (completedRequest instanceof DestroyRequest) { - DestroyRequest destroyRequest = (DestroyRequest) completedRequest; - return shouldProceed(destroyRequest) ? addDeleteViewCommand( - semanticCommand, destroyRequest) : null; - } - return semanticCommand; - } - - /** - * @generated - */ - protected Command addDeleteViewCommand(Command mainCommand, - DestroyRequest completedRequest) { - Command deleteViewCommand = getGEFWrapper(new DeleteCommand( - getEditingDomain(), (View) getHost().getModel())); - return mainCommand == null ? deleteViewCommand : mainCommand - .chain(deleteViewCommand); - } - - /** - * @generated - */ - private Command getEditHelperCommand(IEditCommandRequest request, - Command editPolicyCommand) { - if (editPolicyCommand != null) { - ICommand command = editPolicyCommand instanceof ICommandProxy ? ((ICommandProxy) editPolicyCommand) - .getICommand() : new CommandProxy(editPolicyCommand); - request.setParameter(GeneratedEditHelperBase.EDIT_POLICY_COMMAND, - command); - } - IElementType requestContextElementType = getContextElementType(request); - request.setParameter(GeneratedEditHelperBase.CONTEXT_ELEMENT_TYPE, - requestContextElementType); - ICommand command = requestContextElementType.getEditCommand(request); - request.setParameter(GeneratedEditHelperBase.EDIT_POLICY_COMMAND, null); - request.setParameter(GeneratedEditHelperBase.CONTEXT_ELEMENT_TYPE, null); - if (command != null) { - if (!(command instanceof CompositeTransactionalCommand)) { - command = new CompositeTransactionalCommand(getEditingDomain(), - command.getLabel()).compose(command); - } - return new ICommandProxy(command); - } - return editPolicyCommand; - } - - /** - * @generated - */ - private IElementType getContextElementType(IEditCommandRequest request) { - IElementType requestContextElementType = UMLElementTypes - .getElementType(getVisualID(request)); - return requestContextElementType != null ? requestContextElementType - : myElementType; - } - - /** - * @generated - */ - protected Command getSemanticCommandSwitch(IEditCommandRequest req) { - if (req instanceof CreateRelationshipRequest) { - return getCreateRelationshipCommand((CreateRelationshipRequest) req); - } else if (req instanceof CreateElementRequest) { - return getCreateCommand((CreateElementRequest) req); - } else if (req instanceof ConfigureRequest) { - return getConfigureCommand((ConfigureRequest) req); - } else if (req instanceof DestroyElementRequest) { - return getDestroyElementCommand((DestroyElementRequest) req); - } else if (req instanceof DestroyReferenceRequest) { - return getDestroyReferenceCommand((DestroyReferenceRequest) req); - } else if (req instanceof DuplicateElementsRequest) { - return getDuplicateCommand((DuplicateElementsRequest) req); - } else if (req instanceof GetEditContextRequest) { - return getEditContextCommand((GetEditContextRequest) req); - } else if (req instanceof MoveRequest) { - return getMoveCommand((MoveRequest) req); - } else if (req instanceof ReorientReferenceRelationshipRequest) { - return getReorientReferenceRelationshipCommand((ReorientReferenceRelationshipRequest) req); - } else if (req instanceof ReorientRelationshipRequest) { - return getReorientRelationshipCommand((ReorientRelationshipRequest) req); - } else if (req instanceof SetRequest) { - return getSetCommand((SetRequest) req); - } - return null; - } - - /** - * @generated - */ - protected Command getConfigureCommand(ConfigureRequest req) { - return null; - } - - /** - * @generated - */ - protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) { - return null; - } - - /** - * @generated - */ - protected Command getCreateCommand(CreateElementRequest req) { - return null; - } - - /** - * @generated - */ - protected Command getSetCommand(SetRequest req) { - return null; - } - - /** - * @generated - */ - protected Command getEditContextCommand(GetEditContextRequest req) { - return null; - } - - /** - * @generated - */ - protected Command getDestroyElementCommand(DestroyElementRequest req) { - return null; - } - - /** - * @generated - */ - protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) { - return null; - } - - /** - * @generated - */ - protected Command getDuplicateCommand(DuplicateElementsRequest req) { - return null; - } - - /** - * @generated - */ - protected Command getMoveCommand(MoveRequest req) { - return null; - } - - /** - * @generated - */ - protected Command getReorientReferenceRelationshipCommand( - ReorientReferenceRelationshipRequest req) { - return UnexecutableCommand.INSTANCE; - } - - /** - * @generated - */ - protected Command getReorientRelationshipCommand( - ReorientRelationshipRequest req) { - return UnexecutableCommand.INSTANCE; - } - - /** - * @generated - */ - protected final Command getGEFWrapper(ICommand cmd) { - return new ICommandProxy(cmd); - } - - /** - * Returns editing domain from the host edit part. - * @generated - */ - protected TransactionalEditingDomain getEditingDomain() { - return ((IGraphicalEditPart) getHost()).getEditingDomain(); - } - - /** - * Clean all shortcuts to the host element from the same diagram - * @generated - */ - protected void addDestroyShortcutsCommand(ICompositeCommand cmd, View view) { - assert view.getEAnnotation("Shortcut") == null; //$NON-NLS-1$ - for (Iterator it = view.getDiagram().getChildren().iterator(); it - .hasNext();) { - View nextView = (View) it.next(); - if (nextView.getEAnnotation("Shortcut") == null || !nextView.isSetElement() || nextView.getElement() != view.getElement()) { //$NON-NLS-1$ - continue; - } - cmd.add(new DeleteCommand(getEditingDomain(), nextView)); - } - } - -} +package org.eclipse.papyrus.example.diagram.simplediagram.edit.policies;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gef.requests.ReconnectRequest;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;
+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.SemanticEditPolicy;
+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.helpers.GeneratedEditHelperBase;
+import org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.example.diagram.simplediagram.providers.UMLElementTypes;
+
+/**
+ * @generated
+ */
+public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
+
+ /**
+ * Extended request data key to hold editpart visual id.
+ * @generated
+ */
+ public static final String VISUAL_ID_KEY = "visual_id"; //$NON-NLS-1$
+
+ /**
+ * @generated
+ */
+ private final IElementType myElementType;
+
+ /**
+ * @generated
+ */
+ protected UMLBaseItemSemanticEditPolicy(IElementType elementType) {
+ myElementType = elementType;
+ }
+
+ /**
+ * Extended request data key to hold editpart visual id.
+ * Add visual id of edited editpart to extended data of the request
+ * so command switch can decide what kind of diagram element is being edited.
+ * It is done in those cases when it's not possible to deduce diagram
+ * element kind from domain element.
+ *
+ * @generated
+ */
+ public Command getCommand(Request request) {
+ if (request instanceof ReconnectRequest) {
+ Object view = ((ReconnectRequest) request).getConnectionEditPart()
+ .getModel();
+ if (view instanceof View) {
+ Integer id = new Integer(
+ UMLVisualIDRegistry.getVisualID((View) view));
+ request.getExtendedData().put(VISUAL_ID_KEY, id);
+ }
+ }
+ return super.getCommand(request);
+ }
+
+ /**
+ * Returns visual id from request parameters.
+ * @generated
+ */
+ protected int getVisualID(IEditCommandRequest request) {
+ Object id = request.getParameter(VISUAL_ID_KEY);
+ return id instanceof Integer ? ((Integer) id).intValue() : -1;
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getSemanticCommand(IEditCommandRequest request) {
+ IEditCommandRequest completedRequest = completeRequest(request);
+ Command semanticCommand = getSemanticCommandSwitch(completedRequest);
+ semanticCommand = getEditHelperCommand(completedRequest,
+ semanticCommand);
+ if (completedRequest instanceof DestroyRequest) {
+ DestroyRequest destroyRequest = (DestroyRequest) completedRequest;
+ return shouldProceed(destroyRequest) ? addDeleteViewCommand(
+ semanticCommand, destroyRequest) : null;
+ }
+ return semanticCommand;
+ }
+
+ /**
+ * @generated
+ */
+ protected Command addDeleteViewCommand(Command mainCommand,
+ DestroyRequest completedRequest) {
+ Command deleteViewCommand = getGEFWrapper(new DeleteCommand(
+ getEditingDomain(), (View) getHost().getModel()));
+ return mainCommand == null ? deleteViewCommand : mainCommand
+ .chain(deleteViewCommand);
+ }
+
+ /**
+ * @generated
+ */
+ private Command getEditHelperCommand(IEditCommandRequest request,
+ Command editPolicyCommand) {
+ if (editPolicyCommand != null) {
+ ICommand command = editPolicyCommand instanceof ICommandProxy ? ((ICommandProxy) editPolicyCommand)
+ .getICommand() : new CommandProxy(editPolicyCommand);
+ request.setParameter(GeneratedEditHelperBase.EDIT_POLICY_COMMAND,
+ command);
+ }
+ IElementType requestContextElementType = getContextElementType(request);
+ request.setParameter(GeneratedEditHelperBase.CONTEXT_ELEMENT_TYPE,
+ requestContextElementType);
+ ICommand command = requestContextElementType.getEditCommand(request);
+ request.setParameter(GeneratedEditHelperBase.EDIT_POLICY_COMMAND, null);
+ request.setParameter(GeneratedEditHelperBase.CONTEXT_ELEMENT_TYPE, null);
+ if (command != null) {
+ if (!(command instanceof CompositeTransactionalCommand)) {
+ command = new CompositeTransactionalCommand(getEditingDomain(),
+ command.getLabel()).compose(command);
+ }
+ return new ICommandProxy(command);
+ }
+ return editPolicyCommand;
+ }
+
+ /**
+ * @generated
+ */
+ private IElementType getContextElementType(IEditCommandRequest request) {
+ IElementType requestContextElementType = UMLElementTypes
+ .getElementType(getVisualID(request));
+ return requestContextElementType != null ? requestContextElementType
+ : myElementType;
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getSemanticCommandSwitch(IEditCommandRequest req) {
+ if (req instanceof CreateRelationshipRequest) {
+ return getCreateRelationshipCommand((CreateRelationshipRequest) req);
+ } else if (req instanceof CreateElementRequest) {
+ return getCreateCommand((CreateElementRequest) req);
+ } else if (req instanceof ConfigureRequest) {
+ return getConfigureCommand((ConfigureRequest) req);
+ } else if (req instanceof DestroyElementRequest) {
+ return getDestroyElementCommand((DestroyElementRequest) req);
+ } else if (req instanceof DestroyReferenceRequest) {
+ return getDestroyReferenceCommand((DestroyReferenceRequest) req);
+ } else if (req instanceof DuplicateElementsRequest) {
+ return getDuplicateCommand((DuplicateElementsRequest) req);
+ } else if (req instanceof GetEditContextRequest) {
+ return getEditContextCommand((GetEditContextRequest) req);
+ } else if (req instanceof MoveRequest) {
+ return getMoveCommand((MoveRequest) req);
+ } else if (req instanceof ReorientReferenceRelationshipRequest) {
+ return getReorientReferenceRelationshipCommand((ReorientReferenceRelationshipRequest) req);
+ } else if (req instanceof ReorientRelationshipRequest) {
+ return getReorientRelationshipCommand((ReorientRelationshipRequest) req);
+ } else if (req instanceof SetRequest) {
+ return getSetCommand((SetRequest) req);
+ }
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getConfigureCommand(ConfigureRequest req) {
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getCreateCommand(CreateElementRequest req) {
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getSetCommand(SetRequest req) {
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getEditContextCommand(GetEditContextRequest req) {
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getDestroyElementCommand(DestroyElementRequest req) {
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getDuplicateCommand(DuplicateElementsRequest req) {
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getMoveCommand(MoveRequest req) {
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getReorientReferenceRelationshipCommand(
+ ReorientReferenceRelationshipRequest req) {
+ return UnexecutableCommand.INSTANCE;
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getReorientRelationshipCommand(
+ ReorientRelationshipRequest req) {
+ return UnexecutableCommand.INSTANCE;
+ }
+
+ /**
+ * @generated
+ */
+ protected final Command getGEFWrapper(ICommand cmd) {
+ return new ICommandProxy(cmd);
+ }
+
+ /**
+ * Returns editing domain from the host edit part.
+ * @generated
+ */
+ protected TransactionalEditingDomain getEditingDomain() {
+ return ((IGraphicalEditPart) getHost()).getEditingDomain();
+ }
+
+ /**
+ * Clean all shortcuts to the host element from the same diagram
+ * @generated
+ */
+ protected void addDestroyShortcutsCommand(ICompositeCommand cmd, View view) {
+ assert view.getEAnnotation("Shortcut") == null; //$NON-NLS-1$
+ for (Iterator it = view.getDiagram().getChildren().iterator(); it
+ .hasNext();) {
+ View nextView = (View) it.next();
+ if (nextView.getEAnnotation("Shortcut") == null || !nextView.isSetElement() || nextView.getElement() != view.getElement()) { //$NON-NLS-1$
+ continue;
+ }
+ cmd.add(new DeleteCommand(getEditingDomain(), nextView));
+ }
+ }
+
+}
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/UMLTextNonResizableEditPolicy.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/UMLTextNonResizableEditPolicy.java index ac9f480449d..c95839130e8 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/UMLTextNonResizableEditPolicy.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/UMLTextNonResizableEditPolicy.java @@ -1,229 +1,229 @@ -package org.eclipse.papyrus.example.diagram.simplediagram.edit.policies; - -import java.util.Collections; -import java.util.List; - -import org.eclipse.draw2d.ColorConstants; -import org.eclipse.draw2d.Figure; -import org.eclipse.draw2d.FigureListener; -import org.eclipse.draw2d.Graphics; -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.Label; -import org.eclipse.draw2d.RectangleFigure; -import org.eclipse.draw2d.geometry.Rectangle; -import org.eclipse.gef.GraphicalEditPart; -import org.eclipse.gef.handles.MoveHandle; -import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableEditPolicyEx; -import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx; -import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel; -import org.eclipse.gmf.tooling.runtime.edit.policies.labels.IRefreshableFeedbackEditPolicy; - -/** - * @generated - */ -public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx - implements IRefreshableFeedbackEditPolicy { - - /** - * @generated - */ - private IFigure selectionFeedbackFigure; - - /** - * @generated - */ - private IFigure focusFeedbackFigure; - - /** - * @generated - */ - private FigureListener hostPositionListener; - - /** - * @generated - */ - protected void showPrimarySelection() { - if (getHostFigure() instanceof WrappingLabel) { - ((WrappingLabel) getHostFigure()).setSelected(true); - ((WrappingLabel) getHostFigure()).setFocus(true); - } else { - showSelection(); - showFocus(); - } - } - - /** - * @generated - */ - protected void showSelection() { - if (getHostFigure() instanceof WrappingLabel) { - ((WrappingLabel) getHostFigure()).setSelected(true); - ((WrappingLabel) getHostFigure()).setFocus(false); - } else { - hideSelection(); - addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure()); - getHostFigure().addFigureListener(getHostPositionListener()); - refreshSelectionFeedback(); - hideFocus(); - } - } - - /** - * @generated - */ - protected void hideSelection() { - if (getHostFigure() instanceof WrappingLabel) { - ((WrappingLabel) getHostFigure()).setSelected(false); - ((WrappingLabel) getHostFigure()).setFocus(false); - } else { - if (selectionFeedbackFigure != null) { - removeFeedback(selectionFeedbackFigure); - getHostFigure().removeFigureListener(getHostPositionListener()); - selectionFeedbackFigure = null; - } - hideFocus(); - } - } - - /** - * @generated - */ - protected void showFocus() { - if (getHostFigure() instanceof WrappingLabel) { - ((WrappingLabel) getHostFigure()).setFocus(true); - } else { - hideFocus(); - addFeedback(focusFeedbackFigure = createFocusFeedbackFigure()); - refreshFocusFeedback(); - } - } - - /** - * @generated - */ - protected void hideFocus() { - if (getHostFigure() instanceof WrappingLabel) { - ((WrappingLabel) getHostFigure()).setFocus(false); - } else { - if (focusFeedbackFigure != null) { - removeFeedback(focusFeedbackFigure); - focusFeedbackFigure = null; - } - } - } - - /** - * @generated - */ - protected Rectangle getFeedbackBounds() { - Rectangle bounds; - if (getHostFigure() instanceof Label) { - bounds = ((Label) getHostFigure()).getTextBounds(); - bounds.intersect(getHostFigure().getBounds()); - } else { - bounds = getHostFigure().getBounds().getCopy(); - } - getHostFigure().getParent().translateToAbsolute(bounds); - getFeedbackLayer().translateToRelative(bounds); - return bounds; - } - - /** - * @generated - */ - protected IFigure createSelectionFeedbackFigure() { - if (getHostFigure() instanceof Label) { - Label feedbackFigure = new Label(); - feedbackFigure.setOpaque(true); - feedbackFigure - .setBackgroundColor(ColorConstants.menuBackgroundSelected); - feedbackFigure - .setForegroundColor(ColorConstants.menuForegroundSelected); - return feedbackFigure; - } else { - RectangleFigure feedbackFigure = new RectangleFigure(); - feedbackFigure.setFill(false); - return feedbackFigure; - } - } - - /** - * @generated - */ - protected IFigure createFocusFeedbackFigure() { - return new Figure() { - - protected void paintFigure(Graphics graphics) { - graphics.drawFocus(getBounds().getResized(-1, -1)); - } - }; - } - - /** - * @generated - */ - protected void updateLabel(Label target) { - Label source = (Label) getHostFigure(); - target.setText(source.getText()); - target.setTextAlignment(source.getTextAlignment()); - target.setFont(source.getFont()); - } - - /** - * @generated - */ - protected void refreshSelectionFeedback() { - if (selectionFeedbackFigure != null) { - if (selectionFeedbackFigure instanceof Label) { - updateLabel((Label) selectionFeedbackFigure); - selectionFeedbackFigure.setBounds(getFeedbackBounds()); - } else { - selectionFeedbackFigure.setBounds(getFeedbackBounds().expand(5, - 5)); - } - } - } - - /** - * @generated - */ - protected void refreshFocusFeedback() { - if (focusFeedbackFigure != null) { - focusFeedbackFigure.setBounds(getFeedbackBounds()); - } - } - - /** - * @generated - */ - - public void refreshFeedback() { - refreshSelectionFeedback(); - refreshFocusFeedback(); - } - - /** - * @generated - */ - private FigureListener getHostPositionListener() { - if (hostPositionListener == null) { - hostPositionListener = new FigureListener() { - public void figureMoved(IFigure source) { - refreshFeedback(); - } - }; - } - return hostPositionListener; - } - - /** - * @generated - */ - protected List createSelectionHandles() { - MoveHandle moveHandle = new MoveHandle((GraphicalEditPart) getHost()); - moveHandle.setBorder(null); - moveHandle.setDragTracker(new DragEditPartsTrackerEx(getHost())); - return Collections.singletonList(moveHandle); - } - -} +package org.eclipse.papyrus.example.diagram.simplediagram.edit.policies;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ColorConstants;
+import org.eclipse.draw2d.Figure;
+import org.eclipse.draw2d.FigureListener;
+import org.eclipse.draw2d.Graphics;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.RectangleFigure;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gef.handles.MoveHandle;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableEditPolicyEx;
+import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.labels.IRefreshableFeedbackEditPolicy;
+
+/**
+ * @generated
+ */
+public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx
+ implements IRefreshableFeedbackEditPolicy {
+
+ /**
+ * @generated
+ */
+ private IFigure selectionFeedbackFigure;
+
+ /**
+ * @generated
+ */
+ private IFigure focusFeedbackFigure;
+
+ /**
+ * @generated
+ */
+ private FigureListener hostPositionListener;
+
+ /**
+ * @generated
+ */
+ protected void showPrimarySelection() {
+ if (getHostFigure() instanceof WrappingLabel) {
+ ((WrappingLabel) getHostFigure()).setSelected(true);
+ ((WrappingLabel) getHostFigure()).setFocus(true);
+ } else {
+ showSelection();
+ showFocus();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void showSelection() {
+ if (getHostFigure() instanceof WrappingLabel) {
+ ((WrappingLabel) getHostFigure()).setSelected(true);
+ ((WrappingLabel) getHostFigure()).setFocus(false);
+ } else {
+ hideSelection();
+ addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure());
+ getHostFigure().addFigureListener(getHostPositionListener());
+ refreshSelectionFeedback();
+ hideFocus();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void hideSelection() {
+ if (getHostFigure() instanceof WrappingLabel) {
+ ((WrappingLabel) getHostFigure()).setSelected(false);
+ ((WrappingLabel) getHostFigure()).setFocus(false);
+ } else {
+ if (selectionFeedbackFigure != null) {
+ removeFeedback(selectionFeedbackFigure);
+ getHostFigure().removeFigureListener(getHostPositionListener());
+ selectionFeedbackFigure = null;
+ }
+ hideFocus();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void showFocus() {
+ if (getHostFigure() instanceof WrappingLabel) {
+ ((WrappingLabel) getHostFigure()).setFocus(true);
+ } else {
+ hideFocus();
+ addFeedback(focusFeedbackFigure = createFocusFeedbackFigure());
+ refreshFocusFeedback();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void hideFocus() {
+ if (getHostFigure() instanceof WrappingLabel) {
+ ((WrappingLabel) getHostFigure()).setFocus(false);
+ } else {
+ if (focusFeedbackFigure != null) {
+ removeFeedback(focusFeedbackFigure);
+ focusFeedbackFigure = null;
+ }
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected Rectangle getFeedbackBounds() {
+ Rectangle bounds;
+ if (getHostFigure() instanceof Label) {
+ bounds = ((Label) getHostFigure()).getTextBounds();
+ bounds.intersect(getHostFigure().getBounds());
+ } else {
+ bounds = getHostFigure().getBounds().getCopy();
+ }
+ getHostFigure().getParent().translateToAbsolute(bounds);
+ getFeedbackLayer().translateToRelative(bounds);
+ return bounds;
+ }
+
+ /**
+ * @generated
+ */
+ protected IFigure createSelectionFeedbackFigure() {
+ if (getHostFigure() instanceof Label) {
+ Label feedbackFigure = new Label();
+ feedbackFigure.setOpaque(true);
+ feedbackFigure
+ .setBackgroundColor(ColorConstants.menuBackgroundSelected);
+ feedbackFigure
+ .setForegroundColor(ColorConstants.menuForegroundSelected);
+ return feedbackFigure;
+ } else {
+ RectangleFigure feedbackFigure = new RectangleFigure();
+ feedbackFigure.setFill(false);
+ return feedbackFigure;
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected IFigure createFocusFeedbackFigure() {
+ return new Figure() {
+
+ protected void paintFigure(Graphics graphics) {
+ graphics.drawFocus(getBounds().getResized(-1, -1));
+ }
+ };
+ }
+
+ /**
+ * @generated
+ */
+ protected void updateLabel(Label target) {
+ Label source = (Label) getHostFigure();
+ target.setText(source.getText());
+ target.setTextAlignment(source.getTextAlignment());
+ target.setFont(source.getFont());
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshSelectionFeedback() {
+ if (selectionFeedbackFigure != null) {
+ if (selectionFeedbackFigure instanceof Label) {
+ updateLabel((Label) selectionFeedbackFigure);
+ selectionFeedbackFigure.setBounds(getFeedbackBounds());
+ } else {
+ selectionFeedbackFigure.setBounds(getFeedbackBounds().expand(5,
+ 5));
+ }
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshFocusFeedback() {
+ if (focusFeedbackFigure != null) {
+ focusFeedbackFigure.setBounds(getFeedbackBounds());
+ }
+ }
+
+ /**
+ * @generated
+ */
+
+ public void refreshFeedback() {
+ refreshSelectionFeedback();
+ refreshFocusFeedback();
+ }
+
+ /**
+ * @generated
+ */
+ private FigureListener getHostPositionListener() {
+ if (hostPositionListener == null) {
+ hostPositionListener = new FigureListener() {
+ public void figureMoved(IFigure source) {
+ refreshFeedback();
+ }
+ };
+ }
+ return hostPositionListener;
+ }
+
+ /**
+ * @generated
+ */
+ protected List createSelectionHandles() {
+ MoveHandle moveHandle = new MoveHandle((GraphicalEditPart) getHost());
+ moveHandle.setBorder(null);
+ moveHandle.setDragTracker(new DragEditPartsTrackerEx(getHost()));
+ return Collections.singletonList(moveHandle);
+ }
+
+}
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/UMLTextSelectionEditPolicy.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/UMLTextSelectionEditPolicy.java index 252e5eb0c49..f503e7dab0f 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/UMLTextSelectionEditPolicy.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/UMLTextSelectionEditPolicy.java @@ -1,213 +1,213 @@ -package org.eclipse.papyrus.example.diagram.simplediagram.edit.policies; - -import org.eclipse.draw2d.ColorConstants; -import org.eclipse.draw2d.Figure; -import org.eclipse.draw2d.FigureListener; -import org.eclipse.draw2d.Graphics; -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.Label; -import org.eclipse.draw2d.RectangleFigure; -import org.eclipse.draw2d.geometry.Rectangle; -import org.eclipse.gef.editpolicies.SelectionEditPolicy; -import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel; -import org.eclipse.gmf.tooling.runtime.edit.policies.labels.IRefreshableFeedbackEditPolicy; - -/** - * @generated - */ -public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements - IRefreshableFeedbackEditPolicy { - - /** - * @generated - */ - private IFigure selectionFeedbackFigure; - - /** - * @generated - */ - private IFigure focusFeedbackFigure; - - /** - * @generated - */ - private FigureListener hostPositionListener; - - /** - * @generated - */ - protected void showPrimarySelection() { - if (getHostFigure() instanceof WrappingLabel) { - ((WrappingLabel) getHostFigure()).setSelected(true); - ((WrappingLabel) getHostFigure()).setFocus(true); - } else { - showSelection(); - showFocus(); - } - } - - /** - * @generated - */ - protected void showSelection() { - if (getHostFigure() instanceof WrappingLabel) { - ((WrappingLabel) getHostFigure()).setSelected(true); - ((WrappingLabel) getHostFigure()).setFocus(false); - } else { - hideSelection(); - addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure()); - getHostFigure().addFigureListener(getHostPositionListener()); - refreshSelectionFeedback(); - hideFocus(); - } - } - - /** - * @generated - */ - protected void hideSelection() { - if (getHostFigure() instanceof WrappingLabel) { - ((WrappingLabel) getHostFigure()).setSelected(false); - ((WrappingLabel) getHostFigure()).setFocus(false); - } else { - if (selectionFeedbackFigure != null) { - removeFeedback(selectionFeedbackFigure); - getHostFigure().removeFigureListener(getHostPositionListener()); - selectionFeedbackFigure = null; - } - hideFocus(); - } - } - - /** - * @generated - */ - protected void showFocus() { - if (getHostFigure() instanceof WrappingLabel) { - ((WrappingLabel) getHostFigure()).setFocus(true); - } else { - hideFocus(); - addFeedback(focusFeedbackFigure = createFocusFeedbackFigure()); - refreshFocusFeedback(); - } - } - - /** - * @generated - */ - protected void hideFocus() { - if (getHostFigure() instanceof WrappingLabel) { - ((WrappingLabel) getHostFigure()).setFocus(false); - } else { - if (focusFeedbackFigure != null) { - removeFeedback(focusFeedbackFigure); - focusFeedbackFigure = null; - } - } - } - - /** - * @generated - */ - protected Rectangle getFeedbackBounds() { - Rectangle bounds; - if (getHostFigure() instanceof Label) { - bounds = ((Label) getHostFigure()).getTextBounds(); - bounds.intersect(getHostFigure().getBounds()); - } else { - bounds = getHostFigure().getBounds().getCopy(); - } - getHostFigure().getParent().translateToAbsolute(bounds); - getFeedbackLayer().translateToRelative(bounds); - return bounds; - } - - /** - * @generated - */ - protected IFigure createSelectionFeedbackFigure() { - if (getHostFigure() instanceof Label) { - Label feedbackFigure = new Label(); - feedbackFigure.setOpaque(true); - feedbackFigure - .setBackgroundColor(ColorConstants.menuBackgroundSelected); - feedbackFigure - .setForegroundColor(ColorConstants.menuForegroundSelected); - return feedbackFigure; - } else { - RectangleFigure feedbackFigure = new RectangleFigure(); - feedbackFigure.setFill(false); - return feedbackFigure; - } - } - - /** - * @generated - */ - protected IFigure createFocusFeedbackFigure() { - return new Figure() { - - protected void paintFigure(Graphics graphics) { - graphics.drawFocus(getBounds().getResized(-1, -1)); - } - }; - } - - /** - * @generated - */ - protected void updateLabel(Label target) { - Label source = (Label) getHostFigure(); - target.setText(source.getText()); - target.setTextAlignment(source.getTextAlignment()); - target.setFont(source.getFont()); - } - - /** - * @generated - */ - protected void refreshSelectionFeedback() { - if (selectionFeedbackFigure != null) { - if (selectionFeedbackFigure instanceof Label) { - updateLabel((Label) selectionFeedbackFigure); - selectionFeedbackFigure.setBounds(getFeedbackBounds()); - } else { - selectionFeedbackFigure.setBounds(getFeedbackBounds().expand(5, - 5)); - } - } - } - - /** - * @generated - */ - protected void refreshFocusFeedback() { - if (focusFeedbackFigure != null) { - focusFeedbackFigure.setBounds(getFeedbackBounds()); - } - } - - /** - * @generated - */ - - public void refreshFeedback() { - refreshSelectionFeedback(); - refreshFocusFeedback(); - } - - /** - * @generated - */ - private FigureListener getHostPositionListener() { - if (hostPositionListener == null) { - hostPositionListener = new FigureListener() { - public void figureMoved(IFigure source) { - refreshFeedback(); - } - }; - } - return hostPositionListener; - } - -} +package org.eclipse.papyrus.example.diagram.simplediagram.edit.policies;
+
+import org.eclipse.draw2d.ColorConstants;
+import org.eclipse.draw2d.Figure;
+import org.eclipse.draw2d.FigureListener;
+import org.eclipse.draw2d.Graphics;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.RectangleFigure;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.editpolicies.SelectionEditPolicy;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.labels.IRefreshableFeedbackEditPolicy;
+
+/**
+ * @generated
+ */
+public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements
+ IRefreshableFeedbackEditPolicy {
+
+ /**
+ * @generated
+ */
+ private IFigure selectionFeedbackFigure;
+
+ /**
+ * @generated
+ */
+ private IFigure focusFeedbackFigure;
+
+ /**
+ * @generated
+ */
+ private FigureListener hostPositionListener;
+
+ /**
+ * @generated
+ */
+ protected void showPrimarySelection() {
+ if (getHostFigure() instanceof WrappingLabel) {
+ ((WrappingLabel) getHostFigure()).setSelected(true);
+ ((WrappingLabel) getHostFigure()).setFocus(true);
+ } else {
+ showSelection();
+ showFocus();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void showSelection() {
+ if (getHostFigure() instanceof WrappingLabel) {
+ ((WrappingLabel) getHostFigure()).setSelected(true);
+ ((WrappingLabel) getHostFigure()).setFocus(false);
+ } else {
+ hideSelection();
+ addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure());
+ getHostFigure().addFigureListener(getHostPositionListener());
+ refreshSelectionFeedback();
+ hideFocus();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void hideSelection() {
+ if (getHostFigure() instanceof WrappingLabel) {
+ ((WrappingLabel) getHostFigure()).setSelected(false);
+ ((WrappingLabel) getHostFigure()).setFocus(false);
+ } else {
+ if (selectionFeedbackFigure != null) {
+ removeFeedback(selectionFeedbackFigure);
+ getHostFigure().removeFigureListener(getHostPositionListener());
+ selectionFeedbackFigure = null;
+ }
+ hideFocus();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void showFocus() {
+ if (getHostFigure() instanceof WrappingLabel) {
+ ((WrappingLabel) getHostFigure()).setFocus(true);
+ } else {
+ hideFocus();
+ addFeedback(focusFeedbackFigure = createFocusFeedbackFigure());
+ refreshFocusFeedback();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void hideFocus() {
+ if (getHostFigure() instanceof WrappingLabel) {
+ ((WrappingLabel) getHostFigure()).setFocus(false);
+ } else {
+ if (focusFeedbackFigure != null) {
+ removeFeedback(focusFeedbackFigure);
+ focusFeedbackFigure = null;
+ }
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected Rectangle getFeedbackBounds() {
+ Rectangle bounds;
+ if (getHostFigure() instanceof Label) {
+ bounds = ((Label) getHostFigure()).getTextBounds();
+ bounds.intersect(getHostFigure().getBounds());
+ } else {
+ bounds = getHostFigure().getBounds().getCopy();
+ }
+ getHostFigure().getParent().translateToAbsolute(bounds);
+ getFeedbackLayer().translateToRelative(bounds);
+ return bounds;
+ }
+
+ /**
+ * @generated
+ */
+ protected IFigure createSelectionFeedbackFigure() {
+ if (getHostFigure() instanceof Label) {
+ Label feedbackFigure = new Label();
+ feedbackFigure.setOpaque(true);
+ feedbackFigure
+ .setBackgroundColor(ColorConstants.menuBackgroundSelected);
+ feedbackFigure
+ .setForegroundColor(ColorConstants.menuForegroundSelected);
+ return feedbackFigure;
+ } else {
+ RectangleFigure feedbackFigure = new RectangleFigure();
+ feedbackFigure.setFill(false);
+ return feedbackFigure;
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected IFigure createFocusFeedbackFigure() {
+ return new Figure() {
+
+ protected void paintFigure(Graphics graphics) {
+ graphics.drawFocus(getBounds().getResized(-1, -1));
+ }
+ };
+ }
+
+ /**
+ * @generated
+ */
+ protected void updateLabel(Label target) {
+ Label source = (Label) getHostFigure();
+ target.setText(source.getText());
+ target.setTextAlignment(source.getTextAlignment());
+ target.setFont(source.getFont());
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshSelectionFeedback() {
+ if (selectionFeedbackFigure != null) {
+ if (selectionFeedbackFigure instanceof Label) {
+ updateLabel((Label) selectionFeedbackFigure);
+ selectionFeedbackFigure.setBounds(getFeedbackBounds());
+ } else {
+ selectionFeedbackFigure.setBounds(getFeedbackBounds().expand(5,
+ 5));
+ }
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshFocusFeedback() {
+ if (focusFeedbackFigure != null) {
+ focusFeedbackFigure.setBounds(getFeedbackBounds());
+ }
+ }
+
+ /**
+ * @generated
+ */
+
+ public void refreshFeedback() {
+ refreshSelectionFeedback();
+ refreshFocusFeedback();
+ }
+
+ /**
+ * @generated
+ */
+ private FigureListener getHostPositionListener() {
+ if (hostPositionListener == null) {
+ hostPositionListener = new FigureListener() {
+ public void figureMoved(IFigure source) {
+ refreshFeedback();
+ }
+ };
+ }
+ return hostPositionListener;
+ }
+
+}
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/parsers/AbstractParser.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/parsers/AbstractParser.java index f5b29e4ea0d..0cb00c061a7 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/parsers/AbstractParser.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/parsers/AbstractParser.java @@ -1 +1 @@ -//Since GMFT 3.1 we don't generate class AbstractParser into every diagram, instead extend org.eclipse.gmf.tooling.runtime.parsers.AbstractAttributeParser. +//Since GMFT 3.1 we don't generate class AbstractParser into every diagram, instead extend org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.parsers.AbstractAttributeParser.
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/parsers/MessageFormatParser.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/parsers/MessageFormatParser.java index 4c8ac2b656d..0eefacbc76e 100755 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/parsers/MessageFormatParser.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/parsers/MessageFormatParser.java @@ -10,7 +10,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.gmf.runtime.common.core.command.ICommand;
import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.tooling.runtime.parsers.AbstractAttributeParser;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.parsers.AbstractAttributeParser;
import org.eclipse.osgi.util.NLS;
import org.eclipse.papyrus.example.diagram.simplediagram.part.Messages;
import org.eclipse.papyrus.example.diagram.simplediagram.part.UMLDiagramEditorPlugin;
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/LoadResourceAction.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/LoadResourceAction.java index b64ceeefb47..cb3f66e6736 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/LoadResourceAction.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/LoadResourceAction.java @@ -1,18 +1,18 @@ -package org.eclipse.papyrus.example.diagram.simplediagram.part; - -import org.eclipse.core.commands.ExecutionEvent; -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.gmf.tooling.runtime.actions.DefaultLoadResourceAction; - -/** - * @generated - */ -public class LoadResourceAction extends DefaultLoadResourceAction { - /** - * @generated - */ - public Object execute(ExecutionEvent event) throws ExecutionException { - return super.execute(event); - } - -} +package org.eclipse.papyrus.example.diagram.simplediagram.part;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.actions.DefaultLoadResourceAction;
+
+/**
+ * @generated
+ */
+public class LoadResourceAction extends DefaultLoadResourceAction {
+ /**
+ * @generated
+ */
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ return super.execute(event);
+ }
+
+}
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/ModelElementSelectionPage.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/ModelElementSelectionPage.java index 16f7a8cb0e1..58346c37a77 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/ModelElementSelectionPage.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/ModelElementSelectionPage.java @@ -1,27 +1,27 @@ -package org.eclipse.papyrus.example.diagram.simplediagram.part; - -import org.eclipse.gmf.tooling.runtime.part.DefaultModelElementSelectionPage; - -/** - * Wizard page that allows to select element from model. - * @generated - */ -public class ModelElementSelectionPage extends DefaultModelElementSelectionPage { - - /** - * @generated - */ - public ModelElementSelectionPage(String pageName) { - super(UMLDiagramEditorPlugin.getInstance() - .getItemProvidersAdapterFactory(), pageName); - } - - /** - * Override to provide custom model element description. - * @generated - */ - protected String getSelectionTitle() { - return Messages.ModelElementSelectionPageMessage; - } - -} +package org.eclipse.papyrus.example.diagram.simplediagram.part;
+
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.part.DefaultModelElementSelectionPage;
+
+/**
+ * Wizard page that allows to select element from model.
+ * @generated
+ */
+public class ModelElementSelectionPage extends DefaultModelElementSelectionPage {
+
+ /**
+ * @generated
+ */
+ public ModelElementSelectionPage(String pageName) {
+ super(UMLDiagramEditorPlugin.getInstance()
+ .getItemProvidersAdapterFactory(), pageName);
+ }
+
+ /**
+ * Override to provide custom model element description.
+ * @generated
+ */
+ protected String getSelectionTitle() {
+ return Messages.ModelElementSelectionPageMessage;
+ }
+
+}
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditorPlugin.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditorPlugin.java index 32feb50c63c..3a51b1358be 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditorPlugin.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditorPlugin.java @@ -1,256 +1,256 @@ -package org.eclipse.papyrus.example.diagram.simplediagram.part; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.emf.common.notify.AdapterFactory; -import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory; -import org.eclipse.emf.edit.provider.ComposedAdapterFactory; -import org.eclipse.emf.edit.provider.IItemLabelProvider; -import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory; -import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory; -import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry; -import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint; -import org.eclipse.gmf.tooling.runtime.LogHelper; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.papyrus.example.diagram.simplediagram.providers.ElementInitializers; -import org.eclipse.swt.graphics.Image; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory; -import org.osgi.framework.BundleContext; - -/** - * @generated - */ -public class UMLDiagramEditorPlugin extends AbstractUIPlugin { - - /** - * @generated - */ - public static final String ID = "org.eclipse.uml2.uml.diagram"; //$NON-NLS-1$ - - /** - * @generated - */ - private LogHelper myLogHelper; - - /** - * @generated - */ - public static final PreferencesHint DIAGRAM_PREFERENCES_HINT = new PreferencesHint( - ID); - - /** - * @generated - */ - private static UMLDiagramEditorPlugin instance; - - /** - * @generated - */ - private ComposedAdapterFactory adapterFactory; - - /** - * @generated - */ - private UMLDocumentProvider documentProvider; - - /** - * @generated - */ - private ElementInitializers initializers; - - /** - * @generated - */ - public UMLDiagramEditorPlugin() { - } - - /** - * @generated - */ - public void start(BundleContext context) throws Exception { - super.start(context); - instance = this; - myLogHelper = new LogHelper(this); - PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT, - getPreferenceStore()); - adapterFactory = createAdapterFactory(); - } - - /** - * @generated - */ - public void stop(BundleContext context) throws Exception { - adapterFactory.dispose(); - adapterFactory = null; - initializers = null; - instance = null; - super.stop(context); - } - - /** - * @generated - */ - public static UMLDiagramEditorPlugin getInstance() { - return instance; - } - - /** - * @generated - */ - protected ComposedAdapterFactory createAdapterFactory() { - ArrayList<AdapterFactory> factories = new ArrayList<AdapterFactory>(); - fillItemProviderFactories(factories); - return new ComposedAdapterFactory(factories); - } - - /** - * @generated - */ - protected void fillItemProviderFactories(List<AdapterFactory> factories) { - factories.add(new UMLItemProviderAdapterFactory()); - factories.add(new EcoreItemProviderAdapterFactory()); - factories.add(new ResourceItemProviderAdapterFactory()); - factories.add(new ReflectiveItemProviderAdapterFactory()); - } - - /** - * @generated - */ - public AdapterFactory getItemProvidersAdapterFactory() { - return adapterFactory; - } - - /** - * @generated - */ - public ImageDescriptor getItemImageDescriptor(Object item) { - IItemLabelProvider labelProvider = (IItemLabelProvider) adapterFactory - .adapt(item, IItemLabelProvider.class); - if (labelProvider != null) { - return ExtendedImageRegistry.getInstance().getImageDescriptor( - labelProvider.getImage(item)); - } - return null; - } - - /** - * Returns an image descriptor for the image file at the given - * plug-in relative path. - * - * @generated - * @param path the path - * @return the image descriptor - */ - public static ImageDescriptor getBundledImageDescriptor(String path) { - return AbstractUIPlugin.imageDescriptorFromPlugin(ID, path); - } - - /** - * Respects images residing in any plug-in. If path is relative, - * then this bundle is looked up for the image, otherwise, for absolute - * path, first segment is taken as id of plug-in with image - * - * @generated - * @param path the path to image, either absolute (with plug-in id as first segment), or relative for bundled images - * @return the image descriptor - */ - public static ImageDescriptor findImageDescriptor(String path) { - final IPath p = new Path(path); - if (p.isAbsolute() && p.segmentCount() > 1) { - return AbstractUIPlugin.imageDescriptorFromPlugin(p.segment(0), p - .removeFirstSegments(1).makeAbsolute().toString()); - } else { - return getBundledImageDescriptor(p.makeAbsolute().toString()); - } - } - - /** - * Returns an image for the image file at the given plugin relative path. - * Client do not need to dispose this image. Images will be disposed automatically. - * - * @generated - * @param path the path - * @return image instance - */ - public Image getBundledImage(String path) { - Image image = getImageRegistry().get(path); - if (image == null) { - getImageRegistry().put(path, getBundledImageDescriptor(path)); - image = getImageRegistry().get(path); - } - return image; - } - - /** - * Returns string from plug-in's resource bundle - * - * @generated - */ - public static String getString(String key) { - return Platform.getResourceString(getInstance().getBundle(), "%" + key); //$NON-NLS-1$ - } - - /** - * @generated - */ - public UMLDocumentProvider getDocumentProvider() { - if (documentProvider == null) { - documentProvider = new UMLDocumentProvider(); - } - return documentProvider; - } - - /** - * @generated - */ - public ElementInitializers getElementInitializers() { - return initializers; - } - - /** - * @generated - */ - public void setElementInitializers(ElementInitializers i) { - this.initializers = i; - } - - /** - * @generated - */ - public void logError(String error) { - getLogHelper().logError(error, null); - } - - /** - * @generated - */ - public void logError(String error, Throwable throwable) { - getLogHelper().logError(error, throwable); - } - - /** - * @generated - */ - public void logInfo(String message) { - getLogHelper().logInfo(message, null); - } - - /** - * @generated - */ - public void logInfo(String message, Throwable throwable) { - getLogHelper().logInfo(message, throwable); - } - - /** - * @generated - */ - public LogHelper getLogHelper() { - return myLogHelper; - } -} +package org.eclipse.papyrus.example.diagram.simplediagram.part;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.LogHelper;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.papyrus.example.diagram.simplediagram.providers.ElementInitializers;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;
+import org.osgi.framework.BundleContext;
+
+/**
+ * @generated
+ */
+public class UMLDiagramEditorPlugin extends AbstractUIPlugin {
+
+ /**
+ * @generated
+ */
+ public static final String ID = "org.eclipse.uml2.uml.diagram"; //$NON-NLS-1$
+
+ /**
+ * @generated
+ */
+ private LogHelper myLogHelper;
+
+ /**
+ * @generated
+ */
+ public static final PreferencesHint DIAGRAM_PREFERENCES_HINT = new PreferencesHint(
+ ID);
+
+ /**
+ * @generated
+ */
+ private static UMLDiagramEditorPlugin instance;
+
+ /**
+ * @generated
+ */
+ private ComposedAdapterFactory adapterFactory;
+
+ /**
+ * @generated
+ */
+ private UMLDocumentProvider documentProvider;
+
+ /**
+ * @generated
+ */
+ private ElementInitializers initializers;
+
+ /**
+ * @generated
+ */
+ public UMLDiagramEditorPlugin() {
+ }
+
+ /**
+ * @generated
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ instance = this;
+ myLogHelper = new LogHelper(this);
+ PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT,
+ getPreferenceStore());
+ adapterFactory = createAdapterFactory();
+ }
+
+ /**
+ * @generated
+ */
+ public void stop(BundleContext context) throws Exception {
+ adapterFactory.dispose();
+ adapterFactory = null;
+ initializers = null;
+ instance = null;
+ super.stop(context);
+ }
+
+ /**
+ * @generated
+ */
+ public static UMLDiagramEditorPlugin getInstance() {
+ return instance;
+ }
+
+ /**
+ * @generated
+ */
+ protected ComposedAdapterFactory createAdapterFactory() {
+ ArrayList<AdapterFactory> factories = new ArrayList<AdapterFactory>();
+ fillItemProviderFactories(factories);
+ return new ComposedAdapterFactory(factories);
+ }
+
+ /**
+ * @generated
+ */
+ protected void fillItemProviderFactories(List<AdapterFactory> factories) {
+ factories.add(new UMLItemProviderAdapterFactory());
+ factories.add(new EcoreItemProviderAdapterFactory());
+ factories.add(new ResourceItemProviderAdapterFactory());
+ factories.add(new ReflectiveItemProviderAdapterFactory());
+ }
+
+ /**
+ * @generated
+ */
+ public AdapterFactory getItemProvidersAdapterFactory() {
+ return adapterFactory;
+ }
+
+ /**
+ * @generated
+ */
+ public ImageDescriptor getItemImageDescriptor(Object item) {
+ IItemLabelProvider labelProvider = (IItemLabelProvider) adapterFactory
+ .adapt(item, IItemLabelProvider.class);
+ if (labelProvider != null) {
+ return ExtendedImageRegistry.getInstance().getImageDescriptor(
+ labelProvider.getImage(item));
+ }
+ return null;
+ }
+
+ /**
+ * Returns an image descriptor for the image file at the given
+ * plug-in relative path.
+ *
+ * @generated
+ * @param path the path
+ * @return the image descriptor
+ */
+ public static ImageDescriptor getBundledImageDescriptor(String path) {
+ return AbstractUIPlugin.imageDescriptorFromPlugin(ID, path);
+ }
+
+ /**
+ * Respects images residing in any plug-in. If path is relative,
+ * then this bundle is looked up for the image, otherwise, for absolute
+ * path, first segment is taken as id of plug-in with image
+ *
+ * @generated
+ * @param path the path to image, either absolute (with plug-in id as first segment), or relative for bundled images
+ * @return the image descriptor
+ */
+ public static ImageDescriptor findImageDescriptor(String path) {
+ final IPath p = new Path(path);
+ if (p.isAbsolute() && p.segmentCount() > 1) {
+ return AbstractUIPlugin.imageDescriptorFromPlugin(p.segment(0), p
+ .removeFirstSegments(1).makeAbsolute().toString());
+ } else {
+ return getBundledImageDescriptor(p.makeAbsolute().toString());
+ }
+ }
+
+ /**
+ * Returns an image for the image file at the given plugin relative path.
+ * Client do not need to dispose this image. Images will be disposed automatically.
+ *
+ * @generated
+ * @param path the path
+ * @return image instance
+ */
+ public Image getBundledImage(String path) {
+ Image image = getImageRegistry().get(path);
+ if (image == null) {
+ getImageRegistry().put(path, getBundledImageDescriptor(path));
+ image = getImageRegistry().get(path);
+ }
+ return image;
+ }
+
+ /**
+ * Returns string from plug-in's resource bundle
+ *
+ * @generated
+ */
+ public static String getString(String key) {
+ return Platform.getResourceString(getInstance().getBundle(), "%" + key); //$NON-NLS-1$
+ }
+
+ /**
+ * @generated
+ */
+ public UMLDocumentProvider getDocumentProvider() {
+ if (documentProvider == null) {
+ documentProvider = new UMLDocumentProvider();
+ }
+ return documentProvider;
+ }
+
+ /**
+ * @generated
+ */
+ public ElementInitializers getElementInitializers() {
+ return initializers;
+ }
+
+ /**
+ * @generated
+ */
+ public void setElementInitializers(ElementInitializers i) {
+ this.initializers = i;
+ }
+
+ /**
+ * @generated
+ */
+ public void logError(String error) {
+ getLogHelper().logError(error, null);
+ }
+
+ /**
+ * @generated
+ */
+ public void logError(String error, Throwable throwable) {
+ getLogHelper().logError(error, throwable);
+ }
+
+ /**
+ * @generated
+ */
+ public void logInfo(String message) {
+ getLogHelper().logInfo(message, null);
+ }
+
+ /**
+ * @generated
+ */
+ public void logInfo(String message, Throwable throwable) {
+ getLogHelper().logInfo(message, throwable);
+ }
+
+ /**
+ * @generated
+ */
+ public LogHelper getLogHelper() {
+ return myLogHelper;
+ }
+}
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditorUtil.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditorUtil.java index 40391c29730..edf1dbc14ad 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditorUtil.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditorUtil.java @@ -1,398 +1,398 @@ -package org.eclipse.papyrus.example.diagram.simplediagram.part; - -import java.io.IOException; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.commands.operations.OperationHistoryFactory; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.SubProgressMonitor; -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.xmi.XMLResource; -import org.eclipse.emf.transaction.TransactionalEditingDomain; -import org.eclipse.emf.workspace.util.WorkspaceSynchronizer; -import org.eclipse.gef.EditPart; -import org.eclipse.gmf.runtime.common.core.command.CommandResult; -import org.eclipse.gmf.runtime.diagram.core.services.ViewService; -import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart; -import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; -import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart; -import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer; -import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart; -import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand; -import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory; -import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil; -import org.eclipse.gmf.runtime.notation.Diagram; -import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.gmf.tooling.runtime.part.DefaultDiagramEditorUtil; -import org.eclipse.jface.dialogs.IDialogSettings; -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.papyrus.example.diagram.simplediagram.edit.parts.ModelEditPart; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.part.FileEditorInput; -import org.eclipse.uml2.uml.Model; -import org.eclipse.uml2.uml.UMLFactory; - -/** - * @generated - */ -public class UMLDiagramEditorUtil { - - /** - * @generated - */ - public static Map<?, ?> getSaveOptions() { - HashMap<String, Object> saveOptions = new HashMap<String, Object>(); - saveOptions.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$ - saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, - Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER); - return saveOptions; - } - - /** - * @generated - */ - public static boolean openDiagram(Resource diagram) - throws PartInitException { - String path = diagram.getURI().toPlatformString(true); - IResource workspaceResource = ResourcesPlugin.getWorkspace().getRoot() - .findMember(new Path(path)); - if (workspaceResource instanceof IFile) { - IWorkbenchPage page = PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getActivePage(); - return null != page.openEditor(new FileEditorInput( - (IFile) workspaceResource), UMLDiagramEditor.ID); - } - return false; - } - - /** - * @generated - */ - public static void setCharset(IFile file) { - if (file == null) { - return; - } - try { - file.setCharset("UTF-8", new NullProgressMonitor()); //$NON-NLS-1$ - } catch (CoreException e) { - UMLDiagramEditorPlugin.getInstance().logError( - "Unable to set charset for file " + file.getFullPath(), e); //$NON-NLS-1$ - } - } - - /** - * @generated - */ - public static String getUniqueFileName(IPath containerFullPath, - String fileName, String extension) { - return DefaultDiagramEditorUtil.getUniqueFileName(containerFullPath, - fileName, extension, - DefaultDiagramEditorUtil.EXISTS_IN_WORKSPACE); - } - - /** - * Runs the wizard in a dialog. - * - * @generated - */ - public static void runWizard(Shell shell, Wizard wizard, String settingsKey) { - IDialogSettings pluginDialogSettings = UMLDiagramEditorPlugin - .getInstance().getDialogSettings(); - IDialogSettings wizardDialogSettings = pluginDialogSettings - .getSection(settingsKey); - if (wizardDialogSettings == null) { - wizardDialogSettings = pluginDialogSettings - .addNewSection(settingsKey); - } - wizard.setDialogSettings(wizardDialogSettings); - WizardDialog dialog = new WizardDialog(shell, wizard); - dialog.create(); - dialog.getShell().setSize(Math.max(500, dialog.getShell().getSize().x), - 500); - dialog.open(); - } - - /** - * This method should be called within a workspace modify operation since it creates resources. - * @generated - */ - public static Resource createDiagram(URI diagramURI, URI modelURI, - IProgressMonitor progressMonitor) { - TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE - .createEditingDomain(); - progressMonitor.beginTask( - Messages.UMLDiagramEditorUtil_CreateDiagramProgressTask, 3); - final Resource diagramResource = editingDomain.getResourceSet() - .createResource(diagramURI); - final Resource modelResource = editingDomain.getResourceSet() - .createResource(modelURI); - final String diagramName = diagramURI.lastSegment(); - AbstractTransactionalCommand command = new AbstractTransactionalCommand( - editingDomain, - Messages.UMLDiagramEditorUtil_CreateDiagramCommandLabel, - Collections.EMPTY_LIST) { - protected CommandResult doExecuteWithResult( - IProgressMonitor monitor, IAdaptable info) - throws ExecutionException { - Model model = createInitialModel(); - attachModelToResource(model, modelResource); - - Diagram diagram = ViewService.createDiagram(model, - ModelEditPart.MODEL_ID, - UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT); - if (diagram != null) { - diagramResource.getContents().add(diagram); - diagram.setName(diagramName); - diagram.setElement(model); - } - - try { - modelResource - .save(org.eclipse.papyrus.example.diagram.simplediagram.part.UMLDiagramEditorUtil - .getSaveOptions()); - diagramResource - .save(org.eclipse.papyrus.example.diagram.simplediagram.part.UMLDiagramEditorUtil - .getSaveOptions()); - } catch (IOException e) { - - UMLDiagramEditorPlugin.getInstance().logError( - "Unable to store model and diagram resources", e); //$NON-NLS-1$ - } - return CommandResult.newOKCommandResult(); - } - }; - try { - OperationHistoryFactory.getOperationHistory().execute(command, - new SubProgressMonitor(progressMonitor, 1), null); - } catch (ExecutionException e) { - UMLDiagramEditorPlugin.getInstance().logError( - "Unable to create model and diagram", e); //$NON-NLS-1$ - } - setCharset(WorkspaceSynchronizer.getFile(modelResource)); - setCharset(WorkspaceSynchronizer.getFile(diagramResource)); - return diagramResource; - } - - /** - * Create a new instance of domain element associated with canvas. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private static Model createInitialModel() { - return UMLFactory.eINSTANCE.createModel(); - } - - /** - * Store model element in the resource. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private static void attachModelToResource(Model model, Resource resource) { - resource.getContents().add(model); - } - - /** - * @generated - */ - public static void selectElementsInDiagram( - IDiagramWorkbenchPart diagramPart, List<EditPart> editParts) { - diagramPart.getDiagramGraphicalViewer().deselectAll(); - - EditPart firstPrimary = null; - for (EditPart nextPart : editParts) { - diagramPart.getDiagramGraphicalViewer().appendSelection(nextPart); - if (firstPrimary == null && nextPart instanceof IPrimaryEditPart) { - firstPrimary = nextPart; - } - } - - if (!editParts.isEmpty()) { - diagramPart.getDiagramGraphicalViewer().reveal( - firstPrimary != null ? firstPrimary : (EditPart) editParts - .get(0)); - } - } - - /** - * @generated - */ - private static int findElementsInDiagramByID(DiagramEditPart diagramPart, - EObject element, List<EditPart> editPartCollector) { - IDiagramGraphicalViewer viewer = (IDiagramGraphicalViewer) diagramPart - .getViewer(); - final int intialNumOfEditParts = editPartCollector.size(); - - if (element instanceof View) { // support notation element lookup - EditPart editPart = (EditPart) viewer.getEditPartRegistry().get( - element); - if (editPart != null) { - editPartCollector.add(editPart); - return 1; - } - } - - String elementID = EMFCoreUtil.getProxyID(element); - @SuppressWarnings("unchecked") - List<EditPart> associatedParts = viewer.findEditPartsForElement( - elementID, IGraphicalEditPart.class); - // perform the possible hierarchy disjoint -> take the top-most parts only - for (EditPart nextPart : associatedParts) { - EditPart parentPart = nextPart.getParent(); - while (parentPart != null && !associatedParts.contains(parentPart)) { - parentPart = parentPart.getParent(); - } - if (parentPart == null) { - editPartCollector.add(nextPart); - } - } - - if (intialNumOfEditParts == editPartCollector.size()) { - if (!associatedParts.isEmpty()) { - editPartCollector.add(associatedParts.get(0)); - } else { - if (element.eContainer() != null) { - return findElementsInDiagramByID(diagramPart, - element.eContainer(), editPartCollector); - } - } - } - return editPartCollector.size() - intialNumOfEditParts; - } - - /** - * @generated - */ - public static View findView(DiagramEditPart diagramEditPart, - EObject targetElement, LazyElement2ViewMap lazyElement2ViewMap) { - boolean hasStructuralURI = false; - if (targetElement.eResource() instanceof XMLResource) { - hasStructuralURI = ((XMLResource) targetElement.eResource()) - .getID(targetElement) == null; - } - - View view = null; - LinkedList<EditPart> editPartHolder = new LinkedList<EditPart>(); - if (hasStructuralURI - && !lazyElement2ViewMap.getElement2ViewMap().isEmpty()) { - view = lazyElement2ViewMap.getElement2ViewMap().get(targetElement); - } else if (findElementsInDiagramByID(diagramEditPart, targetElement, - editPartHolder) > 0) { - EditPart editPart = editPartHolder.get(0); - view = editPart.getModel() instanceof View ? (View) editPart - .getModel() : null; - } - - return (view == null) ? diagramEditPart.getDiagramView() : view; - } - - /** - * XXX This is quite suspicious code (especially editPartTmpHolder) and likely to be removed soon - * @generated - */ - public static class LazyElement2ViewMap { - /** - * @generated - */ - private Map<EObject, View> element2ViewMap; - - /** - * @generated - */ - private View scope; - - /** - * @generated - */ - private Set<? extends EObject> elementSet; - - /** - * @generated - */ - public LazyElement2ViewMap(View scope, Set<? extends EObject> elements) { - this.scope = scope; - this.elementSet = elements; - } - - /** - * @generated - */ - public final Map<EObject, View> getElement2ViewMap() { - if (element2ViewMap == null) { - element2ViewMap = new HashMap<EObject, View>(); - // map possible notation elements to itself as these can't be found by view.getElement() - for (EObject element : elementSet) { - if (element instanceof View) { - View view = (View) element; - if (view.getDiagram() == scope.getDiagram()) { - element2ViewMap.put(element, view); // take only those that part of our diagram - } - } - } - - buildElement2ViewMap(scope, element2ViewMap, elementSet); - } - return element2ViewMap; - } - - /** - * @generated - */ - private static boolean buildElement2ViewMap(View parentView, - Map<EObject, View> element2ViewMap, - Set<? extends EObject> elements) { - if (elements.size() == element2ViewMap.size()) { - return true; - } - - if (parentView.isSetElement() - && !element2ViewMap.containsKey(parentView.getElement()) - && elements.contains(parentView.getElement())) { - element2ViewMap.put(parentView.getElement(), parentView); - if (elements.size() == element2ViewMap.size()) { - return true; - } - } - boolean complete = false; - for (Iterator<?> it = parentView.getChildren().iterator(); it - .hasNext() && !complete;) { - complete = buildElement2ViewMap((View) it.next(), - element2ViewMap, elements); - } - for (Iterator<?> it = parentView.getSourceEdges().iterator(); it - .hasNext() && !complete;) { - complete = buildElement2ViewMap((View) it.next(), - element2ViewMap, elements); - } - for (Iterator<?> it = parentView.getTargetEdges().iterator(); it - .hasNext() && !complete;) { - complete = buildElement2ViewMap((View) it.next(), - element2ViewMap, elements); - } - return complete; - } - } //LazyElement2ViewMap - -} +package org.eclipse.papyrus.example.diagram.simplediagram.part;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.operations.OperationHistoryFactory;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
+import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;
+import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.part.DefaultDiagramEditorUtil;
+import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.papyrus.example.diagram.simplediagram.edit.parts.ModelEditPart;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.UMLFactory;
+
+/**
+ * @generated
+ */
+public class UMLDiagramEditorUtil {
+
+ /**
+ * @generated
+ */
+ public static Map<?, ?> getSaveOptions() {
+ HashMap<String, Object> saveOptions = new HashMap<String, Object>();
+ saveOptions.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$
+ saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED,
+ Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+ return saveOptions;
+ }
+
+ /**
+ * @generated
+ */
+ public static boolean openDiagram(Resource diagram)
+ throws PartInitException {
+ String path = diagram.getURI().toPlatformString(true);
+ IResource workspaceResource = ResourcesPlugin.getWorkspace().getRoot()
+ .findMember(new Path(path));
+ if (workspaceResource instanceof IFile) {
+ IWorkbenchPage page = PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getActivePage();
+ return null != page.openEditor(new FileEditorInput(
+ (IFile) workspaceResource), UMLDiagramEditor.ID);
+ }
+ return false;
+ }
+
+ /**
+ * @generated
+ */
+ public static void setCharset(IFile file) {
+ if (file == null) {
+ return;
+ }
+ try {
+ file.setCharset("UTF-8", new NullProgressMonitor()); //$NON-NLS-1$
+ } catch (CoreException e) {
+ UMLDiagramEditorPlugin.getInstance().logError(
+ "Unable to set charset for file " + file.getFullPath(), e); //$NON-NLS-1$
+ }
+ }
+
+ /**
+ * @generated
+ */
+ public static String getUniqueFileName(IPath containerFullPath,
+ String fileName, String extension) {
+ return DefaultDiagramEditorUtil.getUniqueFileName(containerFullPath,
+ fileName, extension,
+ DefaultDiagramEditorUtil.EXISTS_IN_WORKSPACE);
+ }
+
+ /**
+ * Runs the wizard in a dialog.
+ *
+ * @generated
+ */
+ public static void runWizard(Shell shell, Wizard wizard, String settingsKey) {
+ IDialogSettings pluginDialogSettings = UMLDiagramEditorPlugin
+ .getInstance().getDialogSettings();
+ IDialogSettings wizardDialogSettings = pluginDialogSettings
+ .getSection(settingsKey);
+ if (wizardDialogSettings == null) {
+ wizardDialogSettings = pluginDialogSettings
+ .addNewSection(settingsKey);
+ }
+ wizard.setDialogSettings(wizardDialogSettings);
+ WizardDialog dialog = new WizardDialog(shell, wizard);
+ dialog.create();
+ dialog.getShell().setSize(Math.max(500, dialog.getShell().getSize().x),
+ 500);
+ dialog.open();
+ }
+
+ /**
+ * This method should be called within a workspace modify operation since it creates resources.
+ * @generated
+ */
+ public static Resource createDiagram(URI diagramURI, URI modelURI,
+ IProgressMonitor progressMonitor) {
+ TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE
+ .createEditingDomain();
+ progressMonitor.beginTask(
+ Messages.UMLDiagramEditorUtil_CreateDiagramProgressTask, 3);
+ final Resource diagramResource = editingDomain.getResourceSet()
+ .createResource(diagramURI);
+ final Resource modelResource = editingDomain.getResourceSet()
+ .createResource(modelURI);
+ final String diagramName = diagramURI.lastSegment();
+ AbstractTransactionalCommand command = new AbstractTransactionalCommand(
+ editingDomain,
+ Messages.UMLDiagramEditorUtil_CreateDiagramCommandLabel,
+ Collections.EMPTY_LIST) {
+ protected CommandResult doExecuteWithResult(
+ IProgressMonitor monitor, IAdaptable info)
+ throws ExecutionException {
+ Model model = createInitialModel();
+ attachModelToResource(model, modelResource);
+
+ Diagram diagram = ViewService.createDiagram(model,
+ ModelEditPart.MODEL_ID,
+ UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
+ if (diagram != null) {
+ diagramResource.getContents().add(diagram);
+ diagram.setName(diagramName);
+ diagram.setElement(model);
+ }
+
+ try {
+ modelResource
+ .save(org.eclipse.papyrus.example.diagram.simplediagram.part.UMLDiagramEditorUtil
+ .getSaveOptions());
+ diagramResource
+ .save(org.eclipse.papyrus.example.diagram.simplediagram.part.UMLDiagramEditorUtil
+ .getSaveOptions());
+ } catch (IOException e) {
+
+ UMLDiagramEditorPlugin.getInstance().logError(
+ "Unable to store model and diagram resources", e); //$NON-NLS-1$
+ }
+ return CommandResult.newOKCommandResult();
+ }
+ };
+ try {
+ OperationHistoryFactory.getOperationHistory().execute(command,
+ new SubProgressMonitor(progressMonitor, 1), null);
+ } catch (ExecutionException e) {
+ UMLDiagramEditorPlugin.getInstance().logError(
+ "Unable to create model and diagram", e); //$NON-NLS-1$
+ }
+ setCharset(WorkspaceSynchronizer.getFile(modelResource));
+ setCharset(WorkspaceSynchronizer.getFile(diagramResource));
+ return diagramResource;
+ }
+
+ /**
+ * Create a new instance of domain element associated with canvas.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private static Model createInitialModel() {
+ return UMLFactory.eINSTANCE.createModel();
+ }
+
+ /**
+ * Store model element in the resource.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private static void attachModelToResource(Model model, Resource resource) {
+ resource.getContents().add(model);
+ }
+
+ /**
+ * @generated
+ */
+ public static void selectElementsInDiagram(
+ IDiagramWorkbenchPart diagramPart, List<EditPart> editParts) {
+ diagramPart.getDiagramGraphicalViewer().deselectAll();
+
+ EditPart firstPrimary = null;
+ for (EditPart nextPart : editParts) {
+ diagramPart.getDiagramGraphicalViewer().appendSelection(nextPart);
+ if (firstPrimary == null && nextPart instanceof IPrimaryEditPart) {
+ firstPrimary = nextPart;
+ }
+ }
+
+ if (!editParts.isEmpty()) {
+ diagramPart.getDiagramGraphicalViewer().reveal(
+ firstPrimary != null ? firstPrimary : (EditPart) editParts
+ .get(0));
+ }
+ }
+
+ /**
+ * @generated
+ */
+ private static int findElementsInDiagramByID(DiagramEditPart diagramPart,
+ EObject element, List<EditPart> editPartCollector) {
+ IDiagramGraphicalViewer viewer = (IDiagramGraphicalViewer) diagramPart
+ .getViewer();
+ final int intialNumOfEditParts = editPartCollector.size();
+
+ if (element instanceof View) { // support notation element lookup
+ EditPart editPart = (EditPart) viewer.getEditPartRegistry().get(
+ element);
+ if (editPart != null) {
+ editPartCollector.add(editPart);
+ return 1;
+ }
+ }
+
+ String elementID = EMFCoreUtil.getProxyID(element);
+ @SuppressWarnings("unchecked")
+ List<EditPart> associatedParts = viewer.findEditPartsForElement(
+ elementID, IGraphicalEditPart.class);
+ // perform the possible hierarchy disjoint -> take the top-most parts only
+ for (EditPart nextPart : associatedParts) {
+ EditPart parentPart = nextPart.getParent();
+ while (parentPart != null && !associatedParts.contains(parentPart)) {
+ parentPart = parentPart.getParent();
+ }
+ if (parentPart == null) {
+ editPartCollector.add(nextPart);
+ }
+ }
+
+ if (intialNumOfEditParts == editPartCollector.size()) {
+ if (!associatedParts.isEmpty()) {
+ editPartCollector.add(associatedParts.get(0));
+ } else {
+ if (element.eContainer() != null) {
+ return findElementsInDiagramByID(diagramPart,
+ element.eContainer(), editPartCollector);
+ }
+ }
+ }
+ return editPartCollector.size() - intialNumOfEditParts;
+ }
+
+ /**
+ * @generated
+ */
+ public static View findView(DiagramEditPart diagramEditPart,
+ EObject targetElement, LazyElement2ViewMap lazyElement2ViewMap) {
+ boolean hasStructuralURI = false;
+ if (targetElement.eResource() instanceof XMLResource) {
+ hasStructuralURI = ((XMLResource) targetElement.eResource())
+ .getID(targetElement) == null;
+ }
+
+ View view = null;
+ LinkedList<EditPart> editPartHolder = new LinkedList<EditPart>();
+ if (hasStructuralURI
+ && !lazyElement2ViewMap.getElement2ViewMap().isEmpty()) {
+ view = lazyElement2ViewMap.getElement2ViewMap().get(targetElement);
+ } else if (findElementsInDiagramByID(diagramEditPart, targetElement,
+ editPartHolder) > 0) {
+ EditPart editPart = editPartHolder.get(0);
+ view = editPart.getModel() instanceof View ? (View) editPart
+ .getModel() : null;
+ }
+
+ return (view == null) ? diagramEditPart.getDiagramView() : view;
+ }
+
+ /**
+ * XXX This is quite suspicious code (especially editPartTmpHolder) and likely to be removed soon
+ * @generated
+ */
+ public static class LazyElement2ViewMap {
+ /**
+ * @generated
+ */
+ private Map<EObject, View> element2ViewMap;
+
+ /**
+ * @generated
+ */
+ private View scope;
+
+ /**
+ * @generated
+ */
+ private Set<? extends EObject> elementSet;
+
+ /**
+ * @generated
+ */
+ public LazyElement2ViewMap(View scope, Set<? extends EObject> elements) {
+ this.scope = scope;
+ this.elementSet = elements;
+ }
+
+ /**
+ * @generated
+ */
+ public final Map<EObject, View> getElement2ViewMap() {
+ if (element2ViewMap == null) {
+ element2ViewMap = new HashMap<EObject, View>();
+ // map possible notation elements to itself as these can't be found by view.getElement()
+ for (EObject element : elementSet) {
+ if (element instanceof View) {
+ View view = (View) element;
+ if (view.getDiagram() == scope.getDiagram()) {
+ element2ViewMap.put(element, view); // take only those that part of our diagram
+ }
+ }
+ }
+
+ buildElement2ViewMap(scope, element2ViewMap, elementSet);
+ }
+ return element2ViewMap;
+ }
+
+ /**
+ * @generated
+ */
+ private static boolean buildElement2ViewMap(View parentView,
+ Map<EObject, View> element2ViewMap,
+ Set<? extends EObject> elements) {
+ if (elements.size() == element2ViewMap.size()) {
+ return true;
+ }
+
+ if (parentView.isSetElement()
+ && !element2ViewMap.containsKey(parentView.getElement())
+ && elements.contains(parentView.getElement())) {
+ element2ViewMap.put(parentView.getElement(), parentView);
+ if (elements.size() == element2ViewMap.size()) {
+ return true;
+ }
+ }
+ boolean complete = false;
+ for (Iterator<?> it = parentView.getChildren().iterator(); it
+ .hasNext() && !complete;) {
+ complete = buildElement2ViewMap((View) it.next(),
+ element2ViewMap, elements);
+ }
+ for (Iterator<?> it = parentView.getSourceEdges().iterator(); it
+ .hasNext() && !complete;) {
+ complete = buildElement2ViewMap((View) it.next(),
+ element2ViewMap, elements);
+ }
+ for (Iterator<?> it = parentView.getTargetEdges().iterator(); it
+ .hasNext() && !complete;) {
+ complete = buildElement2ViewMap((View) it.next(),
+ element2ViewMap, elements);
+ }
+ return complete;
+ }
+ } //LazyElement2ViewMap
+
+}
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramUpdater.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramUpdater.java index 23bb1ceaa78..db9efd6af07 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramUpdater.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramUpdater.java @@ -1,157 +1,157 @@ -package org.eclipse.papyrus.example.diagram.simplediagram.part; - -import java.util.Collections; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; - -import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.gmf.tooling.runtime.update.DiagramUpdater; -import org.eclipse.papyrus.example.diagram.simplediagram.edit.parts.ComponentEditPart; -import org.eclipse.papyrus.example.diagram.simplediagram.edit.parts.ModelEditPart; -import org.eclipse.uml2.uml.Model; -import org.eclipse.uml2.uml.PackageableElement; - -/** - * @generated - */ -public class UMLDiagramUpdater { - - /** - * @generated - */ - public static List<UMLNodeDescriptor> getSemanticChildren(View view) { - switch (UMLVisualIDRegistry.getVisualID(view)) { - case ModelEditPart.VISUAL_ID: - return getModel_1000SemanticChildren(view); - } - return Collections.emptyList(); - } - - /** - * @generated - */ - public static List<UMLNodeDescriptor> getModel_1000SemanticChildren( - View view) { - if (!view.isSetElement()) { - return Collections.emptyList(); - } - Model modelElement = (Model) view.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getPackagedElements().iterator(); it - .hasNext();) { - PackageableElement childElement = (PackageableElement) it.next(); - int visualID = UMLVisualIDRegistry.getNodeVisualID(view, - childElement); - if (visualID == ComponentEditPart.VISUAL_ID) { - result.add(new UMLNodeDescriptor(childElement, visualID)); - continue; - } - } - return result; - } - - /** - * @generated - */ - public static List<UMLLinkDescriptor> getContainedLinks(View view) { - switch (UMLVisualIDRegistry.getVisualID(view)) { - case ModelEditPart.VISUAL_ID: - return getModel_1000ContainedLinks(view); - case ComponentEditPart.VISUAL_ID: - return getComponent_2001ContainedLinks(view); - } - return Collections.emptyList(); - } - - /** - * @generated - */ - public static List<UMLLinkDescriptor> getIncomingLinks(View view) { - switch (UMLVisualIDRegistry.getVisualID(view)) { - case ComponentEditPart.VISUAL_ID: - return getComponent_2001IncomingLinks(view); - } - return Collections.emptyList(); - } - - /** - * @generated - */ - public static List<UMLLinkDescriptor> getOutgoingLinks(View view) { - switch (UMLVisualIDRegistry.getVisualID(view)) { - case ComponentEditPart.VISUAL_ID: - return getComponent_2001OutgoingLinks(view); - } - return Collections.emptyList(); - } - - /** - * @generated - */ - public static List<UMLLinkDescriptor> getModel_1000ContainedLinks(View view) { - return Collections.emptyList(); - } - - /** - * @generated - */ - public static List<UMLLinkDescriptor> getComponent_2001ContainedLinks( - View view) { - return Collections.emptyList(); - } - - /** - * @generated - */ - public static List<UMLLinkDescriptor> getComponent_2001IncomingLinks( - View view) { - return Collections.emptyList(); - } - - /** - * @generated - */ - public static List<UMLLinkDescriptor> getComponent_2001OutgoingLinks( - View view) { - return Collections.emptyList(); - } - - /** - * @generated - */ - public static final DiagramUpdater TYPED_INSTANCE = new DiagramUpdater() { - /** - * @generated - */ - - public List<UMLNodeDescriptor> getSemanticChildren(View view) { - return UMLDiagramUpdater.getSemanticChildren(view); - } - - /** - * @generated - */ - - public List<UMLLinkDescriptor> getContainedLinks(View view) { - return UMLDiagramUpdater.getContainedLinks(view); - } - - /** - * @generated - */ - - public List<UMLLinkDescriptor> getIncomingLinks(View view) { - return UMLDiagramUpdater.getIncomingLinks(view); - } - - /** - * @generated - */ - - public List<UMLLinkDescriptor> getOutgoingLinks(View view) { - return UMLDiagramUpdater.getOutgoingLinks(view); - } - }; - -} +package org.eclipse.papyrus.example.diagram.simplediagram.part;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.update.DiagramUpdater;
+import org.eclipse.papyrus.example.diagram.simplediagram.edit.parts.ComponentEditPart;
+import org.eclipse.papyrus.example.diagram.simplediagram.edit.parts.ModelEditPart;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.PackageableElement;
+
+/**
+ * @generated
+ */
+public class UMLDiagramUpdater {
+
+ /**
+ * @generated
+ */
+ public static List<UMLNodeDescriptor> getSemanticChildren(View view) {
+ switch (UMLVisualIDRegistry.getVisualID(view)) {
+ case ModelEditPart.VISUAL_ID:
+ return getModel_1000SemanticChildren(view);
+ }
+ return Collections.emptyList();
+ }
+
+ /**
+ * @generated
+ */
+ public static List<UMLNodeDescriptor> getModel_1000SemanticChildren(
+ View view) {
+ if (!view.isSetElement()) {
+ return Collections.emptyList();
+ }
+ Model modelElement = (Model) view.getElement();
+ LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
+ for (Iterator<?> it = modelElement.getPackagedElements().iterator(); it
+ .hasNext();) {
+ PackageableElement childElement = (PackageableElement) it.next();
+ int visualID = UMLVisualIDRegistry.getNodeVisualID(view,
+ childElement);
+ if (visualID == ComponentEditPart.VISUAL_ID) {
+ result.add(new UMLNodeDescriptor(childElement, visualID));
+ continue;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * @generated
+ */
+ public static List<UMLLinkDescriptor> getContainedLinks(View view) {
+ switch (UMLVisualIDRegistry.getVisualID(view)) {
+ case ModelEditPart.VISUAL_ID:
+ return getModel_1000ContainedLinks(view);
+ case ComponentEditPart.VISUAL_ID:
+ return getComponent_2001ContainedLinks(view);
+ }
+ return Collections.emptyList();
+ }
+
+ /**
+ * @generated
+ */
+ public static List<UMLLinkDescriptor> getIncomingLinks(View view) {
+ switch (UMLVisualIDRegistry.getVisualID(view)) {
+ case ComponentEditPart.VISUAL_ID:
+ return getComponent_2001IncomingLinks(view);
+ }
+ return Collections.emptyList();
+ }
+
+ /**
+ * @generated
+ */
+ public static List<UMLLinkDescriptor> getOutgoingLinks(View view) {
+ switch (UMLVisualIDRegistry.getVisualID(view)) {
+ case ComponentEditPart.VISUAL_ID:
+ return getComponent_2001OutgoingLinks(view);
+ }
+ return Collections.emptyList();
+ }
+
+ /**
+ * @generated
+ */
+ public static List<UMLLinkDescriptor> getModel_1000ContainedLinks(View view) {
+ return Collections.emptyList();
+ }
+
+ /**
+ * @generated
+ */
+ public static List<UMLLinkDescriptor> getComponent_2001ContainedLinks(
+ View view) {
+ return Collections.emptyList();
+ }
+
+ /**
+ * @generated
+ */
+ public static List<UMLLinkDescriptor> getComponent_2001IncomingLinks(
+ View view) {
+ return Collections.emptyList();
+ }
+
+ /**
+ * @generated
+ */
+ public static List<UMLLinkDescriptor> getComponent_2001OutgoingLinks(
+ View view) {
+ return Collections.emptyList();
+ }
+
+ /**
+ * @generated
+ */
+ public static final DiagramUpdater TYPED_INSTANCE = new DiagramUpdater() {
+ /**
+ * @generated
+ */
+
+ public List<UMLNodeDescriptor> getSemanticChildren(View view) {
+ return UMLDiagramUpdater.getSemanticChildren(view);
+ }
+
+ /**
+ * @generated
+ */
+
+ public List<UMLLinkDescriptor> getContainedLinks(View view) {
+ return UMLDiagramUpdater.getContainedLinks(view);
+ }
+
+ /**
+ * @generated
+ */
+
+ public List<UMLLinkDescriptor> getIncomingLinks(View view) {
+ return UMLDiagramUpdater.getIncomingLinks(view);
+ }
+
+ /**
+ * @generated
+ */
+
+ public List<UMLLinkDescriptor> getOutgoingLinks(View view) {
+ return UMLDiagramUpdater.getOutgoingLinks(view);
+ }
+ };
+
+}
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLLinkDescriptor.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLLinkDescriptor.java index a65d1ff8f87..8afa40f619c 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLLinkDescriptor.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLLinkDescriptor.java @@ -1,27 +1,27 @@ -package org.eclipse.papyrus.example.diagram.simplediagram.part; - -import org.eclipse.emf.ecore.EObject; -import org.eclipse.gmf.runtime.emf.type.core.IElementType; -import org.eclipse.gmf.tooling.runtime.update.UpdaterLinkDescriptor; - -/** - * @generated - */ -public class UMLLinkDescriptor extends UpdaterLinkDescriptor { - /** - * @generated - */ - public UMLLinkDescriptor(EObject source, EObject destination, - IElementType elementType, int linkVID) { - super(source, destination, elementType, linkVID); - } - - /** - * @generated - */ - public UMLLinkDescriptor(EObject source, EObject destination, - EObject linkElement, IElementType elementType, int linkVID) { - super(source, destination, linkElement, elementType, linkVID); - } - -} +package org.eclipse.papyrus.example.diagram.simplediagram.part;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.update.UpdaterLinkDescriptor;
+
+/**
+ * @generated
+ */
+public class UMLLinkDescriptor extends UpdaterLinkDescriptor {
+ /**
+ * @generated
+ */
+ public UMLLinkDescriptor(EObject source, EObject destination,
+ IElementType elementType, int linkVID) {
+ super(source, destination, elementType, linkVID);
+ }
+
+ /**
+ * @generated
+ */
+ public UMLLinkDescriptor(EObject source, EObject destination,
+ EObject linkElement, IElementType elementType, int linkVID) {
+ super(source, destination, linkElement, elementType, linkVID);
+ }
+
+}
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLNodeDescriptor.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLNodeDescriptor.java index f7ad072d4b4..ef0fc6a148c 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLNodeDescriptor.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLNodeDescriptor.java @@ -1,17 +1,17 @@ -package org.eclipse.papyrus.example.diagram.simplediagram.part; - -import org.eclipse.emf.ecore.EObject; -import org.eclipse.gmf.tooling.runtime.update.UpdaterNodeDescriptor; - -/** - * @generated - */ -public class UMLNodeDescriptor extends UpdaterNodeDescriptor { - /** - * @generated - */ - public UMLNodeDescriptor(EObject modelElement, int visualID) { - super(modelElement, visualID); - } - -} +package org.eclipse.papyrus.example.diagram.simplediagram.part;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.update.UpdaterNodeDescriptor;
+
+/**
+ * @generated
+ */
+public class UMLNodeDescriptor extends UpdaterNodeDescriptor {
+ /**
+ * @generated
+ */
+ public UMLNodeDescriptor(EObject modelElement, int visualID) {
+ super(modelElement, visualID);
+ }
+
+}
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLPaletteFactory.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLPaletteFactory.java index e3da7b83294..882240ee3b8 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLPaletteFactory.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLPaletteFactory.java @@ -1,56 +1,56 @@ -package org.eclipse.papyrus.example.diagram.simplediagram.part; - -import java.util.Collections; - -import org.eclipse.gef.palette.PaletteContainer; -import org.eclipse.gef.palette.PaletteGroup; -import org.eclipse.gef.palette.PaletteRoot; -import org.eclipse.gef.palette.ToolEntry; -import org.eclipse.gmf.tooling.runtime.part.DefaultNodeToolEntry; -import org.eclipse.papyrus.example.diagram.simplediagram.providers.UMLElementTypes; - -/** - * @generated - */ -public class UMLPaletteFactory { - - /** - * @generated - */ - public void fillPalette(PaletteRoot paletteRoot) { - paletteRoot.add(createUml1Group()); - } - - /** - * Creates "uml" palette tool group - * @generated - */ - private PaletteContainer createUml1Group() { - PaletteGroup paletteContainer = new PaletteGroup( - Messages.Uml1Group_title); - paletteContainer.setId("createUml1Group"); //$NON-NLS-1$ - paletteContainer.setSmallIcon(UMLDiagramEditorPlugin - .findImageDescriptor("icons/obj16/Diagram_UML.gif")); //$NON-NLS-1$ - paletteContainer.setLargeIcon(UMLDiagramEditorPlugin - .findImageDescriptor("icons/obj16/Diagram_UML.gif")); //$NON-NLS-1$ - paletteContainer.add(createComponent1CreationTool()); - return paletteContainer; - } - - /** - * @generated - */ - private ToolEntry createComponent1CreationTool() { - DefaultNodeToolEntry entry = new DefaultNodeToolEntry( - Messages.Component1CreationTool_title, - Messages.Component1CreationTool_desc, - Collections.singletonList(UMLElementTypes.Component_2001)); - entry.setId("createComponent1CreationTool"); //$NON-NLS-1$ - entry.setSmallIcon(UMLDiagramEditorPlugin - .findImageDescriptor("icons/obj16/Component.gif")); //$NON-NLS-1$ - entry.setLargeIcon(UMLDiagramEditorPlugin - .findImageDescriptor("icons/obj16/Component.gif")); //$NON-NLS-1$ - return entry; - } - -} +package org.eclipse.papyrus.example.diagram.simplediagram.part;
+
+import java.util.Collections;
+
+import org.eclipse.gef.palette.PaletteContainer;
+import org.eclipse.gef.palette.PaletteGroup;
+import org.eclipse.gef.palette.PaletteRoot;
+import org.eclipse.gef.palette.ToolEntry;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.part.DefaultNodeToolEntry;
+import org.eclipse.papyrus.example.diagram.simplediagram.providers.UMLElementTypes;
+
+/**
+ * @generated
+ */
+public class UMLPaletteFactory {
+
+ /**
+ * @generated
+ */
+ public void fillPalette(PaletteRoot paletteRoot) {
+ paletteRoot.add(createUml1Group());
+ }
+
+ /**
+ * Creates "uml" palette tool group
+ * @generated
+ */
+ private PaletteContainer createUml1Group() {
+ PaletteGroup paletteContainer = new PaletteGroup(
+ Messages.Uml1Group_title);
+ paletteContainer.setId("createUml1Group"); //$NON-NLS-1$
+ paletteContainer.setSmallIcon(UMLDiagramEditorPlugin
+ .findImageDescriptor("icons/obj16/Diagram_UML.gif")); //$NON-NLS-1$
+ paletteContainer.setLargeIcon(UMLDiagramEditorPlugin
+ .findImageDescriptor("icons/obj16/Diagram_UML.gif")); //$NON-NLS-1$
+ paletteContainer.add(createComponent1CreationTool());
+ return paletteContainer;
+ }
+
+ /**
+ * @generated
+ */
+ private ToolEntry createComponent1CreationTool() {
+ DefaultNodeToolEntry entry = new DefaultNodeToolEntry(
+ Messages.Component1CreationTool_title,
+ Messages.Component1CreationTool_desc,
+ Collections.singletonList(UMLElementTypes.Component_2001));
+ entry.setId("createComponent1CreationTool"); //$NON-NLS-1$
+ entry.setSmallIcon(UMLDiagramEditorPlugin
+ .findImageDescriptor("icons/obj16/Component.gif")); //$NON-NLS-1$
+ entry.setLargeIcon(UMLDiagramEditorPlugin
+ .findImageDescriptor("icons/obj16/Component.gif")); //$NON-NLS-1$
+ return entry;
+ }
+
+}
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLVisualIDRegistry.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLVisualIDRegistry.java index 6f83ebb0b82..7053dd08f66 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLVisualIDRegistry.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLVisualIDRegistry.java @@ -1,282 +1,282 @@ -package org.eclipse.papyrus.example.diagram.simplediagram.part; - -import org.eclipse.core.runtime.Platform; -import org.eclipse.emf.ecore.EAnnotation; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.gmf.runtime.notation.Diagram; -import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.gmf.tooling.runtime.structure.DiagramStructure; -import org.eclipse.papyrus.example.diagram.simplediagram.edit.parts.ComponentEditPart; -import org.eclipse.papyrus.example.diagram.simplediagram.edit.parts.ComponentNameEditPart; -import org.eclipse.papyrus.example.diagram.simplediagram.edit.parts.ModelEditPart; -import org.eclipse.uml2.uml.Model; -import org.eclipse.uml2.uml.UMLPackage; - -/** - * This registry is used to determine which type of visual object should be - * created for the corresponding Diagram, Node, ChildNode or Link represented - * by a domain model object. - * - * @generated - */ -public class UMLVisualIDRegistry { - - /** - * @generated - */ - private static final String DEBUG_KEY = "org.eclipse.uml2.uml.diagram/debug/visualID"; //$NON-NLS-1$ - - /** - * @generated - */ - public static int getVisualID(View view) { - if (view instanceof Diagram) { - if (ModelEditPart.MODEL_ID.equals(view.getType())) { - return ModelEditPart.VISUAL_ID; - } else { - return -1; - } - } - return org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry - .getVisualID(view.getType()); - } - - /** - * @generated - */ - public static String getModelID(View view) { - View diagram = view.getDiagram(); - while (view != diagram) { - EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$ - if (annotation != null) { - return (String) annotation.getDetails().get("modelID"); //$NON-NLS-1$ - } - view = (View) view.eContainer(); - } - return diagram != null ? diagram.getType() : null; - } - - /** - * @generated - */ - public static int getVisualID(String type) { - try { - return Integer.parseInt(type); - } catch (NumberFormatException e) { - if (Boolean.TRUE.toString().equalsIgnoreCase( - Platform.getDebugOption(DEBUG_KEY))) { - UMLDiagramEditorPlugin.getInstance().logError( - "Unable to parse view type as a visualID number: " - + type); - } - } - return -1; - } - - /** - * @generated - */ - public static String getType(int visualID) { - return Integer.toString(visualID); - } - - /** - * @generated - */ - public static int getDiagramVisualID(EObject domainElement) { - if (domainElement == null) { - return -1; - } - if (UMLPackage.eINSTANCE.getModel().isSuperTypeOf( - domainElement.eClass()) - && isDiagram((Model) domainElement)) { - return ModelEditPart.VISUAL_ID; - } - return -1; - } - - /** - * @generated - */ - public static int getNodeVisualID(View containerView, EObject domainElement) { - if (domainElement == null) { - return -1; - } - String containerModelID = org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry - .getModelID(containerView); - if (!ModelEditPart.MODEL_ID.equals(containerModelID)) { - return -1; - } - int containerVisualID; - if (ModelEditPart.MODEL_ID.equals(containerModelID)) { - containerVisualID = org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry - .getVisualID(containerView); - } else { - if (containerView instanceof Diagram) { - containerVisualID = ModelEditPart.VISUAL_ID; - } else { - return -1; - } - } - switch (containerVisualID) { - case ModelEditPart.VISUAL_ID: - if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf( - domainElement.eClass())) { - return ComponentEditPart.VISUAL_ID; - } - break; - } - return -1; - } - - /** - * @generated - */ - public static boolean canCreateNode(View containerView, int nodeVisualID) { - String containerModelID = org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry - .getModelID(containerView); - if (!ModelEditPart.MODEL_ID.equals(containerModelID)) { - return false; - } - int containerVisualID; - if (ModelEditPart.MODEL_ID.equals(containerModelID)) { - containerVisualID = org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry - .getVisualID(containerView); - } else { - if (containerView instanceof Diagram) { - containerVisualID = ModelEditPart.VISUAL_ID; - } else { - return false; - } - } - switch (containerVisualID) { - case ModelEditPart.VISUAL_ID: - if (ComponentEditPart.VISUAL_ID == nodeVisualID) { - return true; - } - break; - case ComponentEditPart.VISUAL_ID: - if (ComponentNameEditPart.VISUAL_ID == nodeVisualID) { - return true; - } - break; - } - return false; - } - - /** - * @generated - */ - public static int getLinkWithClassVisualID(EObject domainElement) { - if (domainElement == null) { - return -1; - } - return -1; - } - - /** - * User can change implementation of this method to handle some specific - * situations not covered by default logic. - * - * @generated - */ - private static boolean isDiagram(Model element) { - return true; - } - - /** - * @generated - */ - public static boolean checkNodeVisualID(View containerView, - EObject domainElement, int candidate) { - if (candidate == -1) { - //unrecognized id is always bad - return false; - } - int basic = getNodeVisualID(containerView, domainElement); - return basic == candidate; - } - - /** - * @generated - */ - public static boolean isCompartmentVisualID(int visualID) { - return false; - } - - /** - * @generated - */ - public static boolean isSemanticLeafVisualID(int visualID) { - switch (visualID) { - case ModelEditPart.VISUAL_ID: - return false; - case ComponentEditPart.VISUAL_ID: - return true; - default: - break; - } - return false; - } - - /** - * @generated - */ - public static final DiagramStructure TYPED_INSTANCE = new DiagramStructure() { - /** - * @generated - */ - - public int getVisualID(View view) { - return org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry - .getVisualID(view); - } - - /** - * @generated - */ - - public String getModelID(View view) { - return org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry - .getModelID(view); - } - - /** - * @generated - */ - - public int getNodeVisualID(View containerView, EObject domainElement) { - return org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry - .getNodeVisualID(containerView, domainElement); - } - - /** - * @generated - */ - - public boolean checkNodeVisualID(View containerView, - EObject domainElement, int candidate) { - return org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry - .checkNodeVisualID(containerView, domainElement, candidate); - } - - /** - * @generated - */ - - public boolean isCompartmentVisualID(int visualID) { - return org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry - .isCompartmentVisualID(visualID); - } - - /** - * @generated - */ - - public boolean isSemanticLeafVisualID(int visualID) { - return org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry - .isSemanticLeafVisualID(visualID); - } - }; - -} +package org.eclipse.papyrus.example.diagram.simplediagram.part;
+
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.example.diagram.simplediagram.edit.parts.ComponentEditPart;
+import org.eclipse.papyrus.example.diagram.simplediagram.edit.parts.ComponentNameEditPart;
+import org.eclipse.papyrus.example.diagram.simplediagram.edit.parts.ModelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.structure.DiagramStructure;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * This registry is used to determine which type of visual object should be
+ * created for the corresponding Diagram, Node, ChildNode or Link represented
+ * by a domain model object.
+ *
+ * @generated
+ */
+public class UMLVisualIDRegistry {
+
+ /**
+ * @generated
+ */
+ private static final String DEBUG_KEY = "org.eclipse.uml2.uml.diagram/debug/visualID"; //$NON-NLS-1$
+
+ /**
+ * @generated
+ */
+ public static int getVisualID(View view) {
+ if (view instanceof Diagram) {
+ if (ModelEditPart.MODEL_ID.equals(view.getType())) {
+ return ModelEditPart.VISUAL_ID;
+ } else {
+ return -1;
+ }
+ }
+ return org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry
+ .getVisualID(view.getType());
+ }
+
+ /**
+ * @generated
+ */
+ public static String getModelID(View view) {
+ View diagram = view.getDiagram();
+ while (view != diagram) {
+ EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
+ if (annotation != null) {
+ return (String) annotation.getDetails().get("modelID"); //$NON-NLS-1$
+ }
+ view = (View) view.eContainer();
+ }
+ return diagram != null ? diagram.getType() : null;
+ }
+
+ /**
+ * @generated
+ */
+ public static int getVisualID(String type) {
+ try {
+ return Integer.parseInt(type);
+ } catch (NumberFormatException e) {
+ if (Boolean.TRUE.toString().equalsIgnoreCase(
+ Platform.getDebugOption(DEBUG_KEY))) {
+ UMLDiagramEditorPlugin.getInstance().logError(
+ "Unable to parse view type as a visualID number: "
+ + type);
+ }
+ }
+ return -1;
+ }
+
+ /**
+ * @generated
+ */
+ public static String getType(int visualID) {
+ return Integer.toString(visualID);
+ }
+
+ /**
+ * @generated
+ */
+ public static int getDiagramVisualID(EObject domainElement) {
+ if (domainElement == null) {
+ return -1;
+ }
+ if (UMLPackage.eINSTANCE.getModel().isSuperTypeOf(
+ domainElement.eClass())
+ && isDiagram((Model) domainElement)) {
+ return ModelEditPart.VISUAL_ID;
+ }
+ return -1;
+ }
+
+ /**
+ * @generated
+ */
+ public static int getNodeVisualID(View containerView, EObject domainElement) {
+ if (domainElement == null) {
+ return -1;
+ }
+ String containerModelID = org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry
+ .getModelID(containerView);
+ if (!ModelEditPart.MODEL_ID.equals(containerModelID)) {
+ return -1;
+ }
+ int containerVisualID;
+ if (ModelEditPart.MODEL_ID.equals(containerModelID)) {
+ containerVisualID = org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry
+ .getVisualID(containerView);
+ } else {
+ if (containerView instanceof Diagram) {
+ containerVisualID = ModelEditPart.VISUAL_ID;
+ } else {
+ return -1;
+ }
+ }
+ switch (containerVisualID) {
+ case ModelEditPart.VISUAL_ID:
+ if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(
+ domainElement.eClass())) {
+ return ComponentEditPart.VISUAL_ID;
+ }
+ break;
+ }
+ return -1;
+ }
+
+ /**
+ * @generated
+ */
+ public static boolean canCreateNode(View containerView, int nodeVisualID) {
+ String containerModelID = org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry
+ .getModelID(containerView);
+ if (!ModelEditPart.MODEL_ID.equals(containerModelID)) {
+ return false;
+ }
+ int containerVisualID;
+ if (ModelEditPart.MODEL_ID.equals(containerModelID)) {
+ containerVisualID = org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry
+ .getVisualID(containerView);
+ } else {
+ if (containerView instanceof Diagram) {
+ containerVisualID = ModelEditPart.VISUAL_ID;
+ } else {
+ return false;
+ }
+ }
+ switch (containerVisualID) {
+ case ModelEditPart.VISUAL_ID:
+ if (ComponentEditPart.VISUAL_ID == nodeVisualID) {
+ return true;
+ }
+ break;
+ case ComponentEditPart.VISUAL_ID:
+ if (ComponentNameEditPart.VISUAL_ID == nodeVisualID) {
+ return true;
+ }
+ break;
+ }
+ return false;
+ }
+
+ /**
+ * @generated
+ */
+ public static int getLinkWithClassVisualID(EObject domainElement) {
+ if (domainElement == null) {
+ return -1;
+ }
+ return -1;
+ }
+
+ /**
+ * User can change implementation of this method to handle some specific
+ * situations not covered by default logic.
+ *
+ * @generated
+ */
+ private static boolean isDiagram(Model element) {
+ return true;
+ }
+
+ /**
+ * @generated
+ */
+ public static boolean checkNodeVisualID(View containerView,
+ EObject domainElement, int candidate) {
+ if (candidate == -1) {
+ //unrecognized id is always bad
+ return false;
+ }
+ int basic = getNodeVisualID(containerView, domainElement);
+ return basic == candidate;
+ }
+
+ /**
+ * @generated
+ */
+ public static boolean isCompartmentVisualID(int visualID) {
+ return false;
+ }
+
+ /**
+ * @generated
+ */
+ public static boolean isSemanticLeafVisualID(int visualID) {
+ switch (visualID) {
+ case ModelEditPart.VISUAL_ID:
+ return false;
+ case ComponentEditPart.VISUAL_ID:
+ return true;
+ default:
+ break;
+ }
+ return false;
+ }
+
+ /**
+ * @generated
+ */
+ public static final DiagramStructure TYPED_INSTANCE = new DiagramStructure() {
+ /**
+ * @generated
+ */
+
+ public int getVisualID(View view) {
+ return org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry
+ .getVisualID(view);
+ }
+
+ /**
+ * @generated
+ */
+
+ public String getModelID(View view) {
+ return org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry
+ .getModelID(view);
+ }
+
+ /**
+ * @generated
+ */
+
+ public int getNodeVisualID(View containerView, EObject domainElement) {
+ return org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry
+ .getNodeVisualID(containerView, domainElement);
+ }
+
+ /**
+ * @generated
+ */
+
+ public boolean checkNodeVisualID(View containerView,
+ EObject domainElement, int candidate) {
+ return org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry
+ .checkNodeVisualID(containerView, domainElement, candidate);
+ }
+
+ /**
+ * @generated
+ */
+
+ public boolean isCompartmentVisualID(int visualID) {
+ return org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry
+ .isCompartmentVisualID(visualID);
+ }
+
+ /**
+ * @generated
+ */
+
+ public boolean isSemanticLeafVisualID(int visualID) {
+ return org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry
+ .isSemanticLeafVisualID(visualID);
+ }
+ };
+
+}
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLEditPartProvider.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLEditPartProvider.java index a70e5a76e8c..dc7647a51e7 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLEditPartProvider.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLEditPartProvider.java @@ -1,21 +1,21 @@ -package org.eclipse.papyrus.example.diagram.simplediagram.providers; - -import org.eclipse.gmf.tooling.runtime.providers.DefaultEditPartProvider; -import org.eclipse.papyrus.example.diagram.simplediagram.edit.parts.ModelEditPart; -import org.eclipse.papyrus.example.diagram.simplediagram.edit.parts.UMLEditPartFactory; -import org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry; - -/** - * @generated - */ -public class UMLEditPartProvider extends DefaultEditPartProvider { - - /** - * @generated - */ - public UMLEditPartProvider() { - super(new UMLEditPartFactory(), UMLVisualIDRegistry.TYPED_INSTANCE, - ModelEditPart.MODEL_ID); - } - -} +package org.eclipse.papyrus.example.diagram.simplediagram.providers;
+
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.providers.DefaultEditPartProvider;
+import org.eclipse.papyrus.example.diagram.simplediagram.edit.parts.ModelEditPart;
+import org.eclipse.papyrus.example.diagram.simplediagram.edit.parts.UMLEditPartFactory;
+import org.eclipse.papyrus.example.diagram.simplediagram.part.UMLVisualIDRegistry;
+
+/**
+ * @generated
+ */
+public class UMLEditPartProvider extends DefaultEditPartProvider {
+
+ /**
+ * @generated
+ */
+ public UMLEditPartProvider() {
+ super(new UMLEditPartFactory(), UMLVisualIDRegistry.TYPED_INSTANCE,
+ ModelEditPart.MODEL_ID);
+ }
+
+}
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLElementTypes.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLElementTypes.java index f952f11388d..1b8c21ca8d2 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLElementTypes.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLElementTypes.java @@ -1,170 +1,170 @@ -package org.eclipse.papyrus.example.diagram.simplediagram.providers; - -import java.util.HashSet; -import java.util.IdentityHashMap; -import java.util.Map; -import java.util.Set; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.emf.ecore.ENamedElement; -import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry; -import org.eclipse.gmf.runtime.emf.type.core.IElementType; -import org.eclipse.gmf.tooling.runtime.providers.DiagramElementTypeImages; -import org.eclipse.gmf.tooling.runtime.providers.DiagramElementTypes; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.papyrus.example.diagram.simplediagram.edit.parts.ComponentEditPart; -import org.eclipse.papyrus.example.diagram.simplediagram.edit.parts.ModelEditPart; -import org.eclipse.papyrus.example.diagram.simplediagram.part.UMLDiagramEditorPlugin; -import org.eclipse.swt.graphics.Image; -import org.eclipse.uml2.uml.UMLPackage; - -/** - * @generated - */ -public class UMLElementTypes { - - /** - * @generated - */ - private UMLElementTypes() { - } - - /** - * @generated - */ - private static Map<IElementType, ENamedElement> elements; - - /** - * @generated - */ - private static DiagramElementTypeImages elementTypeImages = new DiagramElementTypeImages( - UMLDiagramEditorPlugin.getInstance() - .getItemProvidersAdapterFactory()); - - /** - * @generated - */ - private static Set<IElementType> KNOWN_ELEMENT_TYPES; - - /** - * @generated - */ - public static final IElementType Model_1000 = getElementType("org.eclipse.uml2.uml.diagram.Model_1000"); //$NON-NLS-1$ - /** - * @generated - */ - public static final IElementType Component_2001 = getElementType("org.eclipse.uml2.uml.diagram.Component_2001"); //$NON-NLS-1$ - - /** - * @generated - */ - public static ImageDescriptor getImageDescriptor(ENamedElement element) { - return elementTypeImages.getImageDescriptor(element); - } - - /** - * @generated - */ - public static Image getImage(ENamedElement element) { - return elementTypeImages.getImage(element); - } - - /** - * @generated - */ - public static ImageDescriptor getImageDescriptor(IAdaptable hint) { - return getImageDescriptor(getElement(hint)); - } - - /** - * @generated - */ - public static Image getImage(IAdaptable hint) { - return getImage(getElement(hint)); - } - - /** - * Returns 'type' of the ecore object associated with the hint. - * - * @generated - */ - public static ENamedElement getElement(IAdaptable hint) { - Object type = hint.getAdapter(IElementType.class); - if (elements == null) { - elements = new IdentityHashMap<IElementType, ENamedElement>(); - - elements.put(Model_1000, UMLPackage.eINSTANCE.getModel()); - - elements.put(Component_2001, UMLPackage.eINSTANCE.getComponent()); - } - return (ENamedElement) elements.get(type); - } - - /** - * @generated - */ - private static IElementType getElementType(String id) { - return ElementTypeRegistry.getInstance().getType(id); - } - - /** - * @generated - */ - public static boolean isKnownElementType(IElementType elementType) { - if (KNOWN_ELEMENT_TYPES == null) { - KNOWN_ELEMENT_TYPES = new HashSet<IElementType>(); - KNOWN_ELEMENT_TYPES.add(Model_1000); - KNOWN_ELEMENT_TYPES.add(Component_2001); - } - return KNOWN_ELEMENT_TYPES.contains(elementType); - } - - /** - * @generated - */ - public static IElementType getElementType(int visualID) { - switch (visualID) { - case ModelEditPart.VISUAL_ID: - return Model_1000; - case ComponentEditPart.VISUAL_ID: - return Component_2001; - } - return null; - } - - /** - * @generated - */ - public static final DiagramElementTypes TYPED_INSTANCE = new DiagramElementTypes( - elementTypeImages) { - - /** - * @generated - */ - @Override - public boolean isKnownElementType(IElementType elementType) { - return org.eclipse.papyrus.example.diagram.simplediagram.providers.UMLElementTypes - .isKnownElementType(elementType); - } - - /** - * @generated - */ - @Override - public IElementType getElementTypeForVisualId(int visualID) { - return org.eclipse.papyrus.example.diagram.simplediagram.providers.UMLElementTypes - .getElementType(visualID); - } - - /** - * @generated - */ - @Override - public ENamedElement getDefiningNamedElement( - IAdaptable elementTypeAdapter) { - return org.eclipse.papyrus.example.diagram.simplediagram.providers.UMLElementTypes - .getElement(elementTypeAdapter); - } - }; - -} +package org.eclipse.papyrus.example.diagram.simplediagram.providers;
+
+import java.util.HashSet;
+import java.util.IdentityHashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.ENamedElement;
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.providers.DiagramElementTypeImages;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.providers.DiagramElementTypes;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.papyrus.example.diagram.simplediagram.edit.parts.ComponentEditPart;
+import org.eclipse.papyrus.example.diagram.simplediagram.edit.parts.ModelEditPart;
+import org.eclipse.papyrus.example.diagram.simplediagram.part.UMLDiagramEditorPlugin;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class UMLElementTypes {
+
+ /**
+ * @generated
+ */
+ private UMLElementTypes() {
+ }
+
+ /**
+ * @generated
+ */
+ private static Map<IElementType, ENamedElement> elements;
+
+ /**
+ * @generated
+ */
+ private static DiagramElementTypeImages elementTypeImages = new DiagramElementTypeImages(
+ UMLDiagramEditorPlugin.getInstance()
+ .getItemProvidersAdapterFactory());
+
+ /**
+ * @generated
+ */
+ private static Set<IElementType> KNOWN_ELEMENT_TYPES;
+
+ /**
+ * @generated
+ */
+ public static final IElementType Model_1000 = getElementType("org.eclipse.uml2.uml.diagram.Model_1000"); //$NON-NLS-1$
+ /**
+ * @generated
+ */
+ public static final IElementType Component_2001 = getElementType("org.eclipse.uml2.uml.diagram.Component_2001"); //$NON-NLS-1$
+
+ /**
+ * @generated
+ */
+ public static ImageDescriptor getImageDescriptor(ENamedElement element) {
+ return elementTypeImages.getImageDescriptor(element);
+ }
+
+ /**
+ * @generated
+ */
+ public static Image getImage(ENamedElement element) {
+ return elementTypeImages.getImage(element);
+ }
+
+ /**
+ * @generated
+ */
+ public static ImageDescriptor getImageDescriptor(IAdaptable hint) {
+ return getImageDescriptor(getElement(hint));
+ }
+
+ /**
+ * @generated
+ */
+ public static Image getImage(IAdaptable hint) {
+ return getImage(getElement(hint));
+ }
+
+ /**
+ * Returns 'type' of the ecore object associated with the hint.
+ *
+ * @generated
+ */
+ public static ENamedElement getElement(IAdaptable hint) {
+ Object type = hint.getAdapter(IElementType.class);
+ if (elements == null) {
+ elements = new IdentityHashMap<IElementType, ENamedElement>();
+
+ elements.put(Model_1000, UMLPackage.eINSTANCE.getModel());
+
+ elements.put(Component_2001, UMLPackage.eINSTANCE.getComponent());
+ }
+ return (ENamedElement) elements.get(type);
+ }
+
+ /**
+ * @generated
+ */
+ private static IElementType getElementType(String id) {
+ return ElementTypeRegistry.getInstance().getType(id);
+ }
+
+ /**
+ * @generated
+ */
+ public static boolean isKnownElementType(IElementType elementType) {
+ if (KNOWN_ELEMENT_TYPES == null) {
+ KNOWN_ELEMENT_TYPES = new HashSet<IElementType>();
+ KNOWN_ELEMENT_TYPES.add(Model_1000);
+ KNOWN_ELEMENT_TYPES.add(Component_2001);
+ }
+ return KNOWN_ELEMENT_TYPES.contains(elementType);
+ }
+
+ /**
+ * @generated
+ */
+ public static IElementType getElementType(int visualID) {
+ switch (visualID) {
+ case ModelEditPart.VISUAL_ID:
+ return Model_1000;
+ case ComponentEditPart.VISUAL_ID:
+ return Component_2001;
+ }
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ public static final DiagramElementTypes TYPED_INSTANCE = new DiagramElementTypes(
+ elementTypeImages) {
+
+ /**
+ * @generated
+ */
+ @Override
+ public boolean isKnownElementType(IElementType elementType) {
+ return org.eclipse.papyrus.example.diagram.simplediagram.providers.UMLElementTypes
+ .isKnownElementType(elementType);
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public IElementType getElementTypeForVisualId(int visualID) {
+ return org.eclipse.papyrus.example.diagram.simplediagram.providers.UMLElementTypes
+ .getElementType(visualID);
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public ENamedElement getDefiningNamedElement(
+ IAdaptable elementTypeAdapter) {
+ return org.eclipse.papyrus.example.diagram.simplediagram.providers.UMLElementTypes
+ .getElement(elementTypeAdapter);
+ }
+ };
+
+}
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLIconProvider.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLIconProvider.java index 440684e0169..468b6e6223f 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLIconProvider.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLIconProvider.java @@ -1,19 +1,19 @@ -package org.eclipse.papyrus.example.diagram.simplediagram.providers; - -import org.eclipse.gmf.runtime.common.ui.services.icon.IIconProvider; -import org.eclipse.gmf.tooling.runtime.providers.DefaultElementTypeIconProvider; - -/** - * @generated - */ -public class UMLIconProvider extends DefaultElementTypeIconProvider implements - IIconProvider { - - /** - * @generated - */ - public UMLIconProvider() { - super(UMLElementTypes.TYPED_INSTANCE); - } - -} +package org.eclipse.papyrus.example.diagram.simplediagram.providers;
+
+import org.eclipse.gmf.runtime.common.ui.services.icon.IIconProvider;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.providers.DefaultElementTypeIconProvider;
+
+/**
+ * @generated
+ */
+public class UMLIconProvider extends DefaultElementTypeIconProvider implements
+ IIconProvider {
+
+ /**
+ * @generated
+ */
+ public UMLIconProvider() {
+ super(UMLElementTypes.TYPED_INSTANCE);
+ }
+
+}
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/sheet/UMLPropertySection.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/sheet/UMLPropertySection.java index cdcb9ef91f2..a2dfbd9a23c 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/sheet/UMLPropertySection.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/sheet/UMLPropertySection.java @@ -1,22 +1,22 @@ -package org.eclipse.papyrus.example.diagram.simplediagram.sheet; - -import org.eclipse.gmf.tooling.runtime.sheet.DefaultPropertySection; -import org.eclipse.ui.views.properties.IPropertySourceProvider; - -/** - * @generated - */ -public class UMLPropertySection extends DefaultPropertySection implements - IPropertySourceProvider { - - /** - * Modify/unwrap selection. - * @generated - */ - @Override - protected Object transformSelection(Object selected) { - selected = /*super.*/transformSelectionToDomain(selected); - return selected; - } - -} +package org.eclipse.papyrus.example.diagram.simplediagram.sheet;
+
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.sheet.DefaultPropertySection;
+import org.eclipse.ui.views.properties.IPropertySourceProvider;
+
+/**
+ * @generated
+ */
+public class UMLPropertySection extends DefaultPropertySection implements
+ IPropertySourceProvider {
+
+ /**
+ * Modify/unwrap selection.
+ * @generated
+ */
+ @Override
+ protected Object transformSelection(Object selected) {
+ selected = /*super.*/transformSelectionToDomain(selected);
+ return selected;
+ }
+
+}
diff --git a/examples/others/pom.xml b/examples/others/pom.xml index 5cd4cf3bcd1..b196288563a 100644 --- a/examples/others/pom.xml +++ b/examples/others/pom.xml @@ -10,7 +10,7 @@ <artifactId>org.eclipse.papyrus.examples.others</artifactId> <packaging>pom</packaging> <modules> - <!-- FIXME compilation error <module>org.eclipse.papyrus.example.diagram.simplediagram</module>--> + <module>org.eclipse.papyrus.example.diagram.simplediagram</module> <module>org.eclipse.papyrus.example.text.instance</module> </modules> </project>
\ No newline at end of file diff --git a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.xml b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.xml index c0e4f5d6e0d..a8133c854f5 100644 --- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.xml +++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.xml @@ -4,9 +4,12 @@ <extension point="org.eclipse.papyrus.infra.core.model"> <model - classname="org.eclipse.papyrus.example.uml.comment.editor.newresource.modelresource.TextEditorModelCommentResource"> + classname="org.eclipse.papyrus.example.uml.comment.editor.newresource.modelresource.TextEditorModelCommentResource" + description="Model for text comment" + fileExtension="comment"> </model> - </extension> + </extension> + <extension point="org.eclipse.ui.commands"> <command diff --git a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/modelresource/TextEditorModelCommentResource.java b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/modelresource/TextEditorModelCommentResource.java index 3df157f7cc5..4ca8c4beb3a 100644 --- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/modelresource/TextEditorModelCommentResource.java +++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/modelresource/TextEditorModelCommentResource.java @@ -13,12 +13,13 @@ *****************************************************************************/ package org.eclipse.papyrus.example.uml.comment.editor.newresource.modelresource; +import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.papyrus.example.text.instance.papyrustextinstance.PapyrusTextInstance; import org.eclipse.papyrus.infra.core.resource.AbstractDynamicModel; import org.eclipse.papyrus.infra.core.resource.IModel; - public class TextEditorModelCommentResource extends AbstractDynamicModel<PapyrusTextInstance> implements IModel { /** @@ -31,7 +32,6 @@ public class TextEditorModelCommentResource extends AbstractDynamicModel<Papyrus */ public static final String MODEL_ID = "org.eclipse.papyrus.example.text.TextEditorModelCommentResource"; //$NON-NLS-1$ - /** * * Constructor. @@ -41,7 +41,6 @@ public class TextEditorModelCommentResource extends AbstractDynamicModel<Papyrus } - /** * Get the file extension used for this model. * @@ -66,12 +65,11 @@ public class TextEditorModelCommentResource extends AbstractDynamicModel<Papyrus return MODEL_ID; } - /** * Add a new initialized {@link PapyrusEMFCompareInstance} to the model. * * @param compareInstance - * The compareInstance to add. + * The compareInstance to add. */ public void addPapyrusTextInstance(PapyrusTextInstance compareInstance) { addModelRoot(compareInstance); @@ -81,22 +79,37 @@ public class TextEditorModelCommentResource extends AbstractDynamicModel<Papyrus * Add a new initialized {@link PapyrusEMFCompareInstance} to the model. * * @param compareInstance - * The compareInstance to add. + * The compareInstance to add. */ public void removePapyrusTextInstance(PapyrusTextInstance compareInstance) { getResource().getContents().remove(compareInstance); } + @Override + public void loadModel(URI uriWithoutExtension) { + // It is a common use case that this resource does not (and will not) + // exist + if (exists(uriWithoutExtension)) { + try { + super.loadModel(uriWithoutExtension); + } catch (Exception ex) { + createModel(uriWithoutExtension); + } + } + + if (resource == null) { + createModel(uriWithoutExtension); + } + } public boolean canPersist(EObject object) { // TODO Auto-generated method stub return false; } - public void persist(EObject object) { // TODO Auto-generated method stub - + } } diff --git a/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/plugin.xml b/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/plugin.xml index 0f8a2a9bc29..dad31a0a2bd 100644 --- a/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/plugin.xml +++ b/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/plugin.xml @@ -9,7 +9,7 @@ </configuration> </extension> <extension - point="org.eclipse.papyrus.views.properties.context"> + point="org.eclipse.papyrus.infra.properties.contexts"> <context contextModel="model/UML/PropertyViewEditorsExample.ctx" isCustomizable="true"> diff --git a/examples/uml/pom.xml b/examples/uml/pom.xml index b44e51210b6..a188de52b90 100644 --- a/examples/uml/pom.xml +++ b/examples/uml/pom.xml @@ -15,6 +15,6 @@ <module>org.eclipse.papyrus.uml.diagram.emftree</module> <module>org.eclipse.papyrus.thousandcreation</module> <module>org.eclipse.papyrus.uml.diagram.example.programmaticcreation</module> - <!-- module>org.eclipse.papyrus.uml.textual.editors.example</module--> + <module>org.eclipse.papyrus.uml.textual.editors.example</module> </modules> </project>
\ No newline at end of file |