Skip to content

Commit 85897ed

Browse files
committed
Issue #9. Adapter is consideren whan simplifying as an element property.
1 parent 24f0c29 commit 85897ed

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/SimplifyPlugin.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.jvnet.jaxb2_commons.util.CustomizationUtils;
1616
import org.xml.sax.ErrorHandler;
1717

18+
import com.sun.tools.xjc.model.CAdapter;
1819
import com.sun.tools.xjc.model.CAttributePropertyInfo;
1920
import com.sun.tools.xjc.model.CClassInfo;
2021
import com.sun.tools.xjc.model.CClassRef;
@@ -240,11 +241,20 @@ private CElementPropertyInfo createElementPropertyInfo(final Model model,
240241
final CElementInfo elementInfo) {
241242
final CElementPropertyInfo elementPropertyInfo;
242243
final String propertyName = createPropertyName(model, element);
244+
245+
final CElementPropertyInfo originalPropertyInfo = elementInfo
246+
.getProperty();
243247
elementPropertyInfo = new CElementPropertyInfo(propertyName,
244248
property.isCollection() ? CollectionMode.REPEATED_ELEMENT
245249
: CollectionMode.NOT_REPEATED, ID.NONE, null,
246250
element.getSchemaComponent(), element.getCustomizations(),
247251
element.getLocator(), false);
252+
253+
final CAdapter adapter = originalPropertyInfo.getAdapter();
254+
if (adapter != null) {
255+
elementPropertyInfo.setAdapter(adapter);
256+
}
257+
248258
elementPropertyInfo.getTypes().add(
249259
new CTypeRef(elementInfo.getContentType(), element
250260
.getElementName(), elementInfo.getContentType()
@@ -319,6 +329,10 @@ private CElementPropertyInfo createElementPropertyInfo(final Model model,
319329
.idUse(), typeRef.getTarget().getExpectedMimeType(),
320330
property.getSchemaComponent(), property.getCustomizations(),
321331
property.getLocator(), required);
332+
final CAdapter adapter = property.getAdapter();
333+
if (adapter != null) {
334+
elementPropertyInfo.setAdapter(adapter);
335+
}
322336
elementPropertyInfo.getTypes().add(typeRef);
323337
return elementPropertyInfo;
324338
}

0 commit comments

Comments
 (0)