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
|
Description: Compatibility with JDOM 1.x API
Forwarded: no
Author: Damien Raude-Morvan <drazzib@debian.org>
Last-Update: 2009-09-27
--- a/src/main/java/freemarker/ext/jdom/NodeListModel.java
+++ b/src/main/java/freemarker/ext/jdom/NodeListModel.java
@@ -675,7 +675,7 @@
else if ("data".equals(localName))
attr = new Attribute("data", pi.getData());
else
- attr = new Attribute(localName, pi.getValue(localName));
+ attr = new Attribute(localName, pi.getPseudoAttributeValue(localName));
} else if (node instanceof DocType) {
DocType doctype = (DocType) node;
if ("publicId".equals(localName))
@@ -781,17 +781,17 @@
private static final Element getParent(Object node) {
if (node instanceof Element)
- return((Element) node).getParent();
+ return((Element) node).getParentElement();
else if (node instanceof Attribute)
return((Attribute) node).getParent();
else if (node instanceof Text)
- return((Text) node).getParent();
+ return((Text) node).getParentElement();
else if (node instanceof ProcessingInstruction)
- return((ProcessingInstruction) node).getParent();
+ return((ProcessingInstruction) node).getParentElement();
else if (node instanceof Comment)
- return((Comment) node).getParent();
+ return((Comment) node).getParentElement();
else if (node instanceof EntityRef)
- return((EntityRef) node).getParent();
+ return((EntityRef) node).getParentElement();
else
// With 2.1 semantics it makes more sense to just return a null and let the core
// throw an InvalidReferenceException and the template writer can use ?exists etcetera. (JR)
@@ -815,7 +815,7 @@
LinkedList list = new LinkedList();
do {
list.addFirst(parent);
- parent = parent.getParent();
+ parent = parent.getParentElement();
} while (parent != null);
return list;
}
@@ -830,7 +830,7 @@
list.addFirst(node);
do {
list.addFirst(parent);
- parent = parent.getParent();
+ parent = parent.getParentElement();
} while (parent != null);
return list;
}
@@ -885,7 +885,7 @@
Element parent = ((Attribute) node).getParent();
doc = parent == null ? null : parent.getDocument();
} else if (node instanceof Text) {
- Element parent = ((Text) node).getParent();
+ Element parent = ((Text) node).getParentElement();
doc = parent == null ? null : parent.getDocument();
} else if (node instanceof Document)
doc = (Document) node;
--- a/src/main/java/freemarker/ext/xml/_JdomNavigator.java
+++ b/src/main/java/freemarker/ext/xml/_JdomNavigator.java
@@ -122,7 +122,7 @@
} else if ("data".equals(localName)) {
result.add(new Attribute("data", pi.getData()));
} else {
- result.add(new Attribute(localName, pi.getValue(localName)));
+ result.add(new Attribute(localName, pi.getPseudoAttributeValue(localName)));
}
} else if (node instanceof DocType) {
DocType doctype = (DocType) node;
@@ -158,22 +158,22 @@
@Override
Object getParent(Object node) {
if (node instanceof Element) {
- return((Element) node).getParent();
+ return((Element) node).getParentElement();
}
if (node instanceof Attribute) {
return((Attribute) node).getParent();
}
if (node instanceof Text) {
- return((Text) node).getParent();
+ return((Text) node).getParentElement();
}
if (node instanceof ProcessingInstruction) {
- return((ProcessingInstruction) node).getParent();
+ return((ProcessingInstruction) node).getParentElement();
}
if (node instanceof Comment) {
- return((Comment) node).getParent();
+ return((Comment) node).getParentElement();
}
if (node instanceof EntityRef) {
- return((EntityRef) node).getParent();
+ return((EntityRef) node).getParentElement();
}
return null;
}
@@ -186,7 +186,7 @@
Element parent = ((Attribute) node).getParent();
return parent == null ? null : parent.getDocument();
} else if (node instanceof Text) {
- Element parent = ((Text) node).getParent();
+ Element parent = ((Text) node).getParentElement();
return parent == null ? null : parent.getDocument();
} else if (node instanceof Document)
return node;
|
