[releng] OCLinEcore documentation refresh
diff --git a/doc/org.eclipse.ocl.doc/doc/4100-oclinecore-tutorial.textile b/doc/org.eclipse.ocl.doc/doc/4100-oclinecore-tutorial.textile
index 11a2db5..328e397 100644
--- a/doc/org.eclipse.ocl.doc/doc/4100-oclinecore-tutorial.textile
+++ b/doc/org.eclipse.ocl.doc/doc/4100-oclinecore-tutorial.textile
@@ -1,7 +1,7 @@
h2(#OCLinEcoreTutorial). OCLinEcore tutorial
-This tutorial has been updated for Eclipse Luna; Eclipse 4.4, EMF 2.10, OCL 5.0.
+This tutorial has been updated for Eclipse Mars; Eclipse 4.5, EMF 2.11, OCL 6.0.
* Some screenshots may be slightly out of date.
h3. Overview
@@ -31,7 +31,7 @@
Other references:
* The Object Constraint Language: Getting Your Models Ready for MDA. Jos Warmer and Anneke Kleppe. (Addison-Wesley Object Technology)
* "OCL specification":http://www.omg.org/spec/OCL.
-* "OCLinEcore wiki page":http://wiki.eclipse.org/MDT/OCLinEcore.
+* "OCLinEcore wiki page":http://wiki.eclipse.org/OCL/OCLinEcore.
h3(#OCLinEcoreTutorial-Installation). Installing the Eclipse OCL Examples
@@ -189,7 +189,7 @@
!{width:60%}images/4100-create_dynamic_instance_dialog.png(Create Dynamic Instance Dialog)!
The model is automatically opened for editing.
-If it is does open with the Sample Reflective Ecore Model Editor,
+If it is does not open with the Sample Reflective Ecore Model Editor,
close the editor and open explicitly using *Open With->Sample Reflective Ecore Model Editor).
This gives a tree-like presentation of the model. The properties of each node can
be seen in the Properties View.
@@ -304,10 +304,13 @@
!{width:60%}images/4100-validation_unsuccessful.png(Validation Unsuccessful)!
The *Details* identifies that the @SufficientCopies@ invariant is not
-satisfied for the @b2@ book.
+satisfied for the @b2@ book.
+
+Alternatively you may invoke *Live Validation* so that validation happens automatically with
+error icons and hover text identifying problems.
If you now change the first loan so that @b1@ is borrowed and then validate
-again, the problem is resolved. It is alright for @m3@ to borrow
+again, the problem is resolved. It is all right for @m3@ to borrow
the one copy of @b1@ and the two copies of @b2@.
Before introducing a further constraint of no duplicate loans, we will show
@@ -353,7 +356,7 @@
and cursor down keys move across lines. If you want to access an earlier query,
you may use the *Page Up* or *Page Down* keys to save typing them again.
-You can examine the execution of the earlier query by selecting each of the books
+You can examine the execution of the query within out example invariant by selecting each of the books
in turn and executing @library.loans->select(book=self)@, to see that @b1@
has one Loan and @b2@ two.
@@ -375,7 +378,7 @@
!{width:60%}images/4100-derived_property.png(Derived Property)!
-The helper operation can be evaluated in the *Console* view by selecting book @b2@ and typing @isAvailable()@ for execution.
+The helper operation can be evaluated in the *Console* view, after closing and reopening, by selecting book @b2@ and typing @isAvailable()@ for execution.
!{width:60%}images/4100-helper_operation.png(Helper Operation)!
@@ -532,7 +535,7 @@
* Created a dynamic model instance from that meta-model
* Enriched the meta-model with embedded OCL
* Used the embedded OCL while validating the model
-* Queried the model usng the Interactive OCL Console.
+* Queried the model using the Interactive OCL Console.
* Evaluated OCL embedded in the meta-model in the Console.
To use OCL and Ecore as generated Java models we have
diff --git a/doc/org.eclipse.ocl.doc/doc/4300-complete-ocl-tutorial.textile b/doc/org.eclipse.ocl.doc/doc/4300-complete-ocl-tutorial.textile
index 7727726..5f76c84 100644
--- a/doc/org.eclipse.ocl.doc/doc/4300-complete-ocl-tutorial.textile
+++ b/doc/org.eclipse.ocl.doc/doc/4300-complete-ocl-tutorial.textile
@@ -28,9 +28,13 @@
All the material for this tutorial is available as part of the CompleteOCLTutorial Example project that you
may load by selecting *New* then *Example...* using the right button context menu of the Project Explorer. This
-should give the *New Example* dialog in which you can select the *OCL (OCL Constraint Language) Plugins* and the *Complete OCL Tutorial*.
+should give the *New Example* dialog in which you can select the *OCL (OCL Constraint Language) Plugins* and the *Complete OCL Tutorial* and then *Next*.
-!{width:70%}images/4300-new-complete-ocl-tutorial.png(New Complete OCL Tutorial Example)!
+!{width:70%}images/4300-new-complete-ocl-tutorial1.png(New Complete OCL Tutorial Example 1)!
+
+Then *Finish*.
+
+!{width:70%}images/4300-new-complete-ocl-tutorial2.png(New Complete OCL Tutorial Example 2)!
If you do not see these example projects, follow the "Instructions for installing the OCL Editors":#Installation.
@@ -66,10 +70,10 @@
alias.
bq..
-The Java API support for using Complete OCL documents with the Ecore and UML bindings requires implementation-specific magic;
+When using the Ecore and UML bindings, the Java API support for using Complete OCL documents requires implementation-specific magic;
the imported models must be loaded into the package registry by the invoking code. Import statements are not used.
-Prior to the Juno release, import statements were not understood and so there was a usage conflict. Preparation of a
+Prior to the Juno release, import statements were not understood and so there was a usage conflict between Pivot and Ecore/UML bindings. Preparation of a
Complete OCL document using the Xtext editor, or usage with Pivot model and Xtext parser required import statements.
But re-use with the Ecore and UML LPG parser required the import statements to be removed.
@@ -164,8 +168,8 @@
Complete OCL also allows an incomplete operation or property declaration in the complemented meta-model to be completed.
-* initial and derived values may be specified for properties.
-* preconditions, a body and postconditions may be specified for operations.
+* initial value expressions or derived value constraints may be specified for properties.
+* body expressions and precondition/postcondition constraints may be specified for operations.
These facilities are of limited use since OCLinEcore avoids the need for incomplete meta-models.
diff --git a/doc/org.eclipse.ocl.doc/doc/4900-examples-installation.textile b/doc/org.eclipse.ocl.doc/doc/4900-examples-installation.textile
index c8f84bd..2101c67 100644
--- a/doc/org.eclipse.ocl.doc/doc/4900-examples-installation.textile
+++ b/doc/org.eclipse.ocl.doc/doc/4900-examples-installation.textile
@@ -1,7 +1,7 @@
h2(#Installation). Installing the Eclipse OCL Examples and Editors
-These instructions have been updated for Eclipse Luna; Eclipse 4.4, EMF 2.10, OCL 5.0.
+These instructions have been updated for Eclipse Mars; Eclipse 4.5, EMF 2.11, OCL 6.0.
* Some screenshots may be slightly out of date.
The OCL User Interface (console, editors, debugger and validity view)
diff --git a/doc/org.eclipse.ocl.doc/doc/images/4300-complete-ocl-tutorial-project.png b/doc/org.eclipse.ocl.doc/doc/images/4300-complete-ocl-tutorial-project.png
index a144542..ea04517 100644
--- a/doc/org.eclipse.ocl.doc/doc/images/4300-complete-ocl-tutorial-project.png
+++ b/doc/org.eclipse.ocl.doc/doc/images/4300-complete-ocl-tutorial-project.png
Binary files differ
diff --git a/doc/org.eclipse.ocl.doc/doc/images/4300-new-complete-ocl-tutorial.png b/doc/org.eclipse.ocl.doc/doc/images/4300-new-complete-ocl-tutorial.png
deleted file mode 100644
index fde47bb..0000000
--- a/doc/org.eclipse.ocl.doc/doc/images/4300-new-complete-ocl-tutorial.png
+++ /dev/null
Binary files differ
diff --git a/doc/org.eclipse.ocl.doc/doc/images/4300-new-complete-ocl-tutorial1.png b/doc/org.eclipse.ocl.doc/doc/images/4300-new-complete-ocl-tutorial1.png
new file mode 100644
index 0000000..a29b2db
--- /dev/null
+++ b/doc/org.eclipse.ocl.doc/doc/images/4300-new-complete-ocl-tutorial1.png
Binary files differ
diff --git a/doc/org.eclipse.ocl.doc/doc/images/4300-new-complete-ocl-tutorial2.png b/doc/org.eclipse.ocl.doc/doc/images/4300-new-complete-ocl-tutorial2.png
new file mode 100644
index 0000000..1d77330
--- /dev/null
+++ b/doc/org.eclipse.ocl.doc/doc/images/4300-new-complete-ocl-tutorial2.png
Binary files differ
diff --git a/doc/org.eclipse.ocl.doc/doc/images/4900-install_software.png b/doc/org.eclipse.ocl.doc/doc/images/4900-install_software.png
index c251461..57cbf39 100644
--- a/doc/org.eclipse.ocl.doc/doc/images/4900-install_software.png
+++ b/doc/org.eclipse.ocl.doc/doc/images/4900-install_software.png
Binary files differ
diff --git a/doc/org.eclipse.ocl.doc/help/CompleteOCLTutorial.html b/doc/org.eclipse.ocl.doc/help/CompleteOCLTutorial.html
index e97a268..3b6595c 100644
--- a/doc/org.eclipse.ocl.doc/help/CompleteOCLTutorial.html
+++ b/doc/org.eclipse.ocl.doc/help/CompleteOCLTutorial.html
@@ -96,13 +96,25 @@
should give the
<span class="bold"><strong>New Example</strong></span> dialog in which you can select the
<span class="bold"><strong>OCL (OCL Constraint Language) Plugins</strong></span> and the
- <span class="bold"><strong>Complete OCL Tutorial</strong></span>.
+ <span class="bold"><strong>Complete OCL Tutorial</strong></span> and then
+ <span class="bold"><strong>Next</strong></span>.
</p>
<p>
</p>
<div class="mediaobject">
-<img src="images/4300-new-complete-ocl-tutorial.png"></div>
+<img src="images/4300-new-complete-ocl-tutorial1.png"></div>
+<p>
+
+</p>
+<p>Then
+ <span class="bold"><strong>Finish</strong></span>.
+ </p>
+<p>
+
+</p>
+<div class="mediaobject">
+<img src="images/4300-new-complete-ocl-tutorial2.png"></div>
<p>
</p>
@@ -177,9 +189,9 @@
<div class="blockquote">
<blockquote class="blockquote">
<p>
- The Java API support for using Complete OCL documents with the Ecore and UML bindings requires implementation-specific magic;
+ When using the Ecore and UML bindings, the Java API support for using Complete OCL documents requires implementation-specific magic;
the imported models must be loaded into the package registry by the invoking code. Import statements are not used.</p>
-<p>Prior to the Juno release, import statements were not understood and so there was a usage conflict. Preparation of a
+<p>Prior to the Juno release, import statements were not understood and so there was a usage conflict between Pivot and Ecore/UML bindings. Preparation of a
Complete OCL document using the Xtext editor, or usage with Pivot model and Xtext parser required import statements.
But re-use with the Ecore and UML LPG parser required the import statements to be removed.</p>
<p>In Juno, the LPG parser ignores the import statements, so they may be left in.</p>
@@ -361,10 +373,10 @@
<div class="itemizedlist">
<ul class="itemizedlist" type="disc">
<li class="listitem">
-<p>initial and derived values may be specified for properties.</p>
+<p>initial value expressions or derived value constraints may be specified for properties.</p>
</li>
<li class="listitem">
-<p>preconditions, a body and postconditions may be specified for operations.</p>
+<p>body expressions and precondition/postcondition constraints may be specified for operations.</p>
</li>
</ul>
</div>
diff --git a/doc/org.eclipse.ocl.doc/help/ContentAssistSupport.html b/doc/org.eclipse.ocl.doc/help/ContentAssistSupport.html
index 1e5003c..9944be9 100644
--- a/doc/org.eclipse.ocl.doc/help/ContentAssistSupport.html
+++ b/doc/org.eclipse.ocl.doc/help/ContentAssistSupport.html
@@ -103,7 +103,7 @@
<code class="code">Choice</code> s is supported for the
following tokens, which may be used by a client as auto-assist triggers:
</p>
-<table id="N142C6">
+<table id="N142DE">
<tr>
<th>Token</th>
diff --git a/doc/org.eclipse.ocl.doc/help/Installation.html b/doc/org.eclipse.ocl.doc/help/Installation.html
index d0d64ea..d6c8683 100644
--- a/doc/org.eclipse.ocl.doc/help/Installation.html
+++ b/doc/org.eclipse.ocl.doc/help/Installation.html
@@ -20,7 +20,7 @@
</div>
</div>
</div>
-<p>These instructions have been updated for Eclipse Luna; Eclipse 4.4, EMF 2.10, OCL 5.0.</p>
+<p>These instructions have been updated for Eclipse Mars; Eclipse 4.5, EMF 2.11, OCL 6.0.</p>
<div class="itemizedlist">
<ul class="itemizedlist" type="disc">
<li class="listitem">
diff --git a/doc/org.eclipse.ocl.doc/help/TargetMetamodels.html b/doc/org.eclipse.ocl.doc/help/TargetMetamodels.html
index aec9cf4..8d31853 100644
--- a/doc/org.eclipse.ocl.doc/help/TargetMetamodels.html
+++ b/doc/org.eclipse.ocl.doc/help/TargetMetamodels.html
@@ -68,7 +68,7 @@
<code class="code">EcoreEnvironmentFactory.INSTANCE</code> is most practical.
</p>
<p>The Ecore binding for OCL provides the following capabilities, reflecting the subset of Ecore’s modeling constructs with respect to UML:</p>
-<table id="N13F12">
+<table id="N13F2A">
<tr>
<th>Capability</th>
@@ -293,7 +293,7 @@
<code class="code">EPackage</code> names corresponding to UML models. A custom package registry may be provided by the client if necessary.
</p>
<p>The UML binding for OCL provides the following capabilities:</p>
-<table id="N140C7">
+<table id="N140DF">
<tr>
<th>Capability</th>
diff --git a/doc/org.eclipse.ocl.doc/help/Tutorials.html b/doc/org.eclipse.ocl.doc/help/Tutorials.html
index 0f0bba7..9d28d55 100644
--- a/doc/org.eclipse.ocl.doc/help/Tutorials.html
+++ b/doc/org.eclipse.ocl.doc/help/Tutorials.html
@@ -99,7 +99,7 @@
</div>
</div>
</div>
-<p>This tutorial has been updated for Eclipse Luna; Eclipse 4.4, EMF 2.10, OCL 5.0.</p>
+<p>This tutorial has been updated for Eclipse Mars; Eclipse 4.5, EMF 2.11, OCL 6.0.</p>
<div class="itemizedlist">
<ul class="itemizedlist" type="disc">
<li class="listitem">
@@ -183,7 +183,7 @@
<li class="listitem">
<p>
-<a class="ulink" href="http://wiki.eclipse.org/MDT/OCLinEcore" target="_new">OCLinEcore wiki page</a>.
+<a class="ulink" href="http://wiki.eclipse.org/OCL/OCLinEcore" target="_new">OCLinEcore wiki page</a>.
</p>
</li>
</ul>
@@ -587,7 +587,7 @@
</p>
<p>The model is automatically opened for editing.
- If it is does open with the Sample Reflective Ecore Model Editor,
+ If it is does not open with the Sample Reflective Ecore Model Editor,
close the editor and open explicitly using *Open With->Sample Reflective Ecore Model Editor).
This gives a tree-like presentation of the model. The properties of each node can
be seen in the Properties View.</p>
@@ -829,11 +829,15 @@
<span class="bold"><strong>Details</strong></span> identifies that the
<code class="code">SufficientCopies</code> invariant is not
satisfied for the
- <code class="code">b2</code> book.
+ <code class="code">b2</code> book.
+ </p>
+<p>Alternatively you may invoke
+ <span class="bold"><strong>Live Validation</strong></span> so that validation happens automatically with
+ error icons and hover text identifying problems.
</p>
<p>If you now change the first loan so that
<code class="code">b1</code> is borrowed and then validate
- again, the problem is resolved. It is alright for
+ again, the problem is resolved. It is all right for
<code class="code">m3</code> to borrow
the one copy of
<code class="code">b1</code> and the two copies of
@@ -920,7 +924,7 @@
<span class="bold"><strong>Page Up</strong></span> or
<span class="bold"><strong>Page Down</strong></span> keys to save typing them again.
</p>
-<p>You can examine the execution of the earlier query by selecting each of the books
+<p>You can examine the execution of the query within out example invariant by selecting each of the books
in turn and executing
<code class="code">library.loans->select(book=self)</code>, to see that
<code class="code">b1</code>
@@ -973,7 +977,7 @@
</p>
<p>The helper operation can be evaluated in the
- <span class="bold"><strong>Console</strong></span> view by selecting book
+ <span class="bold"><strong>Console</strong></span> view, after closing and reopening, by selecting book
<code class="code">b2</code> and typing
<code class="code">isAvailable()</code> for execution.
</p>
@@ -1275,7 +1279,7 @@
<p>Used the embedded OCL while validating the model</p>
</li>
<li class="listitem">
-<p>Queried the model usng the Interactive OCL Console.</p>
+<p>Queried the model using the Interactive OCL Console.</p>
</li>
<li class="listitem">
<p>Evaluated OCL embedded in the meta-model in the Console.</p>
diff --git a/doc/org.eclipse.ocl.doc/help/images/4300-complete-ocl-tutorial-project.png b/doc/org.eclipse.ocl.doc/help/images/4300-complete-ocl-tutorial-project.png
index a144542..ea04517 100644
--- a/doc/org.eclipse.ocl.doc/help/images/4300-complete-ocl-tutorial-project.png
+++ b/doc/org.eclipse.ocl.doc/help/images/4300-complete-ocl-tutorial-project.png
Binary files differ
diff --git a/doc/org.eclipse.ocl.doc/help/images/4300-new-complete-ocl-tutorial.png b/doc/org.eclipse.ocl.doc/help/images/4300-new-complete-ocl-tutorial.png
deleted file mode 100644
index fde47bb..0000000
--- a/doc/org.eclipse.ocl.doc/help/images/4300-new-complete-ocl-tutorial.png
+++ /dev/null
Binary files differ
diff --git a/doc/org.eclipse.ocl.doc/help/images/4300-new-complete-ocl-tutorial1.png b/doc/org.eclipse.ocl.doc/help/images/4300-new-complete-ocl-tutorial1.png
new file mode 100644
index 0000000..a29b2db
--- /dev/null
+++ b/doc/org.eclipse.ocl.doc/help/images/4300-new-complete-ocl-tutorial1.png
Binary files differ
diff --git a/doc/org.eclipse.ocl.doc/help/images/4300-new-complete-ocl-tutorial2.png b/doc/org.eclipse.ocl.doc/help/images/4300-new-complete-ocl-tutorial2.png
new file mode 100644
index 0000000..1d77330
--- /dev/null
+++ b/doc/org.eclipse.ocl.doc/help/images/4300-new-complete-ocl-tutorial2.png
Binary files differ
diff --git a/doc/org.eclipse.ocl.doc/help/images/4900-install_software.png b/doc/org.eclipse.ocl.doc/help/images/4900-install_software.png
index c251461..57cbf39 100644
--- a/doc/org.eclipse.ocl.doc/help/images/4900-install_software.png
+++ b/doc/org.eclipse.ocl.doc/help/images/4900-install_software.png
Binary files differ
diff --git a/doc/org.eclipse.ocl.doc/html/images/4300-complete-ocl-tutorial-project.png b/doc/org.eclipse.ocl.doc/html/images/4300-complete-ocl-tutorial-project.png
index a144542..ea04517 100644
--- a/doc/org.eclipse.ocl.doc/html/images/4300-complete-ocl-tutorial-project.png
+++ b/doc/org.eclipse.ocl.doc/html/images/4300-complete-ocl-tutorial-project.png
Binary files differ
diff --git a/doc/org.eclipse.ocl.doc/html/images/4300-new-complete-ocl-tutorial.png b/doc/org.eclipse.ocl.doc/html/images/4300-new-complete-ocl-tutorial.png
deleted file mode 100644
index fde47bb..0000000
--- a/doc/org.eclipse.ocl.doc/html/images/4300-new-complete-ocl-tutorial.png
+++ /dev/null
Binary files differ
diff --git a/doc/org.eclipse.ocl.doc/html/images/4300-new-complete-ocl-tutorial1.png b/doc/org.eclipse.ocl.doc/html/images/4300-new-complete-ocl-tutorial1.png
new file mode 100644
index 0000000..a29b2db
--- /dev/null
+++ b/doc/org.eclipse.ocl.doc/html/images/4300-new-complete-ocl-tutorial1.png
Binary files differ
diff --git a/doc/org.eclipse.ocl.doc/html/images/4300-new-complete-ocl-tutorial2.png b/doc/org.eclipse.ocl.doc/html/images/4300-new-complete-ocl-tutorial2.png
new file mode 100644
index 0000000..1d77330
--- /dev/null
+++ b/doc/org.eclipse.ocl.doc/html/images/4300-new-complete-ocl-tutorial2.png
Binary files differ
diff --git a/doc/org.eclipse.ocl.doc/html/images/4900-install_software.png b/doc/org.eclipse.ocl.doc/html/images/4900-install_software.png
index c251461..57cbf39 100644
--- a/doc/org.eclipse.ocl.doc/html/images/4900-install_software.png
+++ b/doc/org.eclipse.ocl.doc/html/images/4900-install_software.png
Binary files differ
diff --git a/doc/org.eclipse.ocl.doc/html/ocl.html b/doc/org.eclipse.ocl.doc/html/ocl.html
index 9f55080..e41c672 100644
--- a/doc/org.eclipse.ocl.doc/html/ocl.html
+++ b/doc/org.eclipse.ocl.doc/html/ocl.html
@@ -11161,7 +11161,7 @@
</div>
</div>
</div>
-<p>This tutorial has been updated for Eclipse Luna; Eclipse 4.4, EMF 2.10, OCL 5.0.</p>
+<p>This tutorial has been updated for Eclipse Mars; Eclipse 4.5, EMF 2.11, OCL 6.0.</p>
<div class="itemizedlist">
<ul class="itemizedlist" type="disc">
<li class="listitem">
@@ -11245,7 +11245,7 @@
<li class="listitem">
<p>
-<a class="ulink" href="http://wiki.eclipse.org/MDT/OCLinEcore" target="_new">OCLinEcore wiki page</a>.
+<a class="ulink" href="http://wiki.eclipse.org/OCL/OCLinEcore" target="_new">OCLinEcore wiki page</a>.
</p>
</li>
</ul>
@@ -11649,7 +11649,7 @@
</p>
<p>The model is automatically opened for editing.
- If it is does open with the Sample Reflective Ecore Model Editor,
+ If it is does not open with the Sample Reflective Ecore Model Editor,
close the editor and open explicitly using *Open With->Sample Reflective Ecore Model Editor).
This gives a tree-like presentation of the model. The properties of each node can
be seen in the Properties View.</p>
@@ -11891,11 +11891,15 @@
<span class="bold"><strong>Details</strong></span> identifies that the
<code class="code">SufficientCopies</code> invariant is not
satisfied for the
- <code class="code">b2</code> book.
+ <code class="code">b2</code> book.
+ </p>
+<p>Alternatively you may invoke
+ <span class="bold"><strong>Live Validation</strong></span> so that validation happens automatically with
+ error icons and hover text identifying problems.
</p>
<p>If you now change the first loan so that
<code class="code">b1</code> is borrowed and then validate
- again, the problem is resolved. It is alright for
+ again, the problem is resolved. It is all right for
<code class="code">m3</code> to borrow
the one copy of
<code class="code">b1</code> and the two copies of
@@ -11982,7 +11986,7 @@
<span class="bold"><strong>Page Up</strong></span> or
<span class="bold"><strong>Page Down</strong></span> keys to save typing them again.
</p>
-<p>You can examine the execution of the earlier query by selecting each of the books
+<p>You can examine the execution of the query within out example invariant by selecting each of the books
in turn and executing
<code class="code">library.loans->select(book=self)</code>, to see that
<code class="code">b1</code>
@@ -12035,7 +12039,7 @@
</p>
<p>The helper operation can be evaluated in the
- <span class="bold"><strong>Console</strong></span> view by selecting book
+ <span class="bold"><strong>Console</strong></span> view, after closing and reopening, by selecting book
<code class="code">b2</code> and typing
<code class="code">isAvailable()</code> for execution.
</p>
@@ -12337,7 +12341,7 @@
<p>Used the embedded OCL while validating the model</p>
</li>
<li class="listitem">
-<p>Queried the model usng the Interactive OCL Console.</p>
+<p>Queried the model using the Interactive OCL Console.</p>
</li>
<li class="listitem">
<p>Evaluated OCL embedded in the meta-model in the Console.</p>
@@ -12439,13 +12443,25 @@
should give the
<span class="bold"><strong>New Example</strong></span> dialog in which you can select the
<span class="bold"><strong>OCL (OCL Constraint Language) Plugins</strong></span> and the
- <span class="bold"><strong>Complete OCL Tutorial</strong></span>.
+ <span class="bold"><strong>Complete OCL Tutorial</strong></span> and then
+ <span class="bold"><strong>Next</strong></span>.
</p>
<p>
</p>
<div class="mediaobject">
-<img src="images/4300-new-complete-ocl-tutorial.png"></div>
+<img src="images/4300-new-complete-ocl-tutorial1.png"></div>
+<p>
+
+</p>
+<p>Then
+ <span class="bold"><strong>Finish</strong></span>.
+ </p>
+<p>
+
+</p>
+<div class="mediaobject">
+<img src="images/4300-new-complete-ocl-tutorial2.png"></div>
<p>
</p>
@@ -12520,9 +12536,9 @@
<div class="blockquote">
<blockquote class="blockquote">
<p>
- The Java API support for using Complete OCL documents with the Ecore and UML bindings requires implementation-specific magic;
+ When using the Ecore and UML bindings, the Java API support for using Complete OCL documents requires implementation-specific magic;
the imported models must be loaded into the package registry by the invoking code. Import statements are not used.</p>
-<p>Prior to the Juno release, import statements were not understood and so there was a usage conflict. Preparation of a
+<p>Prior to the Juno release, import statements were not understood and so there was a usage conflict between Pivot and Ecore/UML bindings. Preparation of a
Complete OCL document using the Xtext editor, or usage with Pivot model and Xtext parser required import statements.
But re-use with the Ecore and UML LPG parser required the import statements to be removed.</p>
<p>In Juno, the LPG parser ignores the import statements, so they may be left in.</p>
@@ -12704,10 +12720,10 @@
<div class="itemizedlist">
<ul class="itemizedlist" type="disc">
<li class="listitem">
-<p>initial and derived values may be specified for properties.</p>
+<p>initial value expressions or derived value constraints may be specified for properties.</p>
</li>
<li class="listitem">
-<p>preconditions, a body and postconditions may be specified for operations.</p>
+<p>body expressions and precondition/postcondition constraints may be specified for operations.</p>
</li>
</ul>
</div>
@@ -14926,7 +14942,7 @@
</div>
</div>
</div>
-<p>These instructions have been updated for Eclipse Luna; Eclipse 4.4, EMF 2.10, OCL 5.0.</p>
+<p>These instructions have been updated for Eclipse Mars; Eclipse 4.5, EMF 2.11, OCL 6.0.</p>
<div class="itemizedlist">
<ul class="itemizedlist" type="disc">
<li class="listitem">
@@ -16116,7 +16132,7 @@
<code class="code">EcoreEnvironmentFactory.INSTANCE</code> is most practical.
</p>
<p>The Ecore binding for OCL provides the following capabilities, reflecting the subset of Ecore’s modeling constructs with respect to UML:</p>
-<table id="N13F12">
+<table id="N13F2A">
<tr>
<th>Capability</th>
@@ -16341,7 +16357,7 @@
<code class="code">EPackage</code> names corresponding to UML models. A custom package registry may be provided by the client if necessary.
</p>
<p>The UML binding for OCL provides the following capabilities:</p>
-<table id="N140C7">
+<table id="N140DF">
<tr>
<th>Capability</th>
@@ -16651,7 +16667,7 @@
<code class="code">Choice</code> s is supported for the
following tokens, which may be used by a client as auto-assist triggers:
</p>
-<table id="N142C6">
+<table id="N142DE">
<tr>
<th>Token</th>
