diff options
| author | Florian Noyrit | 2016-08-09 10:25:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2016-08-28 15:46:41 +0000 |
| commit | 7310db0b3b2e8ee805fedf4bfd16baf438c89332 (patch) | |
| tree | 3dadff6a067e8d8bcbf837d8277dfac7749aef27 /plugins/uml/properties | |
| parent | 7851474fe5f33de156c797942945a3e9c97cb0a8 (diff) | |
| download | org.eclipse.papyrus-7310db0b3b2e8ee805fedf4bfd16baf438c89332.tar.gz org.eclipse.papyrus-7310db0b3b2e8ee805fedf4bfd16baf438c89332.tar.xz org.eclipse.papyrus-7310db0b3b2e8ee805fedf4bfd16baf438c89332.zip | |
Bug 443799 - Fix potential bugs identified by FindBugs in oep.infra.*
Bug 499554 - Oxygen release version number moved to 3.0.0.
Change-Id: I8e112db7175a5b89eb9b37973639627a6c29e007
Diffstat (limited to 'plugins/uml/properties')
3 files changed, 11 insertions, 11 deletions
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF index c0b40b51116..dc6ca85277e 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Require-Bundle: org.eclipse.papyrus.uml.properties;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.3.0,2.0.0)", - org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui;bundle-version="[1.2.0,2.0.0)" + org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier 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 65faa42eb6f..0f1f7cbecad 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 @@ -17,19 +17,19 @@ Export-Package: org.eclipse.papyrus.uml.properties.constraints, org.eclipse.papyrus.uml.properties.profile.ui.views, org.eclipse.papyrus.uml.properties.util, org.eclipse.papyrus.uml.properties.widgets -Require-Bundle: org.eclipse.papyrus.uml.profile;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.uml.tools.utils;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, +Require-Bundle: org.eclipse.papyrus.uml.profile;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.emf.appearance;bundle-version="[1.2.0,2.0.0)", org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.uml.diagram.common;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, - org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.emf.nattable;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf.nattable;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.uml.nattable.stereotype.display;bundle-version="[2.0.0,3.0.0)", org.eclipse.nebula.widgets.richtext;bundle-version="[1.0.0,2.0.0)", org.eclipse.papyrus.uml.ui;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.infra.nattable;bundle-version="[2.0.0,3.0.0)" + org.eclipse.papyrus.infra.nattable;bundle-version="[3.0.0,4.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.uml.properties.constraints" Bundle-Version: 3.0.0.qualifier diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/ExpressionLanguageEditor.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/ExpressionLanguageEditor.java index 92e391f69f7..03592e7a68e 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/ExpressionLanguageEditor.java +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/ExpressionLanguageEditor.java @@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Composite; *
* @author Camille Letavernier
*/
-public class ExpressionLanguageEditor extends MultipleValueEditor {
+public class ExpressionLanguageEditor extends MultipleValueEditor<LanguageSelector> {
/**
*
|