diff options
17 files changed, 18 insertions, 24 deletions
diff --git a/examples/emf/org.eclipse.papyrus.outline.emftree/plugin.properties b/examples/emf/org.eclipse.papyrus.outline.emftree/plugin.properties index cb3f34c3656..8ac2a9387c3 100644 --- a/examples/emf/org.eclipse.papyrus.outline.emftree/plugin.properties +++ b/examples/emf/org.eclipse.papyrus.outline.emftree/plugin.properties @@ -8,5 +8,5 @@ # * Contributors: # * CEA LIST - initial API and implementation ############################################################################### -pluginName=Papyrus Outline Example (Incubation) +pluginName=Papyrus Outline Example providerName=Eclipse Modeling Project diff --git a/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/OSGI-INF/l10n/bundle.properties b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/OSGI-INF/l10n/bundle.properties index 9f729b6ea46..2f600a24545 100644 --- a/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/OSGI-INF/l10n/bundle.properties +++ b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/OSGI-INF/l10n/bundle.properties @@ -1,3 +1,3 @@ #Properties file for org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences Bundle-Vendor = Eclipse Modeling Project -Bundle-Name = ConnectionPoint Preferences Example (Incubation)
\ No newline at end of file +Bundle-Name = ConnectionPoint Preferences Example
\ No newline at end of file diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/plugin.properties b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/plugin.properties index 85d1bf5633c..628aed40ebf 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/plugin.properties +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/plugin.properties @@ -1,4 +1,4 @@ -pluginName=Papyrus New Diagram (Incubation) +pluginName=Papyrus New Diagram providerName=Eclipse Modeling Project editorName=PapyrusNewDiagram Diagram Editing context.description=PapyrusNewDiagram Diagram Editing diff --git a/examples/others/org.eclipse.papyrus.example.text.instance/plugin.properties b/examples/others/org.eclipse.papyrus.example.text.instance/plugin.properties index 1036a1530bc..8afb3442b09 100644 --- a/examples/others/org.eclipse.papyrus.example.text.instance/plugin.properties +++ b/examples/others/org.eclipse.papyrus.example.text.instance/plugin.properties @@ -9,7 +9,7 @@ # Vincent Lorenzo (CEA-LIST) vincent.lorenzo@cea.fr - Initial API and implementation # -pluginName = Papyrus Text Editor Example (Incubation) +pluginName = Papyrus Text Editor Example providerName = Eclipse Modeling Project pluginDescription=This plugin provides the content model for the papyrus text editor
\ No newline at end of file diff --git a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.properties b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.properties index 3c206cb810b..b3c9a434cde 100644 --- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.properties +++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.properties @@ -10,6 +10,6 @@ ##################################################################################) Bundle-Description=This plugin provides a editor for uml.Comment. The informations are stored in a new file : .comment -Bundle-Name=Papyrus Comment New Resource Editor Example (Incubation) +Bundle-Name=Papyrus Comment New Resource Editor Example Bundle-Vendor=Eclipse Modeling Project diff --git a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.properties b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.properties index 4fd9cd404f6..5bbd8f51154 100644 --- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.properties +++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.properties @@ -10,5 +10,5 @@ ##################################################################################) Bundle-Description=This plugin provides a editor for uml.Comment. The informations are stored in the .notation -Bundle-Name=Papyrus Comment Shared Resource Editor Example (Incubation) +Bundle-Name=Papyrus Comment Shared Resource Editor Example Bundle-Vendor=Eclipse Modeling Project
\ No newline at end of file diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.debug.feature/feature.xml b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.debug.feature/feature.xml index 1d50d366f41..5b992979c86 100644 --- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.debug.feature/feature.xml +++ b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.debug.feature/feature.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="org.eclipse.papyrus.debug.feature" - label="Papyrus Debug Tools (Incubation)" + label="Papyrus Debug Tools" version="1.0.0.qualifier" provider-name="Eclipse Modeling Project"> diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.diagramgen.feature/feature.xml b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.diagramgen.feature/feature.xml index 454625926c5..b3ff26a0d6a 100755 --- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.diagramgen.feature/feature.xml +++ b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.diagramgen.feature/feature.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="org.eclipse.papyrus.diagramgen.feature" - label="Papyrus Diagram Generation Tools (Incubation)" + label="Papyrus Diagram Generation Tools" version="1.0.0.qualifier" provider-name="Eclipse Modeling Project"> diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.junit.feature/feature.xml b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.junit.feature/feature.xml index a52b133e01b..5039450d5e2 100644 --- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.junit.feature/feature.xml +++ b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.junit.feature/feature.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="org.eclipse.papyrus.junit.feature" - label="Papyrus JUnit Framework (Incubation)" + label="Papyrus JUnit Framework" version="1.0.0.qualifier"> <description url="https://eclipse.org/papyrus/"> diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.releng.feature/feature.xml b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.releng.feature/feature.xml index a3e23a38062..9dd65de277a 100755 --- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.releng.feature/feature.xml +++ b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.releng.feature/feature.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="org.eclipse.papyrus.releng.feature" - label="Papyrus Releng Tools (Incubation)" + label="Papyrus Releng Tools" version="1.0.0.qualifier" provider-name="Eclipse Modeling Project"> diff --git a/features/papyrus.user.examples-features/org.eclipse.papyrus.user.examples.feature/feature.xml b/features/papyrus.user.examples-features/org.eclipse.papyrus.user.examples.feature/feature.xml index f2520b054d2..e361105d81c 100644 --- a/features/papyrus.user.examples-features/org.eclipse.papyrus.user.examples.feature/feature.xml +++ b/features/papyrus.user.examples-features/org.eclipse.papyrus.user.examples.feature/feature.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="org.eclipse.papyrus.user.examples.feature" - label="Papyrus User Examples (Incubation)" + label="Papyrus User Examples" version="0.0.1.qualifier" provider-name="Eclipse Modeling Project"> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.doc/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.doc/META-INF/MANIFEST.MF index 77332dba7a4..cbedaebe4f8 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.doc/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.doc/META-INF/MANIFEST.MF @@ -3,6 +3,6 @@ Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)" Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier -Bundle-Name: Papyrus EMF Facet EMF Utils Documentation (Incubation) +Bundle-Name: Papyrus EMF Facet EMF Utils Documentation Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.emf.doc;singleton:=true diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/adapter/GMFMultiDiagramAdapterFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/adapter/GMFMultiDiagramAdapterFactory.java index b436cc693ec..d13f8e9b021 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/adapter/GMFMultiDiagramAdapterFactory.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/adapter/GMFMultiDiagramAdapterFactory.java @@ -29,21 +29,21 @@ public class GMFMultiDiagramAdapterFactory implements IAdapterFactory { IEditorPart nestedEditor = ((IMultiDiagramEditor) adaptableObject).getActiveEditor(); // The nestedEditor may or may not handle these cases. - if (nestedEditor != null && nestedEditor instanceof IAdaptable) { + if (nestedEditor instanceof IAdaptable) { if (adapterType == IDiagramGraphicalViewer.class) { - return ((IAdaptable) nestedEditor).getAdapter(IDiagramGraphicalViewer.class); + return nestedEditor.getAdapter(IDiagramGraphicalViewer.class); } if (adapterType == Diagram.class) { - return ((IAdaptable) nestedEditor).getAdapter(Diagram.class); + return nestedEditor.getAdapter(Diagram.class); } if (adapterType == DiagramEditPart.class) { - return ((IAdaptable) nestedEditor).getAdapter(DiagramEditPart.class); + return nestedEditor.getAdapter(DiagramEditPart.class); } if (adapterType == IDiagramWorkbenchPart.class) { - return ((IAdaptable) nestedEditor).getAdapter(IDiagramWorkbenchPart.class); + return nestedEditor.getAdapter(IDiagramWorkbenchPart.class); } } } diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AbstractCustomStyleListValueCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AbstractCustomStyleListValueCommand.java index 10b3216b133..992d03eb392 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AbstractCustomStyleListValueCommand.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AbstractCustomStyleListValueCommand.java @@ -81,8 +81,6 @@ public abstract class AbstractCustomStyleListValueCommand extends AbstractComman } command = createCommand(); - - // return true; return command.canExecute(); } diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/OSGI-INF/l10n/bundle.properties b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/OSGI-INF/l10n/bundle.properties index 0c4249d2390..81c257f89ad 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/OSGI-INF/l10n/bundle.properties +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/OSGI-INF/l10n/bundle.properties @@ -1,3 +1,3 @@ #Properties file for org.eclipse.papyrus.dev.project.managment Bundle-Vendor = Eclipse Modeling Project -Bundle-Name = Papyrus Project Management (Incubation) +Bundle-Name = Papyrus Project Management diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/pom.xml b/tests/junit/plugins/infra/gmfdiag/assistant/pom.xml index adbb5a7c69b..31c6ae3d08b 100755 --- a/tests/junit/plugins/infra/gmfdiag/assistant/pom.xml +++ b/tests/junit/plugins/infra/gmfdiag/assistant/pom.xml @@ -8,9 +8,7 @@ <artifactId>org.eclipse.papyrus.infra.gmfdiag.tests.releng</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.gmfdiag.assistant.tests.releng</artifactId> - <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <description>Tests for infra gmfdiag assistant</description> diff --git a/tests/junit/plugins/infra/gmfdiag/pom.xml b/tests/junit/plugins/infra/gmfdiag/pom.xml index 87de5ca7104..36eb53be715 100755 --- a/tests/junit/plugins/infra/gmfdiag/pom.xml +++ b/tests/junit/plugins/infra/gmfdiag/pom.xml @@ -8,9 +8,7 @@ <artifactId>org.eclipse.papyrus.infra.tests.releng</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.gmfdiag.tests.releng</artifactId> - <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <description>Tests for infra gmfdiag</description> |