Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2014-01-31 16:48:50 +0000
committerCamille Letavernier2014-01-31 16:48:50 +0000
commite45e052299ee75d99747d376642360573a319d60 (patch)
tree48fcdadb5cd3512b821bdb6b5c33e673bf6a62f9
parent5f7a614369ca4ed6a79d251de29af0ed938b1bef (diff)
downloadorg.eclipse.papyrus-e45e052299ee75d99747d376642360573a319d60.tar.gz
org.eclipse.papyrus-e45e052299ee75d99747d376642360573a319d60.tar.xz
org.eclipse.papyrus-e45e052299ee75d99747d376642360573a319d60.zip
417396: [CSS] The CSS Engine shall support label visibility & mask
https://bugs.eclipse.org/bugs/show_bug.cgi?id=417396 - Removed references to the deprecated IMaskLabelProvider
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml17
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml20
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/MessageLabelHelper.java5
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/LifelineLabelMaskProviderAdapterFactory.java43
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/MessageLabelMaskProviderAdapterFactory.java43
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineLabelHelper.java13
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml21
7 files changed, 9 insertions, 153 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml
index a01ece06557..a4157991ec8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml
@@ -3042,22 +3042,5 @@
</Priority>
</editpolicyProvider>
</extension>
-<extension
- point="org.eclipse.core.runtime.adapters">
- <factory
- adaptableType="org.eclipse.uml2.uml.InstanceSpecification"
- class="org.eclipse.papyrus.uml.diagram.clazz.custom.providers.InstanceSpecificationLabelMaskProviderAdapterFactory">
- <adapter
- type="org.eclipse.papyrus.infra.emf.appearance.style.ILabelMaskProvider">
- </adapter>
- </factory>
- <factory
- adaptableType="org.eclipse.gmf.runtime.notation.View"
- class="org.eclipse.papyrus.uml.diagram.clazz.custom.providers.AssociationLabelMaskProviderAdapterFactory">
- <adapter
- type="org.eclipse.papyrus.infra.emf.appearance.style.ILabelMaskProvider">
- </adapter>
- </factory>
-</extension>
</plugin>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml
index 4a08855fc40..c1bacb38cf1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml
@@ -2352,25 +2352,7 @@
<editor id="org.eclipse.papyrus.uml.diagram.composite"/>
</paletteProvider>
- </extension>
-<extension
- point="org.eclipse.core.runtime.adapters">
- <factory
- adaptableType="org.eclipse.uml2.uml.Parameter"
- class="org.eclipse.papyrus.uml.diagram.composite.custom.providers.ParameterLabelMaskProviderAdapterFactory">
- <adapter
- type="org.eclipse.papyrus.infra.emf.appearance.style.ILabelMaskProvider">
- </adapter>
- </factory>
- <factory
- adaptableType="org.eclipse.uml2.uml.CollaborationUse"
- class="org.eclipse.papyrus.uml.diagram.composite.custom.providers.CollaborationUseLabelMaskProviderAdapterFactory">
- <adapter
- type="org.eclipse.papyrus.infra.emf.appearance.style.ILabelMaskProvider">
- </adapter>
- </factory>
-
-</extension>
+ </extension>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/MessageLabelHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/MessageLabelHelper.java
index ee5dfdc5c1f..082c388a10b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/MessageLabelHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/MessageLabelHelper.java
@@ -10,7 +10,6 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.emf.appearance.style.ILabelMaskProvider;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
import org.eclipse.papyrus.infra.tools.util.StringHelper;
import org.eclipse.papyrus.uml.diagram.common.helper.StereotypedElementLabelHelper;
@@ -26,7 +25,7 @@ import org.eclipse.uml2.uml.Operation;
import org.eclipse.uml2.uml.Signal;
import org.eclipse.uml2.uml.ValueSpecification;
-public class MessageLabelHelper extends StereotypedElementLabelHelper implements ILabelMaskProvider {
+public class MessageLabelHelper extends StereotypedElementLabelHelper {
/**
* singelton instance
@@ -48,7 +47,7 @@ public class MessageLabelHelper extends StereotypedElementLabelHelper implements
masks.put(ICustomAppearence.DISP_PARAMETER_DEFAULT, "Parameters Default Value");
masks.put(ICustomAppearence.DISP_DERIVE, "Parameters Value");
masks.put(ICustomAppearence.DISP_PARAMETER_MODIFIERS, "Parameters Modifiers");
- masks.put(ICustomAppearence.DISP_MOFIFIERS, "Modifiers");
+ masks.put(ICustomAppearence.DISP_MODIFIERS, "Modifiers");
}
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/LifelineLabelMaskProviderAdapterFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/LifelineLabelMaskProviderAdapterFactory.java
deleted file mode 100644
index 010b87f12e5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/LifelineLabelMaskProviderAdapterFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.sequence.providers;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.papyrus.infra.emf.appearance.style.ILabelMaskProvider;
-import org.eclipse.papyrus.uml.diagram.sequence.util.LifelineLabelHelper;
-import org.eclipse.uml2.uml.Lifeline;
-
-/**
- * An IAdapterFactory for retrieving the {@link ILabelMaskProvider} from a UML
- * Lifeline
- *
- * @author Camille Letavernier
- *
- */
-public class LifelineLabelMaskProviderAdapterFactory implements IAdapterFactory {
-
- @Override
- public ILabelMaskProvider getAdapter(Object adaptableObject, Class adapterType) {
- if(adapterType == ILabelMaskProvider.class) {
- if(adaptableObject instanceof Lifeline) {
- return LifelineLabelHelper.getInstance();
- }
- }
- return null;
- }
-
- @Override
- public Class<?>[] getAdapterList() {
- return new Class[]{ ILabelMaskProvider.class };
- }
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/MessageLabelMaskProviderAdapterFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/MessageLabelMaskProviderAdapterFactory.java
deleted file mode 100644
index 7c14fa98233..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/MessageLabelMaskProviderAdapterFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.sequence.providers;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.papyrus.infra.emf.appearance.style.ILabelMaskProvider;
-import org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.MessageLabelHelper;
-import org.eclipse.uml2.uml.Message;
-
-/**
- * An IAdapterFactory for retrieving the {@link ILabelMaskProvider} from a UML
- * Message
- *
- * @author Camille Letavernier
- *
- */
-public class MessageLabelMaskProviderAdapterFactory implements IAdapterFactory {
-
- @Override
- public ILabelMaskProvider getAdapter(Object adaptableObject, Class adapterType) {
- if(adapterType == ILabelMaskProvider.class) {
- if(adaptableObject instanceof Message) {
- return MessageLabelHelper.getInstance();
- }
- }
- return null;
- }
-
- @Override
- public Class<?>[] getAdapterList() {
- return new Class[]{ ILabelMaskProvider.class };
- }
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineLabelHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineLabelHelper.java
index a7cd8eaafd6..d104888d8e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineLabelHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineLabelHelper.java
@@ -7,7 +7,6 @@ import java.util.Set;
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.emf.appearance.style.ILabelMaskProvider;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.helper.StereotypedElementLabelHelper;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineNameEditPart;
@@ -16,7 +15,7 @@ import org.eclipse.uml2.uml.ConnectableElement;
import org.eclipse.uml2.uml.Lifeline;
import org.eclipse.uml2.uml.Type;
-public class LifelineLabelHelper extends StereotypedElementLabelHelper implements ILabelMaskProvider {
+public class LifelineLabelHelper extends StereotypedElementLabelHelper {
/**
* singelton instance
@@ -25,7 +24,7 @@ public class LifelineLabelHelper extends StereotypedElementLabelHelper implement
/**
* Returns the singleton instance of this class
- *
+ *
* @return the singleton instance.
*/
public static LifelineLabelHelper getInstance() {
@@ -51,7 +50,7 @@ public class LifelineLabelHelper extends StereotypedElementLabelHelper implement
/**
* Returns the mask name given the value of the mask
- *
+ *
* @return the mask name or <code>null</code> if no masks has been found
*/
public String getMaskLabel(int value) {
@@ -60,7 +59,7 @@ public class LifelineLabelHelper extends StereotypedElementLabelHelper implement
/**
* Returns the collection of mask names
- *
+ *
* @return the collection of mask names
*/
public Collection<String> getMaskLabels() {
@@ -69,7 +68,7 @@ public class LifelineLabelHelper extends StereotypedElementLabelHelper implement
/**
* Returns the map of masks used to display
- *
+ *
* @return the map of masks used to display
*/
@Override
@@ -79,7 +78,7 @@ public class LifelineLabelHelper extends StereotypedElementLabelHelper implement
/**
* Returns the collection of mask values
- *
+ *
* @return the collection of mask values
*/
public Set<Integer> getMaskValues() {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml
index 487a6f5c26e..a2bdcabeba7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml
@@ -782,9 +782,6 @@
defaultHandler="org.eclipse.papyrus.uml.diagram.sequence.part.LoadResourceAction"/>
</extension>
- <extension point="org.eclipse.ui.handlers" id="menu-handlers">
- <?gmfgen generated="true"?>
- </extension>
<extension point="org.eclipse.ui.preferencePages" id="prefpages">
<?gmfgen generated="true"?>
@@ -2055,24 +2052,6 @@
</dynamic>
</menuContribution>
</extension>
-<extension
- point="org.eclipse.core.runtime.adapters">
- <factory
- adaptableType="org.eclipse.uml2.uml.Message"
- class="org.eclipse.papyrus.uml.diagram.sequence.providers.MessageLabelMaskProviderAdapterFactory">
- <adapter
- type="org.eclipse.papyrus.infra.emf.appearance.style.ILabelMaskProvider">
- </adapter>
- </factory>
- <factory
- adaptableType="org.eclipse.uml2.uml.Lifeline"
- class="org.eclipse.papyrus.uml.diagram.sequence.providers.LifelineLabelMaskProviderAdapterFactory">
- <adapter
- type="org.eclipse.papyrus.infra.emf.appearance.style.ILabelMaskProvider">
- </adapter>
- </factory>
-
-</extension>

Back to the top