Bug 363265: In move this gets keyword color.
In add-connection-feature:
"extend the existing method getAddFeature() with the else-part below".
In Add declare RoundedRectangle earlier.
Add new images in anchors.
Renew images in connection-visualization and reconnection-feature.
diff --git a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/add-connection-feature.htm b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/add-connection-feature.htm
index 267e1af..4743d7a 100644
--- a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/add-connection-feature.htm
+++ b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/add-connection-feature.htm
@@ -81,10 +81,11 @@
</div>
<p> </p>
<!-- End code ------------------------------------------------------------------------------- -->
-<p>Additionally the feature provider has to deliver our newly created feature (overwrite
-the method
+<p>Additionally the feature provider has to deliver our newly created feature
+(extend
+the existing method
<a href="../../../javadoc/org/eclipse/graphiti/features/IFeatureProvider.html#getAddFeature(org.eclipse.graphiti.features.context.IAddContext)">
-getAddFeature()</a>).</p>
+getAddFeature()</a> with the else-part below).</p>
<p>This implementation can be seen here:</p>
<!-- Begin code ------------------------------------------------------------------------------- -->
<p> </p>
diff --git a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/add-feature.htm b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/add-feature.htm
index b571d89..beecd12 100644
--- a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/add-feature.htm
+++ b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/add-feature.htm
@@ -143,10 +143,12 @@
<span class="comment">// define a default size for the shape</span><br>
<span class="keyword">int </span>width = 100;<br>
<span class="keyword">int </span>height = 50; <br>
- IGaService gaService = Graphiti.getGaService();<br> <br>
+ IGaService gaService = Graphiti.getGaService();<br>
+ RoundedRectangle roundedRectangle; <span class="comment">// need to
+ access it later</span><br> <br>
{<br>
<span class="comment">// create and set graphics algorithm</span><br>
- RoundedRectangle roundedRectangle =<br>
+ roundedRectangle =<br>
gaService.createRoundedRectangle(containerShape, 5, 5);<br>
roundedRectangle.setForeground(manageColor(<em class="string">E_CLASS_FOREGROUND</em>));<br>
roundedRectangle.setBackground(manageColor(<span class="string"><em>E_CLASS_BACKGROUND</em></span>));<br>
diff --git a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/anchors.htm b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/anchors.htm
index 9156706..c2f3d3e 100644
--- a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/anchors.htm
+++ b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/anchors.htm
@@ -84,7 +84,7 @@
<h2>Creating Connections with Drag & Drop from Anchors</h2>
<p> </p>
<p>
-<img alt="" height="154" src="visio/anchor-box-relative-example.png" width="203"></p>
+<img alt="" height="152" src="visio/anchor-box-relative-example.png" width="203"></p>
<p><strong>Figure: Box relative anchor with graphical representation inside
border of shape</strong></p>
<p> </p>
@@ -172,7 +172,7 @@
<h1>Use an Anchor Location as Connection End-Point</h1>
<p> </p>
<p>
-<img alt="" height="153" src="visio/anchor-box-relative-example-2.png" width="203"></p>
+<img alt="" height="153" src="visio/anchor-box-relative-example-2.png" width="206"></p>
<p><strong>Figure: Box relative anchor with an anchor location as end-point</strong></p>
<p> </p>
<p>The above image shows a connection which has an end-point directly on the
diff --git a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/connection-visualization.htm b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/connection-visualization.htm
index ec562a6..c3dacc1 100644
--- a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/connection-visualization.htm
+++ b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/connection-visualization.htm
@@ -17,16 +17,16 @@
<p><em>Static decorators</em> (inactive pictogram elements) are usually used for
connection ends.</p>
<p>
-<img alt="" height="156" src="visio/connection-decorator-static.png" width="504"> </p>
-<p><strong>Figure: Static connection decorators</strong></p>
+<img alt="" height="160" src="visio/connection-decorator-static.png" width="510"></p>
+<p><strong>Figure: Static connection decorator</strong></p>
<p> </p>
<p><em>Dynamic decorators</em> (active pictogram elements) are usually of type text;
these decorators can be moved via drag & drop; they can be placed anywhere in the
diagram.</p>
<p> </p>
<p>
-<img alt="" height="157" src="visio/connection-decorator-dynamic.png" width="504"> </p>
-<p><strong>Figure: Dynamic connection decorators</strong></p>
+<img alt="" height="155" src="visio/connection-decorator-dynamic.png" width="511"></p>
+<p><strong>Figure: Dynamic connection decorator</strong></p>
<p> </p>
<p>To create such connection decorators we have to do the following in the graphics
model:</p>
@@ -37,16 +37,16 @@
<li>optional: link connection decorator with the business object</li>
</ul>
<p>There are some technical limitations for static decorators: they are only supported
-for graphics algorithm of type polyline or polygon (otherwise they can not be rotated)
+for graphics algorithms of type polyline or polygon (otherwise they can not be rotated)
and they can only be placed at the beginning or at the end of a connection.</p>
-<p>In this example we want create two static connection decorators as shown above
+<p>In this example we want create a static connection decorator as shown above
and one dynamic connection decorator which displays the name of the association.
-For simplification those static connection decorators will be created without consideration
+For simplification the static connection decorator will be created without consideration
of the real values in the business model (types of association ends).</p>
<p>The decorators will be added in the <a href="add-connection-feature.htm">add
-connection feature</a>. The following changes must be done in this feature. First
-add some helper methods to the add connection feature which create the graphics
-algorithms for the static decorators:</p>
+connection feature</a>. The following changes must be done in this feature.
+First add a helper method to the add connection feature which creates the graphics
+algorithm for the static decorator:</p>
<!-- Begin code ------------------------------------------------------------------------------- -->
<p> </p>
<div class="literallayout">
@@ -80,7 +80,7 @@
text.setForeground(manageColor(IColorConstant.<span class="string"><em>BLACK</em></span>));<br>
gaService.setLocation(text, 10, 0);<br>
<span class="comment">// set reference name in the text decorator</span><br>
- ´ EReference eReference = (EReference) context.getNewObject();<br>
+ EReference eReference = (EReference) context.getNewObject();<br>
text.setValue(eReference.getName());<br> <br>
<span class="comment">// add static graphical decorator (composition and
navigable)</span><br> ConnectionDecorator cd;<br>
@@ -96,7 +96,7 @@
<p>Start the editor again and test these new connection decorators:</p>
<ol>
<li>create or open a diagram</li>
- <li>create a new EReference between two EClasses; you can see the three decorators
+ <li>create a new EReference between two EClasses; you can see the two decorators
on the EReference</li>
<li>move the EClasses; you can see that the static decorator (arrow) rotate
automatically</li>
diff --git a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/move-feature.htm b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/move-feature.htm
index 100912c..e8fe80c 100644
--- a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/move-feature.htm
+++ b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/move-feature.htm
@@ -90,7 +90,7 @@
shape = context.getShape();<br> Object bo = getBusinessObjectForPictogramElement(shape);<br>
<span class="keyword">if </span>(bo <span class="keyword">instanceof
</span>EClass) {<br>
- <span class="keyword">return new</span> TutorialMoveEClassFeature(this);<br>
+ <span class="keyword">return new</span> TutorialMoveEClassFeature(<span class="keyword">this</span>);<br>
}<br> <span class="keyword">return super</span>.getMoveShapeFeature(context);<br>
} </p>
</div>
diff --git a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/reconnection-feature.htm b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/reconnection-feature.htm
index cfaa629..3767955 100644
--- a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/reconnection-feature.htm
+++ b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/reconnection-feature.htm
@@ -21,7 +21,7 @@
DefaultReconnectionFeature</a>, which realizes the anchor handling.</p>
<p> </p>
<p>
-<img alt="" height="157" src="visio/reconnection-1.png" width="503"> </p>
+<img alt="" height="156" src="visio/reconnection-1.png" width="507"></p>
<p>
<strong>Figure: Reconnection is allowed</strong></p>
<p> </p>
@@ -47,7 +47,7 @@
at all.</p>
<p> </p>
<p>
-<img alt="" height="160" src="visio/reconnection-2.png" width="510"> </p>
+<img alt="" height="158" src="visio/reconnection-2.png" width="507"></p>
<p>
<strong>Figure: Reconnection is not possible</strong></p>
<p> </p>
diff --git a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/visio/anchor-box-relative-example-2.png b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/visio/anchor-box-relative-example-2.png
index a1d862f..8406ebe 100644
--- a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/visio/anchor-box-relative-example-2.png
+++ b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/visio/anchor-box-relative-example-2.png
Binary files differ
diff --git a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/visio/anchor-box-relative-example.png b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/visio/anchor-box-relative-example.png
index b690c23..f5f584f 100644
--- a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/visio/anchor-box-relative-example.png
+++ b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/visio/anchor-box-relative-example.png
Binary files differ
diff --git a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/visio/connection-decorator-dynamic.png b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/visio/connection-decorator-dynamic.png
index 09918de..909e0ce 100644
--- a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/visio/connection-decorator-dynamic.png
+++ b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/visio/connection-decorator-dynamic.png
Binary files differ
diff --git a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/visio/connection-decorator-static.png b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/visio/connection-decorator-static.png
index f4706c5..65bf6cc 100644
--- a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/visio/connection-decorator-static.png
+++ b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/visio/connection-decorator-static.png
Binary files differ
diff --git a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/visio/reconnection-1.png b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/visio/reconnection-1.png
index 30ec741..1213a5b 100644
--- a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/visio/reconnection-1.png
+++ b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/visio/reconnection-1.png
Binary files differ
diff --git a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/visio/reconnection-2.png b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/visio/reconnection-2.png
index 11b7ae8..3945803 100644
--- a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/visio/reconnection-2.png
+++ b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/visio/reconnection-2.png
Binary files differ
