Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2011-08-28 21:42:36 +0000
committerStephan Herrmann2011-08-28 21:42:36 +0000
commit8740b768b37bf332f0fb0c3397f432525122e758 (patch)
tree4059966289742b56ed6647d1435237a3381a6044 /plugins
parent92e8977d3a3d3889301ba64a3b9d82143ac8055f (diff)
downloadorg.eclipse.objectteams-8740b768b37bf332f0fb0c3397f432525122e758.tar.gz
org.eclipse.objectteams-8740b768b37bf332f0fb0c3397f432525122e758.tar.xz
org.eclipse.objectteams-8740b768b37bf332f0fb0c3397f432525122e758.zip
fix patch to ot_paragraph (probably broke during the plug-in split).
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.objectteams.otdt.doc/guide/builder.html2
-rw-r--r--plugins/org.eclipse.objectteams.otdt.doc/guide/callinmarker.html8
-rw-r--r--plugins/org.eclipse.objectteams.otdt.doc/guide/compilation.html2
-rw-r--r--plugins/org.eclipse.objectteams.otdt.doc/guide/completion.html14
-rw-r--r--plugins/org.eclipse.objectteams.otdt.doc/guide/editor.html8
-rw-r--r--plugins/org.eclipse.objectteams.otdt.doc/guide/quickassist.html2
-rw-r--r--plugins/org.eclipse.objectteams.otdt.doc/guide/quickfix.html26
7 files changed, 31 insertions, 31 deletions
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/builder.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/builder.html
index 15a1a8461..712e167ed 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/builder.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/builder.html
@@ -14,7 +14,7 @@
projects if only small changes have been performed.
</p><p>
By the introduction of role files
- (<a href="otjld/def/s1.html#s1.2.5"><img src="../icons/ot_paragraph.gif"> 1.2.5</a>)
+ (<a href="otjld/def/s1.html#s1.2.5"><img src="../images/ot_paragraph.png"> 1.2.5</a>)
even inner classes (here: roles) can be compiled individually.
Incremental compilation is guided by an analysis of the various dependencies among classes.
</p><p>
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/callinmarker.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/callinmarker.html
index 9e96af43a..781f2be93 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/callinmarker.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/callinmarker.html
@@ -20,12 +20,12 @@
extended <a href="editor.html">Java Editor</a>. These markers come in three flavors:
<ul>
<li>A <b>playedBy marker</b> <img src="../images/playedBy_obj.gif"> signals that one or more roles is bound
- to the current class using <code class="keyword">playedBy</code> (<a href="otjld/def/s2.html#s2.1"><img src="../icons/ot_paragraph.gif"> 2.1</a>).</li>
+ to the current class using <code class="keyword">playedBy</code> (<a href="otjld/def/s2.html#s2.1"><img src="../images/ot_paragraph.png"> 2.1</a>).</li>
<li>A <b>callin marker</b> <img src="../images/callinbinding_obj.gif"> signals that one or more callin bindings
- (<a href="otjld/def/s4.html#s4"><img src="../icons/ot_paragraph.gif"> 4</a>) affect the given base method.
- <li>A <b>callout marker</b> <img src="../images/callout_marker.gif"> signals that one or more callout bindings (<a href="otjld/def/s3.html#s3"><img src="../icons/ot_paragraph.gif"> 3</a>)
+ (<a href="otjld/def/s4.html#s4"><img src="../images/ot_paragraph.png"> 4</a>) affect the given base method.
+ <li>A <b>callout marker</b> <img src="../images/callout_marker.gif"> signals that one or more callout bindings (<a href="otjld/def/s3.html#s3"><img src="../images/ot_paragraph.png"> 3</a>)
affect the given base method <b>and</b> that these callout bindings apply decapsulation
- (<a href="otjld/def/s3.html#s3.4"><img src="../icons/ot_paragraph.gif"> 3.4</a>)
+ (<a href="otjld/def/s3.html#s3.4"><img src="../images/ot_paragraph.png"> 3.4</a>)
&mdash;&nbsp;(callout bindings <em>without</em> decapsulation are ranked like regular method calls
and thus not considered relevant for marking in the ruler).
</ul>
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/compilation.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/compilation.html
index f2c0eee79..4b3a2523e 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/compilation.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/compilation.html
@@ -37,7 +37,7 @@
<h3>Consulting the language definition on problems</h3>
<p>When viewing OT/J-specific error/warning messages in the <b>Problems</b> view, the context menu
- offers a &nbsp;<img src="../icons/ot_paragraph.gif"> <span class="ui">Go To Language Definition</span> &nbsp;link,
+ offers a &nbsp;<img src="../images/ot_paragraph.png"> <span class="ui">Go To Language Definition</span> &nbsp;link,
taking you directly to the paragraph
that defines the rule which is being violated by the compiled source code. For presenting the
language definition the internal HTML-browser is used to allow easy navigation within the
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/completion.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/completion.html
index c8f9001cb..8ff478e42 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/completion.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/completion.html
@@ -23,7 +23,7 @@
<h2><a name="completeRole">1. Overriding an inherited role class</a></h2>
Simply by typing <code class="ui">Ctrl-Space</code> in the body of a team class that inherits from another team, completion proposes
- to create a role declaration overriding any inherited role from the super team (<a href="otjld/def/s1.html#s1.3.1.c"><img src="../icons/ot_paragraph.gif"> 1.3.1(c).</a>).
+ to create a role declaration overriding any inherited role from the super team (<a href="otjld/def/s1.html#s1.3.1.c"><img src="../images/ot_paragraph.png"> 1.3.1(c).</a>).
<p>
So selecting this proposal:<br>
@@ -36,12 +36,12 @@
<h2><a name="completeBase">2. Completing a role's base class</a></h2>
When expanding the base type after the keyword <code class="keyword">playedBy</code>,
completion will also generate an "<code class="keyword">import <strong>base</strong> ...</code>" declaration
- (<a href="otjld/def/s2.html#s2.1.2.d"><img src="../icons/ot_paragraph.gif"> 2.1.2(d)</a>), if needed.
+ (<a href="otjld/def/s2.html#s2.1.2.d"><img src="../images/ot_paragraph.png"> 2.1.2(d)</a>), if needed.
<h2><a name="completeMapping">3. Creating callout/callin method bindings</a></h2>
- Specific support for code completion exists to facilitate the creation of <b>callout</b> (<a href="otjld/def/s3.html"><img src="../icons/ot_paragraph.gif"> 3.</a>) and <b>callin</b> (<a href="otjld/def/s4.html"><img src="../icons/ot_paragraph.gif"> 4.</a>) method bindings.<br />
+ Specific support for code completion exists to facilitate the creation of <b>callout</b> (<a href="otjld/def/s3.html"><img src="../images/ot_paragraph.png"> 3.</a>) and <b>callin</b> (<a href="otjld/def/s4.html"><img src="../images/ot_paragraph.png"> 4.</a>) method bindings.<br />
Completion can be used for
<ul>
<li><a href="#full">Creating full method bindings (callout/callin)</a>
@@ -50,7 +50,7 @@
</ul>
<h3><a name="full">3.1 Creating full method bindings (callout/callin)</a></h3>
- Just activating the completion anywhere in the body of a role class allows you to create a full callout or callin binding to an existing base method (or field &mdash; "callout to field", see <a href="otjld/def/s3.html#s3.5"><img src="../icons/ot_paragraph.gif"> 3.5</a>).<br />
+ Just activating the completion anywhere in the body of a role class allows you to create a full callout or callin binding to an existing base method (or field &mdash; "callout to field", see <a href="otjld/def/s3.html#s3.5"><img src="../images/ot_paragraph.png"> 3.5</a>).<br />
<table>
<tr><td colspan=2>
After pressing <code>Ctrl-space</code>, selection of the desired binding happens in three steps:
@@ -76,7 +76,7 @@
<p>
When binding to a base method/field, whose signature contains other base types for which a bound role exists in the current team,
completion lets you select whether the role side of the binding should use base or role types.
- If role types are selected, they will be conform to the corresponding base type by implicitly using lifting (<a href="otjld/def/s2.html#s2.3"><img src="../icons/ot_paragraph.gif"> 2.3</a>) or lowering (<a href="otjld/def/s2.html#s2.2"><img src="../icons/ot_paragraph.gif"> 2.2</a>).
+ If role types are selected, they will be conform to the corresponding base type by implicitly using lifting (<a href="otjld/def/s2.html#s2.3"><img src="../images/ot_paragraph.png"> 2.3</a>) or lowering (<a href="otjld/def/s2.html#s2.2"><img src="../images/ot_paragraph.png"> 2.2</a>).
</p>
<h3><a name="partial">3.2 Completing partial callin/callout bindings</a></h3>
@@ -100,9 +100,9 @@
<h2><a name="completeCall">4. Completing special method calls</a></h2>
<ul>
- <li>After <code class="keyword">base.</code> (<a href="otjld/def/s4.html#s4.3"><img src="../icons/ot_paragraph.gif"> 4.3</a>) and <code class="keyword">tsuper.</code> (<a href="otjld/def/s1.html#s1.3.1.f"><img src="../icons/ot_paragraph.gif"> 1.3.1(f)</a>) completion offers only those methods that are actually legal in this context,
+ <li>After <code class="keyword">base.</code> (<a href="otjld/def/s4.html#s4.3"><img src="../images/ot_paragraph.png"> 4.3</a>) and <code class="keyword">tsuper.</code> (<a href="otjld/def/s1.html#s1.3.1.f"><img src="../images/ot_paragraph.png"> 1.3.1(f)</a>) completion offers only those methods that are actually legal in this context,
which in bose cases implies the same name and signature as the surrounding role (callin) method.</li>
- <li>Completion also offers calls to members of the bound base class which are implicitly available using <b>inferred callout</b> (<a href="otjld/def/s3.html#s3.1.j"><img src="../icons/ot_paragraph.gif"> 3.1(j)</a>, <a href="otjld/def/s3.html#s3.5.h"><img src="../icons/ot_paragraph.gif"> 3.5(h)</a>)
+ <li>Completion also offers calls to members of the bound base class which are implicitly available using <b>inferred callout</b> (<a href="otjld/def/s3.html#s3.1.j"><img src="../images/ot_paragraph.png"> 3.1(j)</a>, <a href="otjld/def/s3.html#s3.5.h"><img src="../images/ot_paragraph.png"> 3.5(h)</a>)
</ul>
<h2><a name="completeTemplate">5. Completion templates</a></h2>
Content assist in the
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/editor.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/editor.html
index 9d09bf87a..949256226 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/editor.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/editor.html
@@ -19,7 +19,7 @@
This way the same editor still handles plain Java sources <i>without</i> interpreting OT/J keywords.<br/>
However, within an OT/J file syntax highlighting is determined in a context-free manner,
which means that scoped keywords
- (<a href="otjld/def/sA.html#sA.0.1"><img src="../icons/ot_paragraph.gif"> A.0.1</a>)
+ (<a href="otjld/def/sA.html#sA.0.1"><img src="../images/ot_paragraph.png"> A.0.1</a>)
like <code class="keyword">after, base, before, get, result, set</code> are highlighted,
even in situations where they have no special meaning.
</li>
@@ -41,17 +41,17 @@
(the opposite direction is supported by <a href="callinmarker.html">binding markers</a>).</li>
</ul>
Navigating <strong>role files</strong>
- (<a href="otjld/def/s1.html#s1.2.5"><img src="../icons/ot_paragraph.gif"> 1.2.5</a>):
+ (<a href="otjld/def/s1.html#s1.2.5"><img src="../images/ot_paragraph.png"> 1.2.5</a>):
<ul>
<li>Hitting F3 on the <code class="keyword">team package</code> declarations jumps to the enclosing team.</li>
<li>In order to navigate from a team to its role file use the quick outline
by hitting <code>Ctrl-O</code> twice:<br />
role files will be offered for selection along inline members.</li>
<li>If javadoc <code>@role</code> tags are used as recommended for listing all role files of the current team
- (<a href="otjld/def/s1.html#s1.2.5.d"><img src="../icons/ot_paragraph.gif"> 1.2.5(d)</a>),
+ (<a href="otjld/def/s1.html#s1.2.5.d"><img src="../images/ot_paragraph.png"> 1.2.5(d)</a>),
the role names in these tags support F3-navigation to the corresponding roles, too.</li>
</ul>
- Navigating the <strong>implicit role hierarchy</strong> (<a href="otjld/def/s1.html#s1.3.1"><img src="../icons/ot_paragraph.gif"> 1.3.1</a>):
+ Navigating the <strong>implicit role hierarchy</strong> (<a href="otjld/def/s1.html#s1.3.1"><img src="../images/ot_paragraph.png"> 1.3.1</a>):
<ul>
<li>A role class that overrides a corresponding role from the super team is decorated with an override marker (<img src="images/over_co.gif">) in the vertical ruler,
which supports the <span class="ui">Open Super Implementation</span> action.</li>
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/quickassist.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/quickassist.html
index df4d96fab..e1695cd36 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/quickassist.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/quickassist.html
@@ -13,7 +13,7 @@
<dl>
<dt>method bindings
<dd>
- &ndash; <a href="assist/addRemoveSignatures.html#remove">remove signatures in method bindings</a> (<a href="otjld/def/s3.html#s3.1.c"><img src="../icons/ot_paragraph.gif"> 3.1(c)</a>, <a href="otjld/def/s4.html#s4.1.c"><img src="../icons/ot_paragraph.gif"> 4.1(c)</a>),<br />
+ &ndash; <a href="assist/addRemoveSignatures.html#remove">remove signatures in method bindings</a> (<a href="otjld/def/s3.html#s3.1.c"><img src="../images/ot_paragraph.png"> 3.1(c)</a>, <a href="otjld/def/s4.html#s4.1.c"><img src="../images/ot_paragraph.png"> 4.1(c)</a>),<br />
&ndash; <a href="assist/addRemoveSignatures.html#add">add signatures to method bindings</a> (<i>inverse of the above</i>)
</dl>
</body>
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/quickfix.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/quickfix.html
index a5826da05..75d20ce82 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/quickfix.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/quickfix.html
@@ -16,39 +16,39 @@
&ndash; missing <code class="keyword">team</code> modifier,<br />
&ndash; illegal modifier for a role,<br />
&ndash; reducing the visibility from an (explicitly or implicitly) inherited role,<br />
- &ndash; abstract relevant role (<a href="otjld/def/s2.html#s2.5.b"><img src="../icons/ot_paragraph.gif"> 2.5(b)</a>).
+ &ndash; abstract relevant role (<a href="otjld/def/s2.html#s2.5.b"><img src="../images/ot_paragraph.png"> 2.5(b)</a>).
<dt>modifiers of methods and method bindings
<dd>
&ndash; mismatch between a method's <code class="keyword">callin</code> modifier and a callin binding's modifier (<code class="keyword">before/after/replace</code>),<br />
&ndash; static/non-static incompatibility in a callin replace binding,<br />
- &ndash; mismatching override of callin vs. regular role methods (<a href="otjld/def/s4.html#s4.2.d"><img src="../icons/ot_paragraph.gif"> 4.2(d)</a>),<br />
+ &ndash; mismatching override of callin vs. regular role methods (<a href="otjld/def/s4.html#s4.2.d"><img src="../images/ot_paragraph.png"> 4.2(d)</a>),<br />
&ndash; missing callin binding modifier (<code class="keyword">before/after/replace</code>).<br />
- &ndash; wrong callout token (<code class="keyword">-&gt;</code> vs. <code class="keyword">=&gt;</code>, <a href="otjld/def/s3.html#s3.1.e"><img src="../icons/ot_paragraph.gif"> 3.1(e)</a>).<br />
+ &ndash; wrong callout token (<code class="keyword">-&gt;</code> vs. <code class="keyword">=&gt;</code>, <a href="otjld/def/s3.html#s3.1.e"><img src="../images/ot_paragraph.png"> 3.1(e)</a>).<br />
&ndash; insufficient visibility of a role method / constructor / field.<br />
- &ndash; also insufficient visibility of a shorthand callout binding can be fixed be prepending a visibility modifier (protected or public, see <a href="otjld/def/s3.html#s3.1.i"><img src="../icons/ot_paragraph.gif"> 3.1(i)</a>).<br />
+ &ndash; also insufficient visibility of a shorthand callout binding can be fixed be prepending a visibility modifier (protected or public, see <a href="otjld/def/s3.html#s3.1.i"><img src="../images/ot_paragraph.png"> 3.1(i)</a>).<br />
<dt>callout/callin method bindings
<dd>
- &ndash; materializing inferred callout bindings (<a href="otjld/def/s3.html#s3.1.j"><img src="../icons/ot_paragraph.gif"> 3.1(j)</a>, <a href="otjld/def/s3.html#s3.5.h"><img src="../icons/ot_paragraph.gif"> 3.5(h)</a>)<br />
- &ndash; missing callin precedence declaration (<a href="otjld/def/s4.html#s4.8"><img src="../icons/ot_paragraph.gif"> 4.8</a>).<br />
- &ndash; <a href="assist/addRemoveSignatures.html">add/remove signatures in callout/callin method binding</a> (<a href="otjld/def/s3.html#s3.1.c"><img src="../icons/ot_paragraph.gif"> 3.1(c)</a>,<a href="otjld/def/s4.html#s4.1.c"><img src="../icons/ot_paragraph.gif"> 4.1(c)</a>).<br>
+ &ndash; materializing inferred callout bindings (<a href="otjld/def/s3.html#s3.1.j"><img src="../images/ot_paragraph.png"> 3.1(j)</a>, <a href="otjld/def/s3.html#s3.5.h"><img src="../images/ot_paragraph.png"> 3.5(h)</a>)<br />
+ &ndash; missing callin precedence declaration (<a href="otjld/def/s4.html#s4.8"><img src="../images/ot_paragraph.png"> 4.8</a>).<br />
+ &ndash; <a href="assist/addRemoveSignatures.html">add/remove signatures in callout/callin method binding</a> (<a href="otjld/def/s3.html#s3.1.c"><img src="../images/ot_paragraph.png"> 3.1(c)</a>,<a href="otjld/def/s4.html#s4.1.c"><img src="../images/ot_paragraph.png"> 4.1(c)</a>).<br>
&nbsp;&nbsp;<em>This works as a quickfix if one of the method specs cannot be resolved, otherwise this change classifies as a <a href="quickassist.html">quick assist</a></em>.<br />
<dt>typing
<dd>
&ndash; add a missing anchor for the type of an externalized role
- (<a href="otjld/def/s1.html#s1.2.2"><img src="../icons/ot_paragraph.gif"> 1.2.2</a>, <a href="otjld/def/s9.html#s9.2"><img src="../icons/ot_paragraph.gif"> 9.2</a>)
+ (<a href="otjld/def/s1.html#s1.2.2"><img src="../images/ot_paragraph.png"> 1.2.2</a>, <a href="otjld/def/s9.html#s9.2"><img src="../images/ot_paragraph.png"> 9.2</a>)
(proposals are infered from the context),<br />
&ndash; adding missing <code class="keyword">final</code> modifier to a variable used as a type anchor, <br />
- &ndash; adding required type parameter to a callin binding capturing covariant base methods (<a href="otjld/def/s4.html#s4.9.3"><img src="../icons/ot_paragraph.gif"> 4.9.3</a>).
+ &ndash; adding required type parameter to a callin binding capturing covariant base methods (<a href="otjld/def/s4.html#s4.9.3"><img src="../images/ot_paragraph.png"> 4.9.3</a>).
<dt>role files
<dd>
- &ndash; adding <code>@role</code> javadoc tags referring to a team's role files (<a href="otjld/def/s1.html#s1.2.5.d"><img src="../icons/ot_paragraph.gif"> 1.2.5.d</a>).
+ &ndash; adding <code>@role</code> javadoc tags referring to a team's role files (<a href="otjld/def/s1.html#s1.2.5.d"><img src="../images/ot_paragraph.png"> 1.2.5.d</a>).
<dt>coding style
<dd>
- &ndash; change import to "<code class="keyword">import <strong>base</strong></code> ...", (<a href="otjld/def/s2.html#s2.1.2.d"><img src="../icons/ot_paragraph.gif"> 2.1.2(d)</a>)<br/>
+ &ndash; change import to "<code class="keyword">import <strong>base</strong></code> ...", (<a href="otjld/def/s2.html#s2.1.2.d"><img src="../images/ot_paragraph.png"> 2.1.2(d)</a>)<br/>
&ndash; change qualified reference to a role's base class to using a simple name and "<code class="keyword">import <strong>base</strong></code> ...", <br/>
- &ndash; migrate syntax for externalized role from "<code>anchor.R</code>" to "<code>R&lt;@anchor&gt;</code>" (<a href="otjld/def/s1.html#s1.2.2.b"><img src="../icons/ot_paragraph.gif"> 1.2.2(b)</a>).<br/>
- &ndash; adding a missing <code>@Override</code> annotation to a role class that overrides a corresponding role from the super team (<a href="otjld/def/s1.html#s1.3.1.c"><img src="../icons/ot_paragraph.gif"> 1.3.1(c)</a>).<br />
+ &ndash; migrate syntax for externalized role from "<code>anchor.R</code>" to "<code>R&lt;@anchor&gt;</code>" (<a href="otjld/def/s1.html#s1.2.2.b"><img src="../images/ot_paragraph.png"> 1.2.2(b)</a>).<br/>
+ &ndash; adding a missing <code>@Override</code> annotation to a role class that overrides a corresponding role from the super team (<a href="otjld/def/s1.html#s1.3.1.c"><img src="../images/ot_paragraph.png"> 1.3.1(c)</a>).<br />
&ndash; adding a missing <code>@Override</code> annotation to a role method that overrides a corresponding method from the implicit super role.<br />
</dl>

Back to the top