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
266
267
268
269
270
271
|
diff -uprN xdoclet-1.2.2.orig/modules/hibernate/src/xdoclet/modules/hibernate/HibernateTagsHandler.java xdoclet-1.2.2/modules/hibernate/src/xdoclet/modules/hibernate/HibernateTagsHandler.java
--- xdoclet-1.2.2.orig/modules/hibernate/src/xdoclet/modules/hibernate/HibernateTagsHandler.java 2004-10-14 04:39:06.000000000 +0200
+++ xdoclet-1.2.2/modules/hibernate/src/xdoclet/modules/hibernate/HibernateTagsHandler.java 2005-04-03 15:20:31.000000000 +0200
@@ -4,10 +4,7 @@
*/
package xdoclet.modules.hibernate;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Properties;
+import java.util.*;
import org.apache.commons.logging.Log;
import org.apache.tools.ant.types.Parameter;
@@ -48,6 +45,18 @@ public class HibernateTagsHandler
private Parameter currentOtherMapping;
+ private static boolean isHibernated(XClass xClass)
+ {
+ if (xClass == null) {
+ return false;
+ }
+
+ return (
+ xClass.getDoc().getTag("hibernate.class") != null ||
+ xClass.getDoc().getTag("hibernate.subclass") != null
+ );
+ }
+
/**
* Returns full path of hibernate file for the current class.
*
@@ -594,9 +603,11 @@ public class HibernateTagsHandler
log.debug("typeName=" + typeName);
Collection classes = getXJavaDoc().getSourceClasses();
+ List reorderedClasses = flattenHierachy(getCurrentClass(), classes);
+
XClass clazz;
- for (Iterator i = classes.iterator(); i.hasNext(); ) {
+ for (Iterator i = reorderedClasses.iterator(); i.hasNext(); ) {
clazz = (XClass) i.next();
log.debug("clazz=" + clazz);
@@ -604,8 +615,13 @@ public class HibernateTagsHandler
if (DocletSupport.isDocletGenerated(clazz)) {
log.debug("isDocletGenerated");
}
- else if (clazz.getSuperclass() != null && clazz.getSuperclass().getQualifiedName().equals(typeName)) {
- log.debug("is a subclass");
+ else if (isValidSubclass(clazz, getCurrentClass())) {
+ if (getCurrentClass().isInterface()) {
+ log.debug("is an implementing class");
+ }
+ else {
+ log.debug("is a subclass");
+ }
XClass current = getCurrentClass();
@@ -735,10 +751,108 @@ public class HibernateTagsHandler
//TODO: Why do we need this!!??
}
+ private boolean isValidSubclass(XClass clazz, XClass currentClass)
+ {
+ String typeName = currentClass.getQualifiedName();
+
+ // easy case, clazz is implementing interface of hibernated class
+ // NB: not easy anymore, if we've got a hibernated interface hierachy
+ // only return true for "deepest" implemented interface in this hierachy
+ if (currentClass.isInterface() && clazz.isImplementingInterface(typeName)) {
+ List extending = currentClass.getExtendingInterfaces();
+
+ if (extending.isEmpty()) {
+ return true;
+ }
+
+ for (int i = 0; i < extending.size(); i++) {
+ XClass xClass = (XClass) extending.get(i);
+
+ if (isHibernated(xClass) && clazz.isImplementingInterface(xClass.getQualifiedName())) {
+ // we found an interface deeper in the hierachy
+ return false;
+ }
+ }
+ return true;
+ }
+
+ if (clazz.getSuperclass() != null) {
+ // easy case, this class is direct subclass of the hibernated type
+ if (clazz.getSuperclass().equals(typeName)) {
+ return true;
+ }
+ else {
+ // go up class hierarchy to find first hibernate tag
+ XClass xc = clazz;
+
+ do {
+ xc = xc.getSuperclass();
+
+ } while (xc != null && !isHibernated(xc));
+
+ // did we find a valid superclass, is it the current ?
+ if (xc != null) {
+ return xc.equals(currentClass);
+ }
+ }
+ }
+
+ return false;
+ }
+
private HibernateSubTask getHibernateSubTask()
{
return ((HibernateSubTask) (DocletContext.getInstance()
.getSubTaskBy(DocletTask.getSubTaskName(HibernateSubTask.class))));
}
+
+ /**
+ * Flattens the collection of classes by eliminating descendants (for hibernated non
+ * interface classes).
+ *
+ * @param currentClass
+ * @param classes
+ * @return
+ */
+ private List flattenHierachy(XClass currentClass, Collection classes)
+ {
+ Log log = LogUtil.getLog(HibernateTagsHandler.class, "flattenHierachy");
+
+ log.debug("for class " + currentClass);
+
+ if (!currentClass.isInterface()) {
+ List l = new ArrayList(classes);
+
+ l.retainAll(currentClass.getAllSubclasses());
+ return l;
+ }
+
+ Set s = new HashSet(classes);
+
+ log.debug("initial set size: " + s.size());
+
+ for (Iterator iterator = classes.iterator(); iterator.hasNext(); ) {
+ XClass xClass = (XClass) iterator.next();
+
+ if (xClass.isInterface() || !isHibernated(xClass)) {
+ continue;
+ }
+
+ List subClasses = xClass.getAllSubclasses();
+
+ for (int i = 0; i < subClasses.size(); i++) {
+ XClass aClass = (XClass) subClasses.get(i);
+
+ if (s.contains(aClass)) {
+ log.debug("removing " + aClass + " from set");
+ s.remove(aClass);
+ }
+ }
+ }
+
+ log.debug("new set size: " + s.size());
+
+ return new ArrayList(s);
+ }
}
diff -uprN xdoclet-1.2.2.orig/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-properties.xdt xdoclet-1.2.2/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-properties.xdt
--- xdoclet-1.2.2.orig/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-properties.xdt 2004-10-10 11:43:05.000000000 +0200
+++ xdoclet-1.2.2/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-properties.xdt 2005-04-03 15:20:31.000000000 +0200
@@ -1,4 +1,4 @@
- <XDtMethod:ifHasMethodTag tagName="hibernate.property">
+ <XDtMethod:ifHasMethodTag tagName="hibernate.property" superclasses="false">
<property
name="<XDtMethod:propertyName />"
type="<XDtMethod:methodTagValue tagName="hibernate.property" paramName="type" default="<XDtMethod:methodType/>"/>"
@@ -20,7 +20,7 @@
</XDtHibernate:setCurrentTag>
</XDtMethod:ifHasMethodTag>
- <XDtMethod:ifHasMethodTag tagName="hibernate.many-to-one">
+ <XDtMethod:ifHasMethodTag tagName="hibernate.many-to-one" superclasses="false">
<many-to-one
name="<XDtMethod:propertyName/>"
class="<XDtMethod:methodTagValue tagName="hibernate.many-to-one" paramName="class" default="<XDtMethod:methodType/>" />"
@@ -43,7 +43,7 @@
</XDtHibernate:setCurrentTag>
</XDtMethod:ifHasMethodTag>
- <XDtMethod:ifHasMethodTag tagName="hibernate.one-to-one">
+ <XDtMethod:ifHasMethodTag tagName="hibernate.one-to-one" superclasses="false">
<one-to-one
name="<XDtMethod:propertyName/>"
class="<XDtMethod:methodTagValue tagName="hibernate.one-to-one" paramName="class" default="<XDtMethod:methodType/>"/>"
@@ -59,7 +59,7 @@
/>
</XDtMethod:ifHasMethodTag>
- <XDtMethod:ifHasMethodTag tagName="hibernate.component">
+ <XDtMethod:ifHasMethodTag tagName="hibernate.component" superclasses="false">
<component
name="<XDtMethod:propertyName />"
class="<XDtMethod:methodTagValue tagName="hibernate.component" paramName="class" default="<XDtMethod:methodType/>"/>"
@@ -84,7 +84,7 @@
/>
</XDtMethod:ifHasMethodTag>
- <XDtMethod:ifHasMethodTag tagName="hibernate.set">
+ <XDtMethod:ifHasMethodTag tagName="hibernate.set" superclasses="false">
<set
<XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
<XDtMethod:ifHasMethodTag tagName="hibernate.set" paramName="table">
@@ -114,7 +114,7 @@
</set>
</XDtMethod:ifHasMethodTag>
- <XDtMethod:ifHasMethodTag tagName="hibernate.bag">
+ <XDtMethod:ifHasMethodTag tagName="hibernate.bag" superclasses="false">
<bag
<XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
<XDtMethod:ifHasMethodTag tagName="hibernate.bag" paramName="table">
@@ -143,7 +143,7 @@
</bag>
</XDtMethod:ifHasMethodTag>
- <XDtMethod:ifHasMethodTag tagName="hibernate.list">
+ <XDtMethod:ifHasMethodTag tagName="hibernate.list" superclasses="false">
<list
<XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
<XDtMethod:ifHasMethodTag tagName="hibernate.list" paramName="table">
@@ -166,7 +166,7 @@
</list>
</XDtMethod:ifHasMethodTag>
- <XDtMethod:ifHasMethodTag tagName="hibernate.map">
+ <XDtMethod:ifHasMethodTag tagName="hibernate.map" superclasses="false">
<map
<XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
<XDtMethod:ifHasMethodTag tagName="hibernate.map" paramName="table">
@@ -193,7 +193,7 @@
</map>
</XDtMethod:ifHasMethodTag>
- <XDtMethod:ifHasMethodTag tagName="hibernate.array">
+ <XDtMethod:ifHasMethodTag tagName="hibernate.array" superclasses="false">
<array
<XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
<XDtMethod:ifHasMethodTag tagName="hibernate.array" paramName="table">
@@ -218,7 +218,7 @@
</array>
</XDtMethod:ifHasMethodTag>
- <XDtMethod:ifHasMethodTag tagName="hibernate.primitive-array">
+ <XDtMethod:ifHasMethodTag tagName="hibernate.primitive-array" superclasses="false">
<primitive-array
<XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
<XDtMethod:ifHasMethodTag tagName="hibernate.primitive-array" paramName="table">
@@ -236,7 +236,7 @@
</primitive-array>
</XDtMethod:ifHasMethodTag>
- <XDtMethod:ifHasMethodTag tagName="hibernate.any">
+ <XDtMethod:ifHasMethodTag tagName="hibernate.any" superclasses="false">
<any
name="<XDtMethod:propertyName />"
id-type="<XDtMethod:methodTagValue tagName="hibernate.any" paramName="id-type"/>"
|
GitWeb