1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java Mon Sep 29 11:50:34 2014 -0700
1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java Sun Aug 31 16:14:36 2014 +0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -99,10 +99,10 @@
1.11 @Override
1.12 public void startElement(UnmarshallingContext.State state, TagName ea) throws SAXException {
1.13 UnmarshallingContext context = state.getContext();
1.14 - if (state.target == null)
1.15 - state.target = new State(context);
1.16 + if (state.getTarget() == null)
1.17 + state.setTarget(new State(context));
1.18
1.19 - State s = (State) state.target;
1.20 + State s = (State) state.getTarget();
1.21 try {
1.22 s.declarePrefixes(context, context.getNewlyDeclaredPrefixes());
1.23 s.handler.startElement(ea.uri, ea.local, ea.getQname(), ea.atts);
1.24 @@ -114,10 +114,10 @@
1.25
1.26 @Override
1.27 public void childElement(UnmarshallingContext.State state, TagName ea) throws SAXException {
1.28 - state.loader = this;
1.29 - State s = (State) state.prev.target;
1.30 + state.setLoader(this);
1.31 + State s = (State) state.getPrev().getTarget();
1.32 s.depth++;
1.33 - state.target = s;
1.34 + state.setTarget(s);
1.35 }
1.36
1.37 @Override
1.38 @@ -125,7 +125,7 @@
1.39 if(text.length()==0)
1.40 return; // there's no point in creating an empty Text node in DOM.
1.41 try {
1.42 - State s = (State) state.target;
1.43 + State s = (State) state.getTarget();
1.44 s.handler.characters(text.toString().toCharArray(),0,text.length());
1.45 } catch( SAXException e ) {
1.46 state.getContext().handleError(e);
1.47 @@ -135,7 +135,7 @@
1.48
1.49 @Override
1.50 public void leaveElement(UnmarshallingContext.State state, TagName ea) throws SAXException {
1.51 - State s = (State) state.target;
1.52 + State s = (State) state.getTarget();
1.53 UnmarshallingContext context = state.getContext();
1.54
1.55 try {
1.56 @@ -157,7 +157,7 @@
1.57 }
1.58
1.59 // we are done
1.60 - state.target = s.getElement();
1.61 + state.setTarget(s.getElement());
1.62 }
1.63 }
1.64
