From: Dave B. <bla...@us...> - 2012-05-09 14:18:46
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node In directory vz-cvs-3.sog:/tmp/cvs-serv28056/src/org/sblim/cimclient/internal/cimxml/sax/node Modified Files: QualiDeclNode.java LocalNameSpacePathNode.java Log Message: 3521119 - JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors Index: LocalNameSpacePathNode.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/LocalNameSpacePathNode.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- LocalNameSpacePathNode.java 10 Mar 2009 17:05:32 -0000 1.8 +++ LocalNameSpacePathNode.java 9 May 2012 14:18:44 -0000 1.9 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2009 + * (C) Copyright IBM Corp. 2006, 2012 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -19,7 +19,8 @@ * 1720707 2007-05-17 ebak Conventional Node factory for CIM-XML SAX parser * 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) - * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2) + * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2) + * 3521119 2012-04-24 blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors */ package org.sblim.cimclient.internal.cimxml.sax.node; @@ -107,7 +108,7 @@ public CIMObjectPath getCIMObjectPath() { if (this.iNameSpacePath != null) return this.iNameSpacePath; - return this.iNameSpacePath = new CIMObjectPath(null, getNameSpace()); + return this.iNameSpacePath = new CIMObjectPath(null, null, null, getNameSpace(), null, null); } } Index: QualiDeclNode.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/QualiDeclNode.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- QualiDeclNode.java 13 Apr 2012 13:47:34 -0000 1.10 +++ QualiDeclNode.java 9 May 2012 14:18:44 -0000 1.11 @@ -23,6 +23,7 @@ * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly * 3513353 2012-03-30 blaschke-oss TCK: CIMDataType arrays must have length >= 1 + * 3521119 2012-04-24 blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors */ package org.sblim.cimclient.internal.cimxml.sax.node; @@ -185,8 +186,8 @@ * CIMQualifierType( CIMObjectPath pPath, CIMDataType pType, Object * pValue, int pScope, int pFlavor ) */ - return new CIMQualifierType<Object>(new CIMObjectPath(this.iName, null), this.iType, - this.iValue, this.iScope, this.iFlavor); + return new CIMQualifierType<Object>(new CIMObjectPath(null, null, null, null, this.iName, + null), this.iType, this.iValue, this.iScope, this.iFlavor); } public Object getValue() { |