diff options
| author | Camille Letavernier | 2014-03-07 16:45:19 +0000 |
|---|---|---|
| committer | Camille Letavernier | 2014-03-07 16:45:19 +0000 |
| commit | 2029d305ac0457f9de0c79eeadf5865bc90d1e89 (patch) | |
| tree | 332e2dc303c507d6a50c7537483c89c5e36a3ee2 /plugins/uml/org.eclipse.papyrus.uml.services.decoration | |
| parent | 2e78449cd38c9307bd45e114fcb8bd28b98f8dd2 (diff) | |
| parent | 8812639e3fcf949d67e43f9a53182ff241c329a5 (diff) | |
| download | org.eclipse.papyrus-2029d305ac0457f9de0c79eeadf5865bc90d1e89.tar.gz org.eclipse.papyrus-2029d305ac0457f9de0c79eeadf5865bc90d1e89.tar.xz org.eclipse.papyrus-2029d305ac0457f9de0c79eeadf5865bc90d1e89.zip | |
Merge remote-tracking branch 'eclipse/master' into 386118-emf-facet
Conflicts:
plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.querySet
plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/TableLabelProvider.java
plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorLookForEditorShell.java
plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysMLDefaultExplorerCustomization.uiCustom
plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysMLDefaultExplorerQueries.querySet
plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/PapyrusBrowserQuery.querySet
plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/PapyrusUMLFacet.facetSet
plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/SimpleUML.uiCustom
plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/UMLPapyrusDefaultBrowserCustomization.uiCustom
Diffstat (limited to 'plugins/uml/org.eclipse.papyrus.uml.services.decoration')
| -rw-r--r-- | plugins/uml/org.eclipse.papyrus.uml.services.decoration/src/org/eclipse/papyrus/uml/services/decoration/UMLDecorationService.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.uml.services.decoration/src/org/eclipse/papyrus/uml/services/decoration/UMLDecorationService.java b/plugins/uml/org.eclipse.papyrus.uml.services.decoration/src/org/eclipse/papyrus/uml/services/decoration/UMLDecorationService.java index da1fa33719a..d9b427a33a1 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.services.decoration/src/org/eclipse/papyrus/uml/services/decoration/UMLDecorationService.java +++ b/plugins/uml/org.eclipse.papyrus.uml.services.decoration/src/org/eclipse/papyrus/uml/services/decoration/UMLDecorationService.java @@ -8,7 +8,8 @@ * http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * Patrick Tessier (CEA LIST)- initial implementation
+ * Patrick Tessier (CEA LIST) - initial implementation
+ * Ansgar Radermacher (CEA List) - refactored stereotype handling, support for qualified name
*****************************************************************************/
package org.eclipse.papyrus.uml.services.decoration;
@@ -17,14 +18,13 @@ import org.eclipse.uml2.uml.NamedElement; /**
- * overload the Generic decoration service to take in account validation on stereotyped element
+ * Providing qualified name in the tool-tip message shown in the model explorer
*
- * CAVEAT: this class is currently unused, since the validation mechanism already replaces a stereotype application
- * by its base element (see org.eclipse.papyurs.uml.service.validation.StereotypeValidatorAdaptor)
+ * Originally, this class was intended for stereotypes, now the handling of stereotypes is done in
+ * @see org.eclipse.papyrus.uml.service.validation.UMLDiagnostician.
*/
-
public class UMLDecorationService extends DecorationService {
-
+
/**
* Initial message for UML elements
* @return the qualified name of the element, if it is a named element
|