221571 core expressions: Allow reference/definitionId to browse definition/idv20080320-0800v20080318-0800v20080311-0800

1 files changed, 33 insertions, 53 deletions

diff --git a/bundles/org.eclipse.core.expressions/schema/expressionLanguage.exsd b/bundles/org.eclipse.core.expressions/schema/expressionLanguage.exsd
index 419b926bc..3436ff824 100644
--- a/bundles/org.eclipse.core.expressions/schema/expressionLanguage.exsd
+++ b/bundles/org.eclipse.core.expressions/schema/expressionLanguage.exsd
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.core.expressions">
+<schema targetNamespace="org.eclipse.core.expressions" xmlns="http://www.w3.org/2001/XMLSchema">
 <annotation>
-      <appInfo>
+      <appinfo>
          <meta.schema plugin="org.eclipse.core.expressions" id="commonExpression" name="Common Expressions"/>
-      </appInfo>
+      </appinfo>
       <documentation>
          
       </documentation>
@@ -113,9 +113,9 @@
 
    <element name="instanceof">
       <annotation>
-         <appInfo>
+         <appinfo>
             <meta.element labelAttribute="value"/>
-         </appInfo>
+         </appinfo>
          <documentation>
             This element is used to perform an instanceof check of the object in focus. The expression returns
             EvaluationResult.TRUE if the object&apos;s type is a sub type of the type specified by the attribute value.
@@ -128,9 +128,9 @@
                <documentation>
                   a fully qualified name of a class or interface.
                </documentation>
-               <appInfo>
+               <appinfo>
                   <meta.attribute kind="java" basedOn="java.lang.Object"/>
-               </appInfo>
+               </appinfo>
             </annotation>
          </attribute>
       </complexType>
@@ -138,9 +138,9 @@
 
    <element name="test">
       <annotation>
-         <appInfo>
+         <appinfo>
             <meta.element labelAttribute="property"/>
-         </appInfo>
+         </appinfo>
          <documentation>
             This element is used to evaluate the property state of the object in focus. The set of
             testable properties can be extended using the propery tester extension point. The test
@@ -210,9 +210,9 @@ rules:
 
    <element name="systemTest">
       <annotation>
-         <appInfo>
+         <appinfo>
             <meta.element labelAttribute="value"/>
-         </appInfo>
+         </appinfo>
          <documentation>
             Tests a system property by calling the System.getProperty method and compares the result
             with the value specified through the value attribute.
@@ -238,9 +238,9 @@ rules:
 
    <element name="equals">
       <annotation>
-         <appInfo>
+         <appinfo>
             <meta.element labelAttribute="value"/>
-         </appInfo>
+         </appinfo>
          <documentation>
             This element is used to perform an equals check of the object in focus. The expression returns
             EvaluationResult.TRUE if the object is equal to the value provided by the attribute value. Otherwise
@@ -286,9 +286,9 @@ rules:
 
    <element name="with">
       <annotation>
-         <appInfo>
+         <appinfo>
             <meta.element labelAttribute="variable"/>
-         </appInfo>
+         </appinfo>
          <documentation>
             This element changes the object to be inspected for all its child element to the object
             referenced by the given variable. If the variable can not be resolved then the expression
@@ -325,9 +325,9 @@ rules:
 
    <element name="resolve">
       <annotation>
-         <appInfo>
+         <appinfo>
             <meta.element labelAttribute="variable"/>
-         </appInfo>
+         </appinfo>
          <documentation>
             This element changes the object to be inspected for all its child element to the object
             referenced by the given variable. If the variable can not be resolved then the expression
@@ -375,9 +375,9 @@ rules:
 
    <element name="adapt">
       <annotation>
-         <appInfo>
+         <appinfo>
             <meta.element labelAttribute="type"/>
-         </appInfo>
+         </appinfo>
          <documentation>
             This element is used to adapt the object in focus to the type specified by the attribute
             type. The expression returns not loaded if either the adapter or the type referenced isn&apos;t
@@ -406,9 +406,9 @@ rules:
                <documentation>
                   the type to which the object in focus is to be adapted.
                </documentation>
-               <appInfo>
+               <appinfo>
                   <meta.attribute kind="java" basedOn="java.lang.Object"/>
-               </appInfo>
+               </appinfo>
             </annotation>
          </attribute>
       </complexType>
@@ -457,7 +457,7 @@ rules:
          <attribute name="ifEmpty" type="boolean">
             <annotation>
                <documentation>
-                 the value return from the iterate expression if the collection is empty. If
+                  the value return from the iterate expression if the collection is empty. If
                  not specified then true is returned when the operator equals &quot;and&quot; 
                  and false is return if the operator equals &quot;or&quot;.
                </documentation>
@@ -468,9 +468,9 @@ rules:
 
    <element name="reference">
       <annotation>
-         <appInfo>
+         <appinfo>
             <meta.element labelAttribute="definitionId"/>
-         </appInfo>
+         </appinfo>
          <documentation>
             This element is used to reference an expression from the &lt;b&gt;org.eclipse.core.expressions.definitions&lt;/b&gt; extension point.  The expression definition will be evaluated within the current expression element using the current evaluation context.
          </documentation>
@@ -481,53 +481,33 @@ rules:
                <documentation>
                   The unique id of an expression from &lt;b&gt;org.eclipse.core.expressions.definitions&lt;/b&gt;.
                </documentation>
+               <appinfo>
+                  <meta.attribute kind="identifier" basedOn="org.eclipse.core.expressions.definitions/definition/@id"/>
+               </appinfo>
             </annotation>
          </attribute>
       </complexType>
    </element>
 
    <annotation>
-      <appInfo>
+      <appinfo>
          <meta.section type="since"/>
-      </appInfo>
+      </appinfo>
       <documentation>
          Release 3.0
       </documentation>
    </annotation>
 
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
 
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
 
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
+
 
    <annotation>
-      <appInfo>
+      <appinfo>
          <meta.section type="copyright"/>
-      </appInfo>
+      </appinfo>
       <documentation>
-         Copyright (c) 2001, 2004 IBM Corporation and others.&lt;br&gt;
+         Copyright (c) 2001, 2008 IBM Corporation and others.&lt;br&gt;
 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 &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
       </documentation>
    </annotation>