Menu
▾
▴
[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node IMethodCallNode.java, 1.1.2.8, 1.1.2.9 MethodCallNode.java, 1.1.2.7, 1.1.2.8 AbstractMethodCallNode.java, 1.1.2.11, 1.1.2.12 ResponseDestinationNode.java, 1.1.2.8, NONE
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4211/src/org/sblim/cimclient/internal/cimxml/sax/node Modified Files: Tag: Experimental IMethodCallNode.java MethodCallNode.java AbstractMethodCallNode.java Removed Files: Tag: Experimental ResponseDestinationNode.java Log Message: 2690 Remove RESPONSEDESTINATION support Index: MethodCallNode.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/MethodCallNode.java,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -u -d -r1.1.2.7 -r1.1.2.8 --- MethodCallNode.java 2 Oct 2013 19:20:52 -0000 1.1.2.7 +++ MethodCallNode.java 11 Oct 2013 15:11:42 -0000 1.1.2.8 @@ -19,6 +19,7 @@ * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) * 2682 2013-10-02 blaschke-oss (I)MethodCallNode allows no LOCAL*PATH + * 2690 2013-10-11 blaschke-oss Remove RESPONSEDESTINATION support */ package org.sblim.cimclient.internal.cimxml.sax.node; @@ -26,8 +27,8 @@ import org.xml.sax.SAXException; /** - * ELEMENT METHODCALL ((LOCALINSTANCEPATH | LOCALCLASSPATH), PARAMVALUE*, - * RESPONSEDESTINATION?) ATTLIST METHODCALL %CIMName; + * ELEMENT METHODCALL ((LOCALINSTANCEPATH | LOCALCLASSPATH), PARAMVALUE*) + * ATTLIST METHODCALL %CIMName; */ public class MethodCallNode extends AbstractMethodCallNode { Index: IMethodCallNode.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/IMethodCallNode.java,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -u -d -r1.1.2.8 -r1.1.2.9 --- IMethodCallNode.java 2 Oct 2013 19:20:52 -0000 1.1.2.8 +++ IMethodCallNode.java 11 Oct 2013 15:11:42 -0000 1.1.2.9 @@ -19,6 +19,7 @@ * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) * 2682 2013-10-02 blaschke-oss (I)MethodCallNode allows no LOCAL*PATH + * 2690 2013-10-11 blaschke-oss Remove RESPONSEDESTINATION support */ package org.sblim.cimclient.internal.cimxml.sax.node; @@ -26,8 +27,8 @@ import org.xml.sax.SAXException; /** - * ELEMENT IMETHODCALL (LOCALNAMESPACEPATH, IPARAMVALUE*, RESPONSEDESTINATION?) - * ATTLIST IMETHODCALL %CIMName; + * ELEMENT IMETHODCALL (LOCALNAMESPACEPATH, IPARAMVALUE*) ATTLIST IMETHODCALL + * %CIMName; */ public class IMethodCallNode extends AbstractMethodCallNode { Index: AbstractMethodCallNode.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/AbstractMethodCallNode.java,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -u -d -r1.1.2.11 -r1.1.2.12 --- AbstractMethodCallNode.java 2 Oct 2013 19:20:52 -0000 1.1.2.11 +++ AbstractMethodCallNode.java 11 Oct 2013 15:11:42 -0000 1.1.2.12 @@ -22,6 +22,7 @@ * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly * 2682 2013-10-02 blaschke-oss (I)MethodCallNode allows no LOCAL*PATH + * 2690 2013-10-11 blaschke-oss Remove RESPONSEDESTINATION support */ package org.sblim.cimclient.internal.cimxml.sax.node; @@ -38,11 +39,11 @@ /** * <pre> - * ELEMENT IMETHODCALL (LOCALNAMESPACEPATH, IPARAMVALUE*, RESPONSEDESTINATION?) + * ELEMENT IMETHODCALL (LOCALNAMESPACEPATH, IPARAMVALUE*) * ATTLIST IMETHODCALL * %CIMName; * - * ELEMENT METHODCALL ((LOCALINSTANCEPATH | LOCALCLASSPATH), PARAMVALUE*, RESPONSEDESTINATION?) + * ELEMENT METHODCALL ((LOCALINSTANCEPATH | LOCALCLASSPATH), PARAMVALUE*) * ATTLIST METHODCALL * %CIMName; * </pre> @@ -53,8 +54,6 @@ protected CIMObjectPath iPath; - private ResponseDestinationNode iRespDstNode; - /** * (IPARAMVALUE | PARAMVALUE)* -> ArrayList of CIMArgument */ @@ -81,7 +80,6 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException { this.iName = getCIMName(pAttribs); this.iPath = null; - this.iRespDstNode = null; this.iArgAL = null; this.iArgA = null; } @@ -100,8 +98,6 @@ } else if (pChild instanceof AbstractParamValueNode) { if (this.iArgAL == null) this.iArgAL = new ArrayList<CIMArgument<?>>(); this.iArgAL.add(((AbstractParamValueNode) pChild).getCIMArgument()); - } else { - this.iRespDstNode = (ResponseDestinationNode) pChild; } } @@ -117,12 +113,7 @@ @Override public void testChild(String pNodeNameEnum) throws SAXException { - if (pNodeNameEnum == RESPONSEDESTINATION) { - if (this.iRespDstNode != null) throw new SAXException(getNodeName() - + " node can have only one " + RESPONSEDESTINATION + " child node!"); - } else { - testSpecChild(pNodeNameEnum); - } + testSpecChild(pNodeNameEnum); } /** --- ResponseDestinationNode.java DELETED --- |
