Update schema.

BrynCooke · Apr 15, 2013 · f3f714f · f3f714f
1 parent 5d36a2d
commit f3f714f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/Tests/Resources/MiddleAgesAssembly.xml b/Tests/Resources/MiddleAgesAssembly.xml
@@ -23,8 +23,19 @@
             </description>
         </property>
     </component>
-
-
+
+    <component class="Knight" key="knightWithCollections">
+        <initializer selector="initWithQuest:">
+            <argument parameterName="quest" ref="defaultQuest"/>
+        </initializer>
+        <property name="favoriteDamsels">
+            <collection>
+                <value requiredType="NSString">mary</value>
+                <value requiredType="NSString">jane</value>
+            </collection>
+        </property>
+    </component>
+
 
     <component class="CampaignQuest" key="quest" scope="prototype" before-property-injection="questBeforePropertyInjection"
                after-property-injection="questAfterPropertyInjection">
@@ -44,10 +55,6 @@
                 Besides the primitive types (int, BOOL, etc), a handful of useful object conversion types
                 are included. You can also easily register your own additional converters.
             </description>
-            <collection>
-                <reference>foobar</reference>
-                <value>one two three</value>
-            </collection>
         </property>
     </component>
 

diff --git a/Typhoon.xcodeproj/project.pbxproj b/Typhoon.xcodeproj/project.pbxproj
@@ -333,6 +333,7 @@
 		BA798EA73AA4E7181ACB1002 /* ClassWithCollectionProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClassWithCollectionProperties.m; sourceTree = "<group>"; };
 		BA798F0B0FA574136DA6A52A /* TyphoonAssembly.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TyphoonAssembly.h; sourceTree = "<group>"; };
 		BA798F0C33EBF7B9102B886A /* Info-iOS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.info; path = "Info-iOS.plist"; sourceTree = "<group>"; };
+		BA798F28A13AE6BA4386F62A /* assembly.xsd */ = {isa = PBXFileReference; lastKnownFileType = file.xsd; name = assembly.xsd; path = schema/assembly.xsd; sourceTree = "<group>"; };
 		BA798F3057F2763006387D93 /* TyphoonPropertyInjectedByReference.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TyphoonPropertyInjectedByReference.m; sourceTree = "<group>"; };
 		BA798F905F4B216CEA7A4D8A /* TyphoonDefinition.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TyphoonDefinition.m; sourceTree = "<group>"; };
 		BA798F939EF6855E92D46BDB /* ExceptionTestAssembly.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = ExceptionTestAssembly.xml; sourceTree = "<group>"; };
@@ -370,6 +371,7 @@
 				6B3F397316ABF854001A601C /* Frameworks */,
 				6B3F397116ABF854001A601C /* Products */,
 				BA79878F47DCC140652F7088 /* Source */,
+				BA798F28A13AE6BA4386F62A /* assembly.xsd */,
 			);
 			sourceTree = "<group>";
 		};

diff --git a/schema/assembly.xsd b/schema/assembly.xsd
@@ -314,16 +314,16 @@
         </xsd:annotation>
         <xsd:complexType mixed="true">
             <xsd:choice minOccurs="0" maxOccurs="unbounded">
-                <xsd:element ref="reference"/>
+                <xsd:element ref="ref"/>
                 <xsd:element ref="value"/>
             </xsd:choice>
         </xsd:complexType>
     </xsd:element>
 
-    <xsd:element name="reference">
+    <xsd:element name="ref">
         <xsd:annotation>
             <xsd:documentation><![CDATA[
-	foobar foobar
+	Adds a collection value by referencing another component definition in the container.
 			]]></xsd:documentation>
         </xsd:annotation>
         <xsd:complexType mixed="true">
@@ -334,11 +334,12 @@
     <xsd:element name="value">
         <xsd:annotation>
             <xsd:documentation><![CDATA[
-	foobar foobar
+	Adds a collection value by performing type conversion on the text value.
 			]]></xsd:documentation>
         </xsd:annotation>
         <xsd:complexType mixed="true">
             <xsd:choice minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:attribute name="requiredType" type="xsd:string" use="required"/>
         </xsd:complexType>
     </xsd:element>