Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore16
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/commands/MBindingContext.java7
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/commands/MBindingTable.java6
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/commands/MBindings.java8
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MCoreExpression.java5
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MExpression.java3
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MDirectMenuItem.java3
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MDirectToolItem.java3
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MDynamicMenuContribution.java3
9 files changed, 26 insertions, 28 deletions
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore b/bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore
index 10d90a0540f..79f5f41f1ad 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore
+++ b/bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore
@@ -122,7 +122,7 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Bindings" abstract="true" interface="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="&lt;p>&#xD;&#xA;&lt;strong>Developers&lt;/strong>:&#xD;&#xA;Add more detailed documentation by editing this comment in &#xD;&#xA;org.eclipse.ui.model.workbench/model/UIElements.ecore. &#xD;&#xA;There is a GenModel/documentation node under each type and attribute.&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.0"/>
+ <details key="documentation" value="&lt;p>&#xD;&#xA;Mixin interface that lists MBindingContexts that should be active when this&#xA;object is active.&#xD;&#xA;&lt;/p>&#xA;&lt;p>Example values: org.eclipse.ui.contexts.dialog, org.eclipse.ui.contexts.window&#xA;&lt;/p>&#xD;&#xA;@since 1.0"/>
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EReference" name="bindingContexts" upperBound="-1"
eType="#//commands/BindingContext">
@@ -133,7 +133,7 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="BindingContext" eSuperTypes="#//ApplicationElement">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="&lt;p>&#xD;&#xA;&lt;strong>Developers&lt;/strong>:&#xD;&#xA;Add more detailed documentation by editing this comment in &#xD;&#xA;org.eclipse.ui.model.workbench/model/UIElements.ecore. &#xD;&#xA;There is a GenModel/documentation node under each type and attribute.&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.0"/>
+ <details key="documentation" value="&lt;p>&#xD;&#xA;This class describes the hierarchy of contexts that are used by the &#xA;&lt;code>EBindingService&lt;/code> to determine which Bindings are currently &#xA;available to the user.&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.0"/>
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -154,7 +154,7 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="BindingTable" eSuperTypes="#//ApplicationElement">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="&lt;p>&#xD;&#xA;&lt;strong>Developers&lt;/strong>:&#xD;&#xA;Add more detailed documentation by editing this comment in &#xD;&#xA;org.eclipse.ui.model.workbench/model/UIElements.ecore. &#xD;&#xA;There is a GenModel/documentation node under each type and attribute.&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.0"/>
+ <details key="documentation" value="&lt;p>&#xD;&#xA;A set of Bindings that will be active if the matching &lt;code>MBindingContext&lt;/code>&#xA;is active.&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.0"/>
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EReference" name="bindings" upperBound="-1"
eType="#//commands/KeyBinding" containment="true">
@@ -545,12 +545,12 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Expression" abstract="true" eSuperTypes="#//ApplicationElement">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="&lt;p>&#xD;&#xA;A class upon which specific types of expressions are based.&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.0"/>
+ <details key="documentation" value="&lt;p>&#xD;&#xA;A class upon which specific types of expressions are based. These are often used to&#xA;evaluate visibility and enablement of model elements.&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.0"/>
</eAnnotations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CoreExpression" eSuperTypes="#//ui/Expression">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="&lt;p>&#xD;&#xA;&lt;strong>Developers&lt;/strong>:&#xD;&#xA;Add more detailed documentation by editing this comment in &#xD;&#xA;org.eclipse.ui.model.workbench/model/UIElements.ecore. &#xD;&#xA;There is a GenModel/documentation node under each type and attribute.&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.0"/>
+ <details key="documentation" value="&lt;p>&#xD;&#xA;A specific kind of expression used by the Eclipse Workbench.&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.0"/>
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="coreExpressionId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
defaultValueLiteral="">
@@ -698,7 +698,7 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DirectMenuItem" eSuperTypes="#//ui/menu/MenuItem #//Contribution">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="&lt;p>&#xD;&#xA;This is the concrete class use to represent a menu item that is directly &#xD;&#xA;invoked when selected.&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.0"/>
+ <details key="documentation" value="&lt;p>&#xD;&#xA;This is the concrete class use to represent a menu item that is directly &#xD;&#xA;invoked when selected. The supplied contribution is asked to execute&#xA;when selected.&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.0"/>
</eAnnotations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="HandledMenuItem" eSuperTypes="#//ui/menu/MenuItem #//ui/menu/HandledItem">
@@ -744,7 +744,7 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DirectToolItem" eSuperTypes="#//ui/menu/ToolItem #//Contribution">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="&lt;p>&#xD;&#xA;This is the concrete class use to represent a tool item that is directly &#xD;&#xA;invoked when selected.&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.0"/>
+ <details key="documentation" value="&lt;p>&#xD;&#xA;This is the concrete class use to represent a tool item that is directly &#xD;&#xA;invoked when selected. The supplied contribution is asked to execute&#xA;when selected.&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.0"/>
</eAnnotations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ToolBarSeparator" eSuperTypes="#//ui/menu/ToolBarElement">
@@ -899,7 +899,7 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DynamicMenuContribution" eSuperTypes="#//ui/menu/MenuItem #//Contribution">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="&lt;p>&#xD;&#xA;This is a concrete class used to represent a menu item that replaces itself through&#xD;&#xA;the execution of the associated client code.&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.0"/>
+ <details key="documentation" value="&lt;p>&#xD;&#xA;This is a concrete class used to represent a menu item that replaces itself through&#xD;&#xA;the execution of the associated client code. The supplied contribution will&#xA;provide the appropriate MMenuElement model elements when queried.&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.0"/>
</eAnnotations>
</eClassifiers>
</eSubpackages>
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/commands/MBindingContext.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/commands/MBindingContext.java
index 0b29b5173ae..33b9f84a821 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/commands/MBindingContext.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/commands/MBindingContext.java
@@ -20,10 +20,9 @@ import org.eclipse.e4.ui.model.application.MApplicationElement;
*
* <!-- begin-model-doc -->
* <p>
- * <strong>Developers</strong>:
- * Add more detailed documentation by editing this comment in
- * org.eclipse.ui.model.workbench/model/UIElements.ecore.
- * There is a GenModel/documentation node under each type and attribute.
+ * This class describes the hierarchy of contexts that are used by the
+ * <code>EBindingService</code> to determine which Bindings are currently
+ * available to the user.
* </p>
* @since 1.0
* <!-- end-model-doc -->
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/commands/MBindingTable.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/commands/MBindingTable.java
index 53cd639dad3..f4844692efc 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/commands/MBindingTable.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/commands/MBindingTable.java
@@ -20,10 +20,8 @@ import org.eclipse.e4.ui.model.application.MApplicationElement;
*
* <!-- begin-model-doc -->
* <p>
- * <strong>Developers</strong>:
- * Add more detailed documentation by editing this comment in
- * org.eclipse.ui.model.workbench/model/UIElements.ecore.
- * There is a GenModel/documentation node under each type and attribute.
+ * A set of Bindings that will be active if the matching <code>MBindingContext</code>
+ * is active.
* </p>
* @since 1.0
* <!-- end-model-doc -->
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/commands/MBindings.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/commands/MBindings.java
index c31b97d76dc..409802d122e 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/commands/MBindings.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/commands/MBindings.java
@@ -19,10 +19,10 @@ import java.util.List;
*
* <!-- begin-model-doc -->
* <p>
- * <strong>Developers</strong>:
- * Add more detailed documentation by editing this comment in
- * org.eclipse.ui.model.workbench/model/UIElements.ecore.
- * There is a GenModel/documentation node under each type and attribute.
+ * Mixin interface that lists MBindingContexts that should be active when this
+ * object is active.
+ * </p>
+ * <p>Example values: org.eclipse.ui.contexts.dialog, org.eclipse.ui.contexts.window
* </p>
* @since 1.0
* <!-- end-model-doc -->
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MCoreExpression.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MCoreExpression.java
index d7f52158cb4..b0b18330435 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MCoreExpression.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MCoreExpression.java
@@ -18,10 +18,7 @@ package org.eclipse.e4.ui.model.application.ui;
*
* <!-- begin-model-doc -->
* <p>
- * <strong>Developers</strong>:
- * Add more detailed documentation by editing this comment in
- * org.eclipse.ui.model.workbench/model/UIElements.ecore.
- * There is a GenModel/documentation node under each type and attribute.
+ * A specific kind of expression used by the Eclipse Workbench.
* </p>
* @since 1.0
* <!-- end-model-doc -->
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MExpression.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MExpression.java
index 26ec80ac50d..cd3b0a0e6b0 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MExpression.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MExpression.java
@@ -20,7 +20,8 @@ import org.eclipse.e4.ui.model.application.MApplicationElement;
*
* <!-- begin-model-doc -->
* <p>
- * A class upon which specific types of expressions are based.
+ * A class upon which specific types of expressions are based. These are often used to
+ * evaluate visibility and enablement of model elements.
* </p>
* @since 1.0
* <!-- end-model-doc -->
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MDirectMenuItem.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MDirectMenuItem.java
index 06c10091a04..6d6941ff009 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MDirectMenuItem.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MDirectMenuItem.java
@@ -20,7 +20,8 @@ import org.eclipse.e4.ui.model.application.MContribution;
* <!-- begin-model-doc -->
* <p>
* This is the concrete class use to represent a menu item that is directly
- * invoked when selected.
+ * invoked when selected. The supplied contribution is asked to execute
+ * when selected.
* </p>
* @since 1.0
* <!-- end-model-doc -->
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MDirectToolItem.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MDirectToolItem.java
index 917915d45bd..cff77225db2 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MDirectToolItem.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MDirectToolItem.java
@@ -20,7 +20,8 @@ import org.eclipse.e4.ui.model.application.MContribution;
* <!-- begin-model-doc -->
* <p>
* This is the concrete class use to represent a tool item that is directly
- * invoked when selected.
+ * invoked when selected. The supplied contribution is asked to execute
+ * when selected.
* </p>
* @since 1.0
* <!-- end-model-doc -->
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MDynamicMenuContribution.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MDynamicMenuContribution.java
index ff6b33836f3..cb7ea272cf4 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MDynamicMenuContribution.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MDynamicMenuContribution.java
@@ -20,7 +20,8 @@ import org.eclipse.e4.ui.model.application.MContribution;
* <!-- begin-model-doc -->
* <p>
* This is a concrete class used to represent a menu item that replaces itself through
- * the execution of the associated client code.
+ * the execution of the associated client code. The supplied contribution will
+ * provide the appropriate MMenuElement model elements when queried.
* </p>
* @since 1.0
* <!-- end-model-doc -->

Back to the top