1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/BridgeWrapper.java Thu Apr 04 19:05:24 2013 -0700
1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/BridgeWrapper.java Tue Apr 09 14:51:13 2013 +0100
1.3 @@ -50,37 +50,41 @@
1.4
1.5 public class BridgeWrapper<T> implements XMLBridge<T> {
1.6
1.7 - private JAXBRIContextWrapper parent;
1.8 - private com.sun.xml.internal.bind.api.Bridge<T> bridge;
1.9 + private JAXBRIContextWrapper parent;
1.10 + private com.sun.xml.internal.bind.api.Bridge<T> bridge;
1.11
1.12 - public BridgeWrapper(JAXBRIContextWrapper p, com.sun.xml.internal.bind.api.Bridge<T> b) {
1.13 - parent = p;
1.14 - bridge = b;
1.15 - }
1.16 + public BridgeWrapper(JAXBRIContextWrapper p, com.sun.xml.internal.bind.api.Bridge<T> b) {
1.17 + parent = p;
1.18 + bridge = b;
1.19 + }
1.20
1.21 - public BindingContext context() {
1.22 - return parent;
1.23 - }
1.24 + @Override
1.25 + public BindingContext context() {
1.26 + return parent;
1.27 + }
1.28
1.29 - com.sun.xml.internal.bind.api.Bridge getBridge() {
1.30 - return bridge;
1.31 - }
1.32 + com.sun.xml.internal.bind.api.Bridge getBridge() {
1.33 + return bridge;
1.34 + }
1.35
1.36 - public boolean equals(Object obj) {
1.37 - return bridge.equals(obj);
1.38 - }
1.39 + @Override
1.40 + public boolean equals(Object obj) {
1.41 + return bridge.equals(obj);
1.42 + }
1.43
1.44 - public JAXBRIContext getContext() {
1.45 - return bridge.getContext();
1.46 - }
1.47 + public JAXBRIContext getContext() {
1.48 + return bridge.getContext();
1.49 + }
1.50
1.51 - public TypeInfo getTypeInfo() {
1.52 - return parent.typeInfo(bridge.getTypeReference());
1.53 - }
1.54 + @Override
1.55 + public TypeInfo getTypeInfo() {
1.56 + return parent.typeInfo(bridge.getTypeReference());
1.57 + }
1.58
1.59 - public int hashCode() {
1.60 - return bridge.hashCode();
1.61 - }
1.62 + @Override
1.63 + public int hashCode() {
1.64 + return bridge.hashCode();
1.65 + }
1.66
1.67 // public final void marshal(BridgeContext context, T object, ContentHandler contentHandler) throws JAXBException {
1.68 // bridge.marshal(context, object, contentHandler);
1.69 @@ -101,32 +105,32 @@
1.70 // public final void marshal(BridgeContext context, T object, XMLStreamWriter output) throws JAXBException {
1.71 // bridge.marshal(context, object, output);
1.72 // }
1.73 + public void marshal(Marshaller m, T object, ContentHandler contentHandler) throws JAXBException {
1.74 + bridge.marshal(m, object, contentHandler);
1.75 + }
1.76
1.77 - public void marshal(Marshaller m, T object, ContentHandler contentHandler) throws JAXBException {
1.78 - bridge.marshal(m, object, contentHandler);
1.79 - }
1.80 + public void marshal(Marshaller m, T object, Node output) throws JAXBException {
1.81 + bridge.marshal(m, object, output);
1.82 + }
1.83
1.84 - public void marshal(Marshaller m, T object, Node output) throws JAXBException {
1.85 - bridge.marshal(m, object, output);
1.86 - }
1.87 + public void marshal(Marshaller m, T object, OutputStream output, NamespaceContext nsContext) throws JAXBException {
1.88 + bridge.marshal(m, object, output, nsContext);
1.89 + }
1.90
1.91 - public void marshal(Marshaller m, T object, OutputStream output, NamespaceContext nsContext) throws JAXBException {
1.92 - bridge.marshal(m, object, output, nsContext);
1.93 - }
1.94 + public void marshal(Marshaller m, T object, Result result) throws JAXBException {
1.95 + bridge.marshal(m, object, result);
1.96 + }
1.97
1.98 - public void marshal(Marshaller m, T object, Result result) throws JAXBException {
1.99 - bridge.marshal(m, object, result);
1.100 - }
1.101 + public void marshal(Marshaller m, T object, XMLStreamWriter output) throws JAXBException {
1.102 + bridge.marshal(m, object, output);
1.103 +// bridge.marshal(m, (T) convert(object), output);
1.104 + }
1.105
1.106 - public void marshal(Marshaller m, T object, XMLStreamWriter output) throws JAXBException {
1.107 - bridge.marshal(m, object, output);
1.108 -// bridge.marshal(m, (T) convert(object), output);
1.109 - }
1.110 -
1.111 - public final void marshal(T object, ContentHandler contentHandler, AttachmentMarshaller am) throws JAXBException {
1.112 + @Override
1.113 + public final void marshal(T object, ContentHandler contentHandler, AttachmentMarshaller am) throws JAXBException {
1.114 // bridge.marshal((T) convert(object), contentHandler, am);
1.115 - bridge.marshal(object, contentHandler, am);
1.116 - }
1.117 + bridge.marshal(object, contentHandler, am);
1.118 + }
1.119
1.120 // Object convert(Object o) {
1.121 // return (o instanceof WrapperComposite)? convertWrapper((WrapperComposite)o) : o;
1.122 @@ -140,44 +144,48 @@
1.123 // cs.bridges[i] = ((BridgeWrapper)w.bridges[i]).getBridge();
1.124 // return cs;
1.125 // }
1.126 + public void marshal(T object, ContentHandler contentHandler) throws JAXBException {
1.127 + bridge.marshal(object, contentHandler);
1.128 +// bridge.marshal((T) convert(object), contentHandler);
1.129 + }
1.130
1.131 - public void marshal(T object, ContentHandler contentHandler) throws JAXBException {
1.132 - bridge.marshal(object, contentHandler);
1.133 -// bridge.marshal((T) convert(object), contentHandler);
1.134 - }
1.135 + @Override
1.136 + public void marshal(T object, Node output) throws JAXBException {
1.137 + bridge.marshal(object, output);
1.138 +// bridge.marshal((T) convert(object), output);
1.139 + }
1.140
1.141 - public void marshal(T object, Node output) throws JAXBException {
1.142 - bridge.marshal(object, output);
1.143 -// bridge.marshal((T) convert(object), output);
1.144 - }
1.145 + @Override
1.146 + public void marshal(T object, OutputStream output, NamespaceContext nsContext, AttachmentMarshaller am) throws JAXBException {
1.147 +// bridge.marshal((T) convert(object), output, nsContext, am);
1.148 + bridge.marshal(object, output, nsContext, am);
1.149 + }
1.150
1.151 - public void marshal(T object, OutputStream output, NamespaceContext nsContext, AttachmentMarshaller am) throws JAXBException {
1.152 -// bridge.marshal((T) convert(object), output, nsContext, am);
1.153 - bridge.marshal(object, output, nsContext, am);
1.154 - }
1.155 + public void marshal(T object, OutputStream output, NamespaceContext nsContext) throws JAXBException {
1.156 + bridge.marshal(object, output, nsContext);
1.157 +// bridge.marshal((T) convert(object), output, nsContext);
1.158 + }
1.159
1.160 - public void marshal(T object, OutputStream output, NamespaceContext nsContext) throws JAXBException {
1.161 - bridge.marshal(object, output, nsContext);
1.162 -// bridge.marshal((T) convert(object), output, nsContext);
1.163 - }
1.164 + @Override
1.165 + public final void marshal(T object, Result result) throws JAXBException {
1.166 + bridge.marshal(object, result);
1.167 + }
1.168
1.169 - public final void marshal(T object, Result result) throws JAXBException {
1.170 - bridge.marshal(object, result);
1.171 - }
1.172 + @Override
1.173 + public final void marshal(T object, XMLStreamWriter output,
1.174 + AttachmentMarshaller am) throws JAXBException {
1.175 + bridge.marshal(object, output, am);
1.176 + }
1.177
1.178 - public final void marshal(T object, XMLStreamWriter output,
1.179 - AttachmentMarshaller am) throws JAXBException {
1.180 - bridge.marshal(object, output, am);
1.181 - }
1.182 + public final void marshal(T object, XMLStreamWriter output)
1.183 + throws JAXBException {
1.184 + bridge.marshal(object, output);
1.185 + }
1.186
1.187 - public final void marshal(T object, XMLStreamWriter output)
1.188 - throws JAXBException {
1.189 - bridge.marshal(object, output);
1.190 - }
1.191 -
1.192 - public String toString() {
1.193 - return BridgeWrapper.class.getName() + " : " + bridge.toString();
1.194 - }
1.195 + @Override
1.196 + public String toString() {
1.197 + return BridgeWrapper.class.getName() + " : " + bridge.toString();
1.198 + }
1.199
1.200 // public final T unmarshal(BridgeContext context, InputStream in)
1.201 // throws JAXBException {
1.202 @@ -198,58 +206,62 @@
1.203 // throws JAXBException {
1.204 // return bridge.unmarshal(context, in);
1.205 // }
1.206 + @Override
1.207 + public final T unmarshal(InputStream in) throws JAXBException {
1.208 + return bridge.unmarshal(in);
1.209 + }
1.210
1.211 - public final T unmarshal(InputStream in) throws JAXBException {
1.212 - return bridge.unmarshal(in);
1.213 + @Override
1.214 + public final T unmarshal(Node n, AttachmentUnmarshaller au)
1.215 + throws JAXBException {
1.216 + return bridge.unmarshal(n, au);
1.217 + }
1.218 +
1.219 + public final T unmarshal(Node n) throws JAXBException {
1.220 + return bridge.unmarshal(n);
1.221 + }
1.222 +
1.223 + @Override
1.224 + public final T unmarshal(Source in, AttachmentUnmarshaller au)
1.225 + throws JAXBException {
1.226 + return bridge.unmarshal(in, au);
1.227 + }
1.228 +
1.229 + public final T unmarshal(Source in) throws DatabindingException {
1.230 + try {
1.231 + return bridge.unmarshal(in);
1.232 + } catch (JAXBException e) {
1.233 + throw new DatabindingException(e);
1.234 }
1.235 + }
1.236
1.237 - public final T unmarshal(Node n, AttachmentUnmarshaller au)
1.238 - throws JAXBException {
1.239 - return bridge.unmarshal(n, au);
1.240 - }
1.241 + public T unmarshal(Unmarshaller u, InputStream in) throws JAXBException {
1.242 + return bridge.unmarshal(u, in);
1.243 + }
1.244
1.245 - public final T unmarshal(Node n) throws JAXBException {
1.246 - return bridge.unmarshal(n);
1.247 - }
1.248 + public T unmarshal(Unmarshaller context, Node n) throws JAXBException {
1.249 + return bridge.unmarshal(context, n);
1.250 + }
1.251
1.252 - public final T unmarshal(Source in, AttachmentUnmarshaller au)
1.253 - throws JAXBException {
1.254 - return bridge.unmarshal(in, au);
1.255 - }
1.256 + public T unmarshal(Unmarshaller u, Source in) throws JAXBException {
1.257 + return bridge.unmarshal(u, in);
1.258 + }
1.259
1.260 - public final T unmarshal(Source in) throws DatabindingException {
1.261 - try {
1.262 - return bridge.unmarshal(in);
1.263 - } catch (JAXBException e) {
1.264 - throw new DatabindingException(e);
1.265 - }
1.266 - }
1.267 + public T unmarshal(Unmarshaller u, XMLStreamReader in) throws JAXBException {
1.268 + return bridge.unmarshal(u, in);
1.269 + }
1.270
1.271 - public T unmarshal(Unmarshaller u, InputStream in) throws JAXBException {
1.272 - return bridge.unmarshal(u, in);
1.273 - }
1.274 + @Override
1.275 + public final T unmarshal(XMLStreamReader in, AttachmentUnmarshaller au)
1.276 + throws JAXBException {
1.277 + return bridge.unmarshal(in, au);
1.278 + }
1.279
1.280 - public T unmarshal(Unmarshaller context, Node n) throws JAXBException {
1.281 - return bridge.unmarshal(context, n);
1.282 - }
1.283 + public final T unmarshal(XMLStreamReader in) throws JAXBException {
1.284 + return bridge.unmarshal(in);
1.285 + }
1.286
1.287 - public T unmarshal(Unmarshaller u, Source in) throws JAXBException {
1.288 - return bridge.unmarshal(u, in);
1.289 - }
1.290 -
1.291 - public T unmarshal(Unmarshaller u, XMLStreamReader in) throws JAXBException {
1.292 - return bridge.unmarshal(u, in);
1.293 - }
1.294 -
1.295 - public final T unmarshal(XMLStreamReader in, AttachmentUnmarshaller au)
1.296 - throws JAXBException {
1.297 - return bridge.unmarshal(in, au);
1.298 - }
1.299 -
1.300 - public final T unmarshal(XMLStreamReader in) throws JAXBException {
1.301 - return bridge.unmarshal(in);
1.302 - }
1.303 -
1.304 + @Override
1.305 public boolean supportOutputStream() {
1.306 return true;
1.307 }
