Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--features/papyrus-main-features/org.eclipse.papyrus.doc.feature/feature.xml6
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.project22
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.core.resources.prefs4
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/META-INF/MANIFEST.MF7
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/about.html28
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/build.properties6
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/plugin.properties16
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/plugin.xml15
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/pom.xml14
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Palette1.JPGbin0 -> 13717 bytes
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Palette2-Include.JPGbin0 -> 33198 bytes
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Palette3-Rubberband.JPGbin0 -> 38316 bytes
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectAllInclude.JPGbin0 -> 218567 bytes
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectAllTouched.JPGbin0 -> 198600 bytes
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectConnectionInclude.JPGbin0 -> 205558 bytes
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectConnectionTouched.JPGbin0 -> 194064 bytes
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectLabelInclude.JPGbin0 -> 208365 bytes
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectLabelTouched.JPGbin0 -> 198025 bytes
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectNodeInclude.JPGbin0 -> 211259 bytes
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectNodeTouched.JPGbin0 -> 200633 bytes
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/marqueeSelectionTool-toc.xml18
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/marqueeSelectionTool.html14
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/marqueeSelectionTool.mediawiki78
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/tools-toc.xml6
-rwxr-xr-xreleng/top-pom-extras.xml2
-rwxr-xr-xreleng/top-pom-main.xml3
26 files changed, 237 insertions, 2 deletions
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/feature.xml
index b8dc7168476..c9fcec2aeb2 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/feature.xml
@@ -101,4 +101,10 @@ http://www.eclipse.org/legal/epl-v10.html
install-size="0"
version="0.0.0"/>
+ <plugin
+ id="org.eclipse.papyrus.infra.gmfdiag.common.doc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
</feature>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.project
new file mode 100644
index 00000000000..474137c05b7
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.infra.gmfdiag.common.doc</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.core.resources.prefs b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..102f4b5a001
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//resource/marqueeSelectionTool-toc.xml=utf-8
+encoding//resource/marqueeSelectionTool.html=utf-8
+encoding//resource/tools-toc.xml=utf-8
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..dd745071dec
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.common.doc;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: %providerName
+Require-Bundle: org.eclipse.help;bundle-version="3.6.0"
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/about.html b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/about.html
new file mode 100644
index 00000000000..35ab843b7db
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>May, 2014</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html> \ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/build.properties b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/build.properties
new file mode 100644
index 00000000000..372c4fa9ca7
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/build.properties
@@ -0,0 +1,6 @@
+bin.includes = META-INF/,\
+ about.html,\
+ plugin.properties,\
+ plugin.xml,\
+ resource/
+src.includes = about.html
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/plugin.properties b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/plugin.properties
new file mode 100644
index 00000000000..e2f1846b330
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/plugin.properties
@@ -0,0 +1,16 @@
+##########################################################################################
+# Copyright (c) 2014 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:
+# Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Initial API and implementation
+#
+########################################################################################
+
+pluginName = Papyrus Modelling Tool Documentation
+providerName = Eclipse Modeling Project
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/plugin.xml
new file mode 100644
index 00000000000..5743a03b994
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/plugin.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+ point="org.eclipse.help.toc">
+ <toc
+ file="resource/marqueeSelectionTool-toc.xml"
+ primary="false">
+ </toc>
+ <toc
+ file="resource/tools-toc.xml"
+ primary="false">
+ </toc>
+ </extension>
+</plugin>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/pom.xml
new file mode 100644
index 00000000000..c078d92da7c
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>org.eclipse.papyrus</artifactId>
+ <groupId>org.eclipse.papyrus</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../../releng/top-pom-main.xml</relativePath>
+ </parent>
+ <artifactId>org.eclipse.papyrus.infra.gmfdiag.common.doc</artifactId>
+ <groupId>org.eclipse.papyrus</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project> \ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Palette1.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Palette1.JPG
new file mode 100644
index 00000000000..d4b120e2881
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Palette1.JPG
Binary files differ
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Palette2-Include.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Palette2-Include.JPG
new file mode 100644
index 00000000000..8a7db1f3404
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Palette2-Include.JPG
Binary files differ
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Palette3-Rubberband.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Palette3-Rubberband.JPG
new file mode 100644
index 00000000000..adb7be6a482
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Palette3-Rubberband.JPG
Binary files differ
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectAllInclude.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectAllInclude.JPG
new file mode 100644
index 00000000000..5a9a068db81
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectAllInclude.JPG
Binary files differ
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectAllTouched.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectAllTouched.JPG
new file mode 100644
index 00000000000..0fa913c42e4
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectAllTouched.JPG
Binary files differ
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectConnectionInclude.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectConnectionInclude.JPG
new file mode 100644
index 00000000000..fee333c8577
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectConnectionInclude.JPG
Binary files differ
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectConnectionTouched.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectConnectionTouched.JPG
new file mode 100644
index 00000000000..fe4b4cdeadd
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectConnectionTouched.JPG
Binary files differ
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectLabelInclude.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectLabelInclude.JPG
new file mode 100644
index 00000000000..263fe31d397
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectLabelInclude.JPG
Binary files differ
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectLabelTouched.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectLabelTouched.JPG
new file mode 100644
index 00000000000..6111f5d1f1e
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectLabelTouched.JPG
Binary files differ
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectNodeInclude.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectNodeInclude.JPG
new file mode 100644
index 00000000000..139f5a82894
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectNodeInclude.JPG
Binary files differ
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectNodeTouched.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectNodeTouched.JPG
new file mode 100644
index 00000000000..a8fc8f870ff
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/SelectNodeTouched.JPG
Binary files differ
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/marqueeSelectionTool-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/marqueeSelectionTool-toc.xml
new file mode 100644
index 00000000000..1a29ff761ba
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/marqueeSelectionTool-toc.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<toc label="Tool" topic="resource/marqueeSelectionTool.html">
+ <topic href="resource/marqueeSelectionTool.html" label="Marquee Selection Tools">
+ <topic href="resource/marqueeSelectionTool.html#Introduction" label="Introduction"></topic>
+ <topic href="resource/marqueeSelectionTool.html#Standard_Marquee_Selection" label="Standard Marquee Selection">
+ <topic href="resource/marqueeSelectionTool.html#Select_All" label="Select All"></topic>
+ <topic href="resource/marqueeSelectionTool.html#Select_Nodes_Only" label="Select Nodes Only"></topic>
+ <topic href="resource/marqueeSelectionTool.html#Select_Connections_Only" label="Select Connections Only"></topic>
+ <topic href="resource/marqueeSelectionTool.html#Select_Labels_Only" label="Select Labels Only"></topic>
+ </topic>
+ <topic href="resource/marqueeSelectionTool.html#Rubberband_Marquee_Selection" label="Rubberband Marquee Selection">
+ <topic href="resource/marqueeSelectionTool.html#Select_All_2" label="Select All"></topic>
+ <topic href="resource/marqueeSelectionTool.html#Select_Nodes_Only_2" label="Select Nodes Only"></topic>
+ <topic href="resource/marqueeSelectionTool.html#Select_Connections_Only_2" label="Select Connections Only"></topic>
+ <topic href="resource/marqueeSelectionTool.html#Select_Labels_Only_2" label="Select Labels Only"></topic>
+ </topic>
+ </topic>
+</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/marqueeSelectionTool.html b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/marqueeSelectionTool.html
new file mode 100644
index 00000000000..f4bcaf6872d
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/marqueeSelectionTool.html
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="Marquee_Selection_Tools">Marquee Selection Tools</h1><h2 id="Introduction">Introduction</h2><p>In order to enlarge the default selection tool available in the Palette, additionnal marquee selection tools have been added into Papyrus.<br/>
+<img border="0" src="images/Palette1.JPG"/>
+<br/>
+A marquee selection is a multi-selection that allows to select several elements through a rectangle area.</p><p>Two types of marquee selections are available:</p><ul><li><i>Standard selection</i> : Select all elements included inside of the drawn marquee.</li></ul><p><img border="0" src="images/Palette2-Include.JPG"/></p><ul><li><i>Rubberband selection</i> : Select all elements intersecting the marquee in addition with all elements included in the marquee.<br/></li></ul><p><img border="0" src="images/Palette3-Rubberband.JPG"/>
+<br/></p><p>A demonstration of this tool is available on the Papyrus Channel :
+<a href="https://www.youtube.com/watch?v=sRSKYJ1mKBk">Marquee Selection Tool Demonstration</a></p><h2 id="Standard_Marquee_Selection">Standard Marquee Selection</h2><p>The Standard Marquee selection tool comes in a variety of 4 options:</p><ul><li>Select All</li><li>Nodes Only</li><li>Labels Only</li><li>Connections Only</li></ul><h3 id="Select_All">Select All</h3><p>Select blocks, labels and connections inside of the marquee area.
+<img border="0" src="images/SelectAllInclude.JPG"/></p><h3 id="Select_Nodes_Only">Select Nodes Only</h3><p>Select only the blocks inside of the marquee area.
+<img border="0" src="images/SelectNodeInclude.JPG"/></p><h3 id="Select_Connections_Only">Select Connections Only</h3><p>Select only the connectors inside of the marquee area.
+<img border="0" src="images/SelectConnectionInclude.JPG"/></p><h3 id="Select_Labels_Only">Select Labels Only</h3><p>Select only the floating labels inside of the marquee area.
+<img border="0" src="images/SelectLabelInclude.JPG"/></p><h2 id="Rubberband_Marquee_Selection">Rubberband Marquee Selection</h2><p>The Rubberband Marquee selection tool comes in a variety of 4 options:</p><ul><li>Select All</li><li>Nodes Only</li><li>Labels Only</li><li>Connections Only</li></ul><h3 id="Select_All_2">Select All</h3><p>Select the blocks, the labels and the connectors intersecting the marquee area or included inside of the marquee area.
+<img border="0" src="images/SelectAllTouched.JPG"/></p><h3 id="Select_Nodes_Only_2">Select Nodes Only</h3><p>Select only the blocks intersecting the marquee area or included inside of the marquee area.
+<img border="0" src="images/SelectNodeTouched.JPG"/></p><h3 id="Select_Connections_Only_2">Select Connections Only</h3><p>Select only the connectors intersecting the marquee area or included inside of the marquee area.
+<img border="0" src="images/SelectConnectionTouched.JPG"/></p><h3 id="Select_Labels_Only_2">Select Labels Only</h3><p>Select only the labels intersecting the marquee area or included inside of the marquee area.
+<img border="0" src="images/SelectLabelTouched.JPG"/></p><p><hr/></p></body></html> \ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/marqueeSelectionTool.mediawiki b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/marqueeSelectionTool.mediawiki
new file mode 100644
index 00000000000..84775951b9d
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/marqueeSelectionTool.mediawiki
@@ -0,0 +1,78 @@
+<!--
+ Copyright (c) 2014 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:
+ Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Initial Documentation
+-->
+
+
+= Marquee Selection Tools =
+
+== Introduction ==
+
+In order to enlarge the default selection tool available in the Palette, additionnal marquee selection tools have been added into Papyrus.<br/>
+[[Image:images/Palette1.JPG]]
+<br/>
+A marquee selection is a multi-selection that allows to select several elements through a rectangle area.
+
+Two types of marquee selections are available:
+*''Standard selection'' : Select all elements included inside of the drawn marquee.
+[[Image:images/Palette2-Include.JPG]]
+*''Rubberband selection'' : Select all elements intersecting the marquee in addition with all elements included in the marquee.<br/>
+[[Image:images/Palette3-Rubberband.JPG]]
+<br/>
+
+A demonstration of this tool is available on the Papyrus Channel :
+[https://www.youtube.com/watch?v=sRSKYJ1mKBk Marquee Selection Tool Demonstration]
+
+== Standard Marquee Selection ==
+
+The Standard Marquee selection tool comes in a variety of 4 options:
+* Select All
+* Nodes Only
+* Labels Only
+* Connections Only
+
+=== Select All ===
+Select blocks, labels and connections inside of the marquee area.
+[[Image:images/SelectAllInclude.JPG]]
+
+=== Select Nodes Only ===
+Select only the blocks inside of the marquee area.
+[[Image:images/SelectNodeInclude.JPG]]
+
+=== Select Connections Only ===
+Select only the connectors inside of the marquee area.
+[[Image:images/SelectConnectionInclude.JPG]]
+
+=== Select Labels Only ===
+Select only the floating labels inside of the marquee area.
+[[Image:images/SelectLabelInclude.JPG]]
+
+== Rubberband Marquee Selection ==
+
+The Rubberband Marquee selection tool comes in a variety of 4 options:
+* Select All
+* Nodes Only
+* Labels Only
+* Connections Only
+
+=== Select All ===
+Select the blocks, the labels and the connectors intersecting the marquee area or included inside of the marquee area.
+[[Image:images/SelectAllTouched.JPG]]
+=== Select Nodes Only ===
+Select only the blocks intersecting the marquee area or included inside of the marquee area.
+[[Image:images/SelectNodeTouched.JPG]]
+=== Select Connections Only ===
+Select only the connectors intersecting the marquee area or included inside of the marquee area.
+[[Image:images/SelectConnectionTouched.JPG]]
+=== Select Labels Only ===
+Select only the labels intersecting the marquee area or included inside of the marquee area.
+[[Image:images/SelectLabelTouched.JPG]]
+
+----
+
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/tools-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/tools-toc.xml
new file mode 100644
index 00000000000..001f10d70ad
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/tools-toc.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<toc label="Papyrus Modelling Tools" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
+ <topic label="Using Papyrus modelling tools">
+ <anchor id="Tool"/>
+ <link toc="resource/marqueeSelectionTool-toc.xml"/></topic>
+</toc>
diff --git a/releng/top-pom-extras.xml b/releng/top-pom-extras.xml
index 407bf66ed08..ba83404d810 100755
--- a/releng/top-pom-extras.xml
+++ b/releng/top-pom-extras.xml
@@ -372,4 +372,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project> \ No newline at end of file
diff --git a/releng/top-pom-main.xml b/releng/top-pom-main.xml
index 3117b20433f..ce8607dc683 100755
--- a/releng/top-pom-main.xml
+++ b/releng/top-pom-main.xml
@@ -44,7 +44,6 @@
<module>../features/papyrus-main-features/org.eclipse.papyrus.xwt.feature</module>
<module>../plugins/doc/org.eclipse.papyrus.cdo.ui.doc</module>
<module>../plugins/doc/org.eclipse.papyrus.copypaste.ui.doc</module>
- <module>../plugins/doc/org.eclipse.papyrus.moka.doc</module>
<module>../plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc</module>
<module>../plugins/doc/org.eclipse.papyrus.layers.documentation</module>
<module>../plugins/customization/org.eclipse.papyrus.customization.palette</module>
@@ -114,6 +113,7 @@
<module>../plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf</module>
<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands</module>
<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common</module>
+ <module>../plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc</module>
<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode</module>
<module>../plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css</module>
<module>../plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration</module>
@@ -178,6 +178,7 @@
<module>../plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences</module>
<module>../plugins/infra/widget/org.eclipse.papyrus.infra.widgets</module>
<module>../plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox</module>
+ <module>../plugins/doc/org.eclipse.papyrus.moka.doc</module>
<module>../plugins/sysml/org.eclipse.papyrus.sysml</module>
<module>../plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition</module>
<module>../plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common</module>

Back to the top