diff options
author | Vincent Lorenzo | 2022-05-12 14:22:45 +0000 |
---|---|---|
committer | Vincent Lorenzo | 2022-05-20 10:40:44 +0000 |
commit | 8267bf8607003e74a329644c5043ddef69b6e09d (patch) | |
tree | dfe30b46f74631aea0a9856dab8ac023932c7b22 | |
parent | 198e6dab16d19ad9fa7ba6492b720bf4d1bee0b8 (diff) | |
download | org.eclipse.papyrus-8267bf8607003e74a329644c5043ddef69b6e09d.tar.gz org.eclipse.papyrus-8267bf8607003e74a329644c5043ddef69b6e09d.tar.xz org.eclipse.papyrus-8267bf8607003e74a329644c5043ddef69b6e09d.zip |
Bug 579917: [Matrix][Expression] The dialog used to edit Stereotype expression filter doesn't work
Change-Id: Ie30ddbe6bbc6addd44e612430b4f0d91af2e52a2
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
3 files changed, 5 insertions, 11 deletions
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF index 4dbfec6ec0e..913bcc780f6 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF @@ -62,7 +62,7 @@ Require-Bundle: org.eclipse.core.databinding.property;bundle-version="[1.8.0,2.0 org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="5.0.0" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy;exclude:=org.eclipse.papyrus.uml.properties.constraints -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.1.100.qualifier Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml index 9e15e10cd3e..29e55786f50 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.properties</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeExplorerDialog.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeExplorerDialog.java index ced746e8592..f5283b615b1 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeExplorerDialog.java +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeExplorerDialog.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2016 CEA LIST. + * Copyright (c) 2016, 2022 CEA LIST. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,6 +10,7 @@ * * Contributors: * Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation + * Vincent LORENZO (CEA-LIST) vincent.lorenzo@cea.fr - Bug 579917 *****************************************************************************/ package org.eclipse.papyrus.uml.properties.widgets; @@ -251,14 +252,7 @@ public class StereotypeExplorerDialog extends SelectionStatusDialog { if (element instanceof String) { styledString.setStyle(0, text.length(), StyledString.COUNTER_STYLER); - } else if (element instanceof IRegisteredProfile) { - URI uri = resourceSet.getURIConverter().normalize(((IRegisteredProfile) element).getUri()).trimFragment(); - String path = new StringBuilder(" - ")//$NON-NLS-1$ - .append(uri.toPlatformString(true).substring(1)) - .toString(); - styledString.append(path, StyledString.QUALIFIER_STYLER); - - } else if (element instanceof Profile) { + }else if (element instanceof Profile) { URI uri = EcoreUtil.getURI((EObject) element).trimFragment(); String path = new StringBuilder(" - ")//$NON-NLS-1$ .append(uri.toPlatformString(true).substring(1)).toString(); |