269492: [All Diagrams] Display properties of a applied stereotypes as a " comment"

https://bugs.eclipse.org/bugs/show_bug.cgi?id=269492

3 files changed, 1 insertions, 200 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/providers/CustomEditPolicyProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/providers/CustomEditPolicyProvider.java
deleted file mode 100644
index fb7b0792c1b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/providers/CustomEditPolicyProvider.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.component.custom.providers;

-

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.common.core.service.IProviderChangeListener;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;

-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeCompartmentEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

-

-/**

- * this is an editpolicy provider in charge to install a policy to navigate between diagrams and elements

- * 

- */

-public class CustomEditPolicyProvider implements IEditPolicyProvider {

-

-	/**

-	 * 

-	 * {@inheritDoc}

-	 */

-	public void addProviderChangeListener(IProviderChangeListener listener) {

-

-	}

-

-	/**

-	 * 

-	 * {@inheritDoc}

-	 */

-	public void createEditPolicies(EditPart editPart) {

-		if(editPart instanceof NamedElementEditPart) {

-			editPart.installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeCompartmentEditPolicy());

-		}

-	}

-

-	/**

-	 * 

-	 * {@inheritDoc}

-	 */

-	public boolean provides(IOperation operation) {

-		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation)operation;

-		if(!(epOperation.getEditPart() instanceof GraphicalEditPart)) {

-			return false;

-		}

-		GraphicalEditPart gep = (GraphicalEditPart)epOperation.getEditPart();

-		String diagramType = gep.getNotationView().getDiagram().getType();

-		if(ComponentDiagramEditPart.MODEL_ID.equals(diagramType)) {

-			return true;

-		}

-

-

-		return false;

-	}

-

-	/**

-	 * 

-	 * {@inheritDoc}

-	 */

-	public void removeProviderChangeListener(IProviderChangeListener listener) {

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/providers/StereotypePropertiesEditPartProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/providers/StereotypePropertiesEditPartProvider.java
deleted file mode 100644
index 0dcf424ebb0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/providers/StereotypePropertiesEditPartProvider.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.component.custom.providers;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;

-import org.eclipse.gmf.runtime.notation.Edge;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.providers.RestrictedAbstractEditPartProvider;

-import org.eclipse.papyrus.uml.diagram.common.editparts.AppliedStereotypeConpartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editparts.AppliedStereotypeMultilinePropertyEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editparts.AppliedStereotypePropertyEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

-

-/**

- * this class is a provider to allow edition of properties of stereotypes

- *

- */

-public class StereotypePropertiesEditPartProvider extends RestrictedAbstractEditPartProvider {

-

-	/** Map containing node view types supported by this provider */

-	protected Map<String, Class<?>> nodeMap = new HashMap<String, Class<?>>();

-

-	/** Map containing edge view types supported by this provider */

-	protected Map<String, Class<?>> edgeMap = new HashMap<String, Class<?>>();

-

-	/** Default constructor */

-	public StereotypePropertiesEditPartProvider() {

-		super();

-

-		diagramType = ComponentDiagramEditPart.MODEL_ID;

-

-		

-		nodeMap.put(AppliedStereotypeConpartmentEditPart.ID, AppliedStereotypeConpartmentEditPart.class);

-		nodeMap.put(AppliedStereotypePropertyEditPart.ID, AppliedStereotypeMultilinePropertyEditPart.class);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean provides(IOperation operation) {

-		if(operation instanceof CreateGraphicEditPartOperation) {

-			View newView = ((IEditPartOperation)operation).getView();

-			if(newView == null) {

-				return false;

-			}

-

-			String graphicalType = newView.getType();

-

-			if((newView instanceof Node) && (!nodeMap.containsKey(graphicalType))) {

-				return false;

-			}

-

-			if((newView instanceof Edge) && (!edgeMap.containsKey(graphicalType))) {

-				return false;

-			}

-		}

-

-		return super.provides(operation);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Class<?> getNodeEditPartClass(View view) {

-		return nodeMap.get(view.getType());

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Class<?> getEdgeEditPartClass(View view) {

-		return edgeMap.get(view.getType());

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
index 12943aa8493..e2d52e06da4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
@@ -1104,16 +1104,7 @@
 
 

 

-   <!-- optionally, specify keybindings -->

-<extension

-      point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">

-   <editpolicyProvider

-         class="org.eclipse.papyrus.uml.diagram.component.custom.providers.CustomEditPolicyProvider">

-      <Priority

-            name="Lowest">

-      </Priority>

-   </editpolicyProvider>

-</extension>

+   <!-- optionally, specify keybindings -->
 <extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">

       <?gmfgen generated="true"?>

       <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.component.providers.UMLMarkerNavigationProvider">

@@ -1135,24 +1126,6 @@
          <context decoratorTargets="PRIMARY_VIEW"/>

       </decoratorProvider>

    </extension>

-               <extension

-                     id="stereotype-ep-provider"

-                     point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">

-                  <editpartProvider

-                        class="org.eclipse.papyrus.uml.diagram.component.custom.providers.StereotypePropertiesEditPartProvider">

-                     <Priority

-                           name="Medium">

-                     </Priority>

-                     <object

-                           class="org.eclipse.gmf.runtime.notation.Node(org.eclipse.gmf.runtime.notation)"

-                           id="org.eclipse.papyrus.uml.diagram.clazz.editpart.AppliedStereotypeContainer">

-                        <method

-                              name="getType()"

-                              value="AppliedStereotypeContainer,AppliedStereotypeProperty">

-                        </method>

-                     </object>

-                  </editpartProvider>

-               </extension>

 

 

 </plugin>