My favorites | Sign in
Project Home Downloads Wiki Issues Source
READ-ONLY: This project has been archived. For more information see this post.
Search
for
  Advanced search   Search tips   Subscriptions

Issue 57 attachment: flexxb_memberNS.txt (8.7 KB)

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
### Eclipse Workspace Patch 1.0
#P FlexXB2-MP
Index: FlexXBTest/src/main/flex/com/googlecode/flexxb/XmlSerializerTest.as
===================================================================
--- FlexXBTest/src/main/flex/com/googlecode/flexxb/XmlSerializerTest.as (revision 733)
+++ FlexXBTest/src/main/flex/com/googlecode/flexxb/XmlSerializerTest.as (working copy)
@@ -27,6 +27,7 @@
import com.googlecode.testData.Mock;
import com.googlecode.testData.Mock2;
import com.googlecode.testData.Mock3;
+ import com.googlecode.testData.NamespacedArrayMember;
import com.googlecode.testData.VectoredElement;
import com.googlecode.testData.XmlPathObject;
import com.googlecode.testData.XmlTypedObj;
@@ -56,7 +57,7 @@
import org.flexunit.asserts.assertTrue;
import org.hamcrest.object.equalTo;
import org.hamcrest.object.instanceOf;
- import org.hamcrest.object.notNullValue;
+ import org.hamcrest.object.notNullValue;

public class XmlSerializerTest {

@@ -401,5 +402,29 @@
assertNotNull(copy.list);
assertThat(copy.list.length, equalTo(0));
}
+
+ [Test]
+ public function testArrayMemberNamespace() : void
+ {
+ var item : NamespacedArrayMember = new NamespacedArrayMember();
+ item.listA = ["one", "two", "three"];
+ item.listB = [1,2];
+
+ var engine : IFlexXB = new FxBEngine().getXmlSerializer();
+ var xml : XML = FlexXBEngine.instance.serialize(item);
+
+ var aliasNS:Namespace = new Namespace("ns", "www.example.com/ns");
+ var memberNS:Namespace = new Namespace("member", "www.example.com/member");
+ assertNotNull(xml.listA[0].memberNS::string[0]);
+ assertNotNull(xml.aliasNS::listB[0]);
+ assertNotNull(xml.aliasNS::listB[0].memberNS::int[0]);
+
+ var copy:NamespacedArrayMember = FlexXBEngine.instance.deserialize(xml, NamespacedArrayMember);
+
+ assertThat(copy.listA.length, equalTo(3));
+ assertThat(copy.listA[0], equalTo("one"));
+ assertThat(copy.listB.length, equalTo(2));
+ assertThat(copy.listB[0], equalTo(1));
+ }
}
}
\ No newline at end of file
Index: FlexXB/src/main/flex/com/googlecode/flexxb/xml/annotation/XmlClass.as
===================================================================
--- FlexXB/src/main/flex/com/googlecode/flexxb/xml/annotation/XmlClass.as (revision 733)
+++ FlexXB/src/main/flex/com/googlecode/flexxb/xml/annotation/XmlClass.as (working copy)
@@ -214,6 +214,14 @@
}else{
annotation.nameSpace = nameSpace;
}
+ if(annotation is XmlArray)
+ {
+ var xmlArray:XmlArray = XmlArray(annotation);
+ if(xmlArray.hasMemberNamespaceRef())
+ {
+ xmlArray.memberNamespace = getRegisteredNamespace(xmlArray.memberNamespaceRef);
+ }
+ }
members.addItem(annotation);
if (annotation.name.localName == id) {
_idField = annotation;
Index: FlexXB/src/main/flex/com/googlecode/flexxb/xml/annotation/XmlArray.as
===================================================================
--- FlexXB/src/main/flex/com/googlecode/flexxb/xml/annotation/XmlArray.as (revision 733)
+++ FlexXB/src/main/flex/com/googlecode/flexxb/xml/annotation/XmlArray.as (working copy)
@@ -22,6 +22,8 @@

import flash.utils.getDefinitionByName;
import flash.utils.getQualifiedClassName;
+
+ import mx.utils.StringUtil;

/**
* <p>Usage: <code>[XmlArray(alias="element", memberName="NameOfArrayElement", getFromCache="true|false",
@@ -44,8 +46,15 @@
* @private
*/
private var _memberName : QName;
-
/**
+ * @private
+ */
+ private var _memberNamespaceRef: String;
+ /**
+ * @private
+ */
+ private var _memberNamespace: Namespace;
+ /**
* Constructor
* @param descriptor
* @param xmlClass
@@ -72,13 +81,49 @@
public function get memberName() : QName {
return _memberName;
}
+ /**
+ * Get the optional namespace for member
+ * @return
+ *
+ */
+ public function get memberNamespaceRef() : String
+ {
+ return _memberNamespaceRef;
+ }
+ /**
+ * Get the optional namespace for member
+ * @return
+ *
+ */
+ public function set memberNamespace(value:Namespace):void
+ {
+ _memberNamespace = value;
+ if(_memberName)
+ {
+ _memberName = new QName(value, _memberName.localName);
+ }
+ }
+ public function get memberNamespace():Namespace
+ {
+ return _memberNamespace;
+ }
+ /**
+ *
+ * @return
+ *
+ */
+ public function hasMemberNamespaceRef() : Boolean{
+ return _memberNamespaceRef && StringUtil.trim(_memberNamespaceRef).length > 0;
+ }

protected override function parse(metadata : MetaDescriptor) : void {
super.parse(metadata);
_memberType = determineElementType(metadata);
+ _memberNamespaceRef = metadata.attributes[XmlConstants.MEMBER_NAMESPACE];
var arrayMemberName : String = metadata.attributes[XmlConstants.MEMBER_NAME];
if (arrayMemberName) {
- _memberName = new QName(nameSpace, arrayMemberName);
+ var ns:Namespace = memberNamespace?memberNamespace:nameSpace;
+ _memberName = new QName(ns, arrayMemberName);
}
}

Index: FlexXB/src/main/flex/com/googlecode/flexxb/xml/api/schema/FlexXB-XML.xsd
===================================================================
--- FlexXB/src/main/flex/com/googlecode/flexxb/xml/api/schema/FlexXB-XML.xsd (revision 733)
+++ FlexXB/src/main/flex/com/googlecode/flexxb/xml/api/schema/FlexXB-XML.xsd (working copy)
@@ -58,6 +58,9 @@
</xs:annotation>
<xs:complexContent>
<xs:extension base="XmlMember">
+ <xs:sequence>
+ <xs:element name="memberNameSpace" type="XmlNamespace" minOccurs="0" maxOccurs="1" />
+ </xs:sequence>
<xs:attribute name="memberName" type="xs:string" use="optional" />
<xs:attribute name="memberType" type="xs:string" use="optional" />
<xs:attribute name="getFromCache" type="xs:boolean" use="optional" default="false" />
Index: FlexXB/src/main/flex/com/googlecode/flexxb/xml/annotation/XmlConstants.as
===================================================================
--- FlexXB/src/main/flex/com/googlecode/flexxb/xml/annotation/XmlConstants.as (revision 733)
+++ FlexXB/src/main/flex/com/googlecode/flexxb/xml/annotation/XmlConstants.as (working copy)
@@ -88,5 +88,9 @@
*
*/
public static const MEMBER_NAME : String = "memberName";
+ /**
+ *
+ */
+ public static const MEMBER_NAMESPACE : String = "memberNamespace";
}
}
\ No newline at end of file
Index: FlexXB/src/main/flex/com/googlecode/flexxb/xml/api/XmlApiArray.as
===================================================================
--- FlexXB/src/main/flex/com/googlecode/flexxb/xml/api/XmlApiArray.as (revision 733)
+++ FlexXB/src/main/flex/com/googlecode/flexxb/xml/api/XmlApiArray.as (working copy)
@@ -58,8 +58,13 @@
*/
[XmlAttribute]
public var memberType : Class;
-
/**
+ * @private
+ */
+ protected var _memberNameSpace : XmlApiNamespace;
+
+
+ /**
*
* @param field
* @param alias
@@ -68,6 +73,38 @@
public function XmlApiArray(field : FxField, alias : String = null) {
super(field, alias);
}
+
+ [XmlElement]
+ /**
+ *
+ * @return
+ */
+ public final function get memberNameSpace() : XmlApiNamespace{
+ return _memberNameSpace;
+ }
+
+ /**
+ *
+ * @param value
+ */
+ public final function set memberNameSpace(value : XmlApiNamespace) : void{
+ _memberNameSpace = value;
+ if(getOwner()){
+ if(value){
+ _memberNameSpace = XmlApiClass(getOwner()).addNamespace(value);
+ }else{
+ XmlApiClass(getOwner()).removeNamespace(value);
+ }
+ }
+ }
+
+ /**
+ *
+ * @param ns
+ */
+ public function setMemberNamespace(ns : Namespace) : void{
+ memberNameSpace = XmlApiNamespace.create(ns);
+ }

public override function getMetadataName() : String {
return XmlArray.ANNOTATION_NAME;
Index: FlexXBTest/src/main/flex/com/googlecode/testData/NamespacedArrayMember.as
===================================================================
--- FlexXBTest/src/main/flex/com/googlecode/testData/NamespacedArrayMember.as (revision 0)
+++ FlexXBTest/src/main/flex/com/googlecode/testData/NamespacedArrayMember.as (revision 0)
@@ -0,0 +1,18 @@
+package com.googlecode.testData
+{
+ [XmlClass(alias="data")]
+ [Namespace(prefix="ns", uri="www.example.com/ns")]
+ [Namespace(prefix="member", uri="www.example.com/member")]
+ public class NamespacedArrayMember
+ {
+ [XmlArray(type="String", memberName="string", memberNamespace="member")]
+ public var listA : Array = new Array();
+
+ [XmlArray(type="int", memberName="int", namespace="ns", memberNamespace="member")]
+ public var listB : Array = new Array();
+
+ public function NamespacedArrayMember()
+ {
+ }
+ }
+}
\ No newline at end of file
Powered by Google Project Hosting