Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Maggi2016-02-17 14:23:11 +0000
committerGerrit Code Review @ Eclipse.org2016-02-17 17:07:27 +0000
commit6e017b68c6bdf46f97ea27a64161aebb7bb85f7f (patch)
tree248008e60c820bc0e7bf8f482dc41314410feaa3
parent362cccc9b5ccb3805a61de6e0cbaff30bc0f667e (diff)
downloadorg.eclipse.papyrus-6e017b68c6bdf46f97ea27a64161aebb7bb85f7f.tar.gz
org.eclipse.papyrus-6e017b68c6bdf46f97ea27a64161aebb7bb85f7f.tar.xz
org.eclipse.papyrus-6e017b68c6bdf46f97ea27a64161aebb7bb85f7f.zip
Bug 487937 - [SysML 1.1][Documentation] Avoid direct reference to SysML
in the common documentation - replace SysML by DSML Change-Id: I269a8f9ca826dde752008eb219e95be08b1375b2 Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
-rw-r--r--plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.markdown4
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/newChild.mediawiki2
-rw-r--r--plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/properties-view.mediawiki2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/plugin.xml2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/plugin.properties26
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.commands/README.txt44
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.types.ui/src/org/eclipse/papyrus/uml/service/types/ui/menu/AbstractCreateUmlChildMenu.java2
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/plugin.xml30
-rw-r--r--[-rwxr-xr-x]tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/plugin.properties8
9 files changed, 45 insertions, 75 deletions
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.markdown b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.markdown
index bda47fd0063..74fb6b93d71 100644
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.markdown
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.markdown
@@ -2,11 +2,11 @@
The following Papyrus capabilities are supported on models in CDO repositories:
-* create new UML and SysML models
+* create new UML and DSML models
* initialize Papyrus model from existing domain model resource in the repository
* import models from the workspace
* reorganize models in folders by drag-and-drop
-* create and edit all kinds of UML and SysML diagram
+* create and edit all kinds of UML and DSML diagram
* create and edit tables
* export models to the workspace
* browse connected repositories for importing packages and applying profiles
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/newChild.mediawiki b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/newChild.mediawiki
index 89cb72512d8..ab2198b2632 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/newChild.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/newChild.mediawiki
@@ -2,7 +2,7 @@ __TOC__
=Requirements=
; AddNewChild (id=newChild001): : Papyrus shall add in the menu new child for new customized elements by using extended type
-; HideElement (id=newChild002): : Papyrus shall not display all UML or SysML element creation
+; HideElement (id=newChild002): : Papyrus shall not display all UML or DSML element creation
; newChildFromProfile (id=newChild003): : Papyrus shall add the creation of new element from a subset of profile
; newChildMenuDisplay (id=newChild004): : Papyrus shall be able to associate icons to folder or creation menu
; RoleAndElementCreation (id=newChild005): : When an element can be created from several roles for a container, Papyrus shall let the possibility to choose the role or to let to the possibility to be created from all roles.
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/properties-view.mediawiki b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/properties-view.mediawiki
index a66b0ac94e6..cfc76be37d5 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/properties-view.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/properties-view.mediawiki
@@ -23,7 +23,7 @@ Most customizations can be done through the Property view customization Editor.
=== Edit a configuration ===
-Each property view configuration is defined in a different set of files. Each configuration can contain elements from different contexts, but we typically have one configuration per Ecore Metamodel or UML Profile (i.e. one configuration for UML, one for the Diagram Appearance tab, another one for the SysML profile')
+Each property view configuration is defined in a different set of files. Each configuration can contain elements from different contexts, but we typically have one configuration per Ecore Metamodel or UML Profile (i.e. one configuration for UML, one for the Diagram Appearance tab, another one for the each DSML profile based')
To see the list of available configurations, open the properties view (Window -> Show View -> Other' -> General/Properties). Click on the white arrow in the upper right corner of the Properties view, and select 'Customize property view'. You should see a dialog with the list of all available configurations.
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/plugin.xml
index 7aa330f67ff..72c8e65ffee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/plugin.xml
@@ -48,7 +48,7 @@
</Priority>
<object
class="org.eclipse.gmf.runtime.notation.Node(org.eclipse.gmf.runtime.notation)"
- id="org.eclipse.papyrus.sysml.diagram.internalblock.editpart.ShapeCompartmentDisplay">
+ id="org.eclipse.papyrus.uml.diagram.symbols.editpart.ShapeCompartmentDisplay">
<method
name="getType()"
value="compartment_shape_display">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/plugin.properties
index 0901beb9a44..597e66f2401 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/plugin.properties
@@ -1,13 +1,13 @@
-###############################################################################
-# Copyright (c) 2008 Obeo.
-# 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:
-# Obeo - initial API and implementation
-###############################################################################
-pluginName=Papyrus Wizards
-pluginProvider=Eclipse Modeling Project
-NewWizards.project.description=Create a project for a new Papyrus model (UML or SysML)
+###############################################################################
+# Copyright (c) 2008 Obeo.
+# 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:
+# Obeo - initial API and implementation
+###############################################################################
+pluginName=Papyrus Wizards
+pluginProvider=Eclipse Modeling Project
+NewWizards.project.description=Create a project for a new Papyrus model (UML or other DSML)
diff --git a/plugins/uml/org.eclipse.papyrus.uml.commands/README.txt b/plugins/uml/org.eclipse.papyrus.uml.commands/README.txt
index 2c3d9b73cbf..823b7d6e1d3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.commands/README.txt
+++ b/plugins/uml/org.eclipse.papyrus.uml.commands/README.txt
@@ -1,23 +1,23 @@
-/*****************************************************************************
- * Copyright (c) 2011 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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-
-This plugin is created to regroup actions which can be used in :
- - oep.uml.modelexplorer
- - oep.sysml.modelexplorer
-
-for example, the handler RenameNamedElementHandler works with UML,
-but if we choose distribute a Papyrus for SysML version,
-we can exclude oep.uml.modelexplorer, nevertheless, we need to Rename UML Element.
-
+/*****************************************************************************
+ * Copyright (c) 2011 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:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+This plugin is created to regroup actions which can be used in :
+ - oep.uml.modelexplorer
+ - oep.%DSML%.modelexplorer
+
+for example, the handler RenameNamedElementHandler works with UML,
+but if we choose distribute a Papyrus for DSML version,
+we can exclude oep.uml.modelexplorer, nevertheless, we need to Rename UML Element.
+
So this plugin was created to avoid this kind of problem. \ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/src/org/eclipse/papyrus/uml/service/types/ui/menu/AbstractCreateUmlChildMenu.java b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/src/org/eclipse/papyrus/uml/service/types/ui/menu/AbstractCreateUmlChildMenu.java
index 8f05c9bd9d3..58f6bb927d2 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/src/org/eclipse/papyrus/uml/service/types/ui/menu/AbstractCreateUmlChildMenu.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/src/org/eclipse/papyrus/uml/service/types/ui/menu/AbstractCreateUmlChildMenu.java
@@ -15,7 +15,7 @@ import org.eclipse.papyrus.infra.ui.util.AbstractCreateMenuFromCommandCategory;
/**
- * Abstract menu for the creation of SysML elements
+ * Abstract menu for the creation of UML elements
*/
public abstract class AbstractCreateUmlChildMenu extends AbstractCreateMenuFromCommandCategory {
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/plugin.xml b/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/plugin.xml
index eb73269fead..bdd22de74ea 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/plugin.xml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/plugin.xml
@@ -1,42 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
-<!--
- <extension
- point="org.eclipse.papyrus.infra.extendedtypes.extendedElementTypeSet">
- <extendedTypesSet
- icon="icons/debug.gif"
- id="org.eclipse.papyrus.infra.extendedtypes.tests.set1"
- name="Test extended type set"
- path="model/Test.extendedtypes">
- </extendedTypesSet>
- </extension>
- -->
<extension
point="org.eclipse.papyrus.infra.newchild">
<menuCreationModel
model="model/TestMenu.xmi">
</menuCreationModel>
</extension>
- <!--
- <extension
- point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
- <paletteDefinition
- ID="org.eclipse.papyrus.infra.extendedtypes.tests.palette"
- class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
- icon="icons/debug.gif"
- name="Test Palette For Extended Types"
- path="model/Test.palette.xml"
- provider="Eclipse Modeling Project">
- <Priority
- name="Medium">
- </Priority>
- <editor
- id="org.eclipse.papyrus.sysml.diagram.blockdefinition">
- </editor>
- </paletteDefinition>
- </extension>
- -->
<extension
point="org.eclipse.papyrus.infra.extendedtypes.extendedElementTypeSet">
<extendedTypesSet
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/plugin.properties b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/plugin.properties
index 32b979cbcc3..f8948b763a4 100755..100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/plugin.properties
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/plugin.properties
@@ -1,4 +1,4 @@
-#Properties file for org.eclipse.papyrus.sysml.nattable.requirement.tests
-Bundle-Vendor = Eclipse Modeling Project
-Bundle-Name = Papyrus Table Views Tests
-Bundle-Description = This plugin provides Tests for the plugin org.eclipse.papyrus.uml.nattable.views. \ No newline at end of file
+#Properties file for org.eclipse.papyrus.infra.nattable.views.tests
+Bundle-Vendor = Eclipse Modeling Project
+Bundle-Name = Papyrus Table Views Tests
+Bundle-Description = This plugin provides Tests for the plugin org.eclipse.papyrus.infra.nattable.views.tests. \ No newline at end of file

Back to the top