Menu
▾
▴
[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node SimpleExpRspNode.java, 1.8, 1.9 ValueRefArrayNode.java, 1.10, 1.11 LocalClassPathNode.java, 1.9, 1.10 KeyValueNode.java, 1.12, 1.13 MethodNode.java, 1.10, 1.11 Node.java, 1.12, 1.13 ReturnValueNode.java, 1.11, 1.12 ValueObjectNode.java, 1.8, 1.9 ClassPathNode.java, 1.9, 1.10 KeyBindingNode.java, 1.7, 1.8
|
From: Dave B. <bla...@us...> - 2013-02-14 23:10:44
|
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-serv20861/src/org/sblim/cimclient/internal/cimxml/sax/node Modified Files: SimpleExpRspNode.java ValueRefArrayNode.java LocalClassPathNode.java KeyValueNode.java MethodNode.java Node.java ReturnValueNode.java ValueObjectNode.java ClassPathNode.java KeyBindingNode.java Log Message: 3602604 Clean up SAXException messages Index: Node.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/Node.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- Node.java 13 Apr 2012 13:47:34 -0000 1.12 +++ Node.java 14 Feb 2013 23:10:41 -0000 1.13 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2012 + * (C) Copyright IBM Corp. 2006, 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -23,6 +23,7 @@ * 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) * 3513353 2012-03-30 blaschke-oss TCK: CIMDataType arrays must have length >= 1 + * 3602604 2013-01-29 blaschke-oss Clean up SAXException messages */ package org.sblim.cimclient.internal.cimxml.sax.node; @@ -220,7 +221,7 @@ String arraySizeStr = pAttribs.getValue("ARRAYSIZE"); // 0 - unbounded size int size = arraySizeStr == null ? 0 : Integer.parseInt(arraySizeStr); - if (size < 0) throw new IllegalArgumentException("ARRAYSIZE cannot be " + size + " !"); + if (size < 0) throw new IllegalArgumentException("ARRAYSIZE cannot be " + size + "!"); return size; } Index: ReturnValueNode.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/ReturnValueNode.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ReturnValueNode.java 14 Mar 2011 13:17:38 -0000 1.11 +++ ReturnValueNode.java 14 Feb 2013 23:10:41 -0000 1.12 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2011 + * (C) Copyright IBM Corp. 2006, 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -21,6 +21,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) * 3194700 2011-03-01 blaschke-oss Exception thrown on extrinsic methods + * 3602604 2013-01-29 blaschke-oss Clean up SAXException messages */ package org.sblim.cimclient.internal.cimxml.sax.node; @@ -90,7 +91,7 @@ if (valNode instanceof ValueReferenceNode) { if (this.iType != null && this.iType.getType() != CIMDataType.REFERENCE) throw new SAXException( getNodeName() + " node's child node is VALUE.REFERENCE " - + "but it's type based on PARAMTYPE attribute is " + this.iType + " !"); + + "but its type based on PARAMTYPE attribute is " + this.iType + "!"); ValueReferenceNode valRefNode = (ValueReferenceNode) valNode; this.iValue = valRefNode.getCIMObjectPath(); this.iType = valRefNode.getType(); Index: ValueObjectNode.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/ValueObjectNode.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ValueObjectNode.java 10 Mar 2009 17:05:32 -0000 1.8 +++ ValueObjectNode.java 14 Feb 2013 23:10:41 -0000 1.9 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2009 + * (C) Copyright IBM Corp. 2006, 2013 * * 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) + * 3602604 2013-01-29 blaschke-oss Clean up SAXException messages */ package org.sblim.cimclient.internal.cimxml.sax.node; @@ -83,7 +84,7 @@ @Override public void testCompletness() throws SAXException { if (this.iCIMObject == null) throw new SAXException( - "VALUE.OBJECT node must have a CLASS or INSTANCE node child!"); + "VALUE.OBJECT node must have a CLASS or INSTANCE child node!"); } /** Index: SimpleExpRspNode.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/SimpleExpRspNode.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- SimpleExpRspNode.java 13 Apr 2012 12:59:51 -0000 1.8 +++ SimpleExpRspNode.java 14 Feb 2013 23:10:41 -0000 1.9 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2012 + * (C) Copyright IBM Corp. 2006, 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -20,6 +20,7 @@ * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly + * 3602604 2013-01-29 blaschke-oss Clean up SAXException messages */ package org.sblim.cimclient.internal.cimxml.sax.node; @@ -75,7 +76,7 @@ if (this.iExpMethodRspNode != null) throw new SAXException(getNodeName() + " node can have only one child node!"); if (pNodeNameEnum != EXPMETHODRESPONSE) throw new SAXException(getNodeName() - + " node child node can be EXPMETHODRESPONSE only! " + pNodeNameEnum + + " node's child node can be EXPMETHODRESPONSE only! " + pNodeNameEnum + " is invalid!"); } Index: LocalClassPathNode.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/LocalClassPathNode.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- LocalClassPathNode.java 13 May 2010 10:46:55 -0000 1.9 +++ LocalClassPathNode.java 14 Feb 2013 23:10:41 -0000 1.10 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2010 + * (C) Copyright IBM Corp. 2006, 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -21,6 +21,7 @@ * 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) * 2974884 2010-04-20 blaschke-oss Exception when attaching 2 CDRoms with invoke method + * 3602604 2013-01-29 blaschke-oss Clean up SAXException messages */ package org.sblim.cimclient.internal.cimxml.sax.node; @@ -83,7 +84,8 @@ if (this.iHasClassName) throw new SAXException( "LOCALCLASSPATH node already has a CLASSNAME child node!"); } else throw new SAXException("LOCALCLASSPATH node cannot have " + pNodeNameEnum - + " child node!" + "It can have LOCALNAMESPACEPATH and CLASSNAME child nodes only!"); + + " child node!" + + " It can have LOCALNAMESPACEPATH and CLASSNAME child nodes only!"); } @Override Index: ValueRefArrayNode.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/ValueRefArrayNode.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ValueRefArrayNode.java 16 Apr 2012 12:44:38 -0000 1.10 +++ ValueRefArrayNode.java 14 Feb 2013 23:10:41 -0000 1.11 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2012 + * (C) Copyright IBM Corp. 2006, 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -22,6 +22,7 @@ * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly * 3513349 2012-03-31 blaschke-oss TCK: CIMDataType must not accept null string + * 3602604 2013-01-29 blaschke-oss Clean up SAXException messages */ package org.sblim.cimclient.internal.cimxml.sax.node; @@ -71,7 +72,7 @@ @Override public void testChild(String pNodeNameEnum) throws SAXException { if (pNodeNameEnum != VALUE_REFERENCE) throw new SAXException( - "Child node can be VALUE_REFERENCE only while it is " + pNodeNameEnum + " !"); + "Child node can be VALUE_REFERENCE only while it is " + pNodeNameEnum + "!"); } @Override Index: MethodNode.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/MethodNode.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- MethodNode.java 12 Jun 2009 02:33:23 -0000 1.10 +++ MethodNode.java 14 Feb 2013 23:10:41 -0000 1.11 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2009 + * (C) Copyright IBM Corp. 2006, 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -22,6 +22,7 @@ * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2) * 2763216 2009-04-14 blaschke-oss Code cleanup: visible spelling/grammar errors * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics + * 3602604 2013-01-29 blaschke-oss Clean up SAXException messages */ package org.sblim.cimclient.internal.cimxml.sax.node; @@ -89,7 +90,7 @@ this.iType = getCIMType(pAttribs, false); if (this.iType != null && this.iType.isArray()) throw new SAXException( - "METHOD's node TYPE cannot be an array!"); + "METHOD node's TYPE cannot be an array!"); this.iClassOrigin = getClassOrigin(pAttribs); this.iPropagated = getPropagated(pAttribs); } Index: KeyBindingNode.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/KeyBindingNode.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- KeyBindingNode.java 12 Jun 2009 02:33:23 -0000 1.7 +++ KeyBindingNode.java 14 Feb 2013 23:10:41 -0000 1.8 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2009 + * (C) Copyright IBM Corp. 2006, 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -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) * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics + * 3602604 2013-01-29 blaschke-oss Clean up SAXException messages */ package org.sblim.cimclient.internal.cimxml.sax.node; @@ -71,7 +72,7 @@ @Override public void testChild(String pNodeNameEnum) throws SAXException { - if (this.iHasChild) throw new SAXException("KEYBINDING node can only one child node!"); + if (this.iHasChild) throw new SAXException("KEYBINDING node can only have one child node!"); if (pNodeNameEnum != KEYVALUE && pNodeNameEnum != VALUE_REFERENCE) throw new SAXException( "KEYBINDING node's child node can be KEYVALUE or VALUE_REFERENCE but not " + pNodeNameEnum); Index: ClassPathNode.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/ClassPathNode.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- ClassPathNode.java 13 Apr 2012 12:59:51 -0000 1.9 +++ ClassPathNode.java 14 Feb 2013 23:10:41 -0000 1.10 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2012 + * (C) Copyright IBM Corp. 2006, 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -20,6 +20,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) * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly + * 3602604 2013-01-29 blaschke-oss Clean up SAXException messages */ package org.sblim.cimclient.internal.cimxml.sax.node; @@ -81,7 +82,7 @@ if (this.iHasClassName) throw new SAXException( "CLASSPATH node already has a CLASSNAME child node!"); } else throw new SAXException("CLASSPATH node cannot have " + pNodeNameEnum - + " child node!" + "It can have NAMESPACEPATH and CLASSNAME child nodes only!"); + + " child node!" + " It can have NAMESPACEPATH and CLASSNAME child nodes only!"); } @Override Index: KeyValueNode.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/KeyValueNode.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- KeyValueNode.java 15 Nov 2012 14:46:04 -0000 1.12 +++ KeyValueNode.java 14 Feb 2013 23:10:41 -0000 1.13 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2012 + * (C) Copyright IBM Corp. 2006, 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -23,6 +23,7 @@ * 2763216 2009-04-14 blaschke-oss Code cleanup: visible spelling/grammar errors * 2823494 2009-08-03 rgummada Change Boolean constructor to static * 3572993 2012-10-01 blaschke-oss parseDouble("2.2250738585072012e-308") DoS vulnerability + * 3602604 2013-01-29 blaschke-oss Clean up SAXException messages */ package org.sblim.cimclient.internal.cimxml.sax.node; @@ -124,7 +125,7 @@ if (this.iValueTypeStr.equals("numeric")) { if (!setUInt64(pValue) && !setSInt64(pValue) && !setReal64(pValue)) throw new SAXException( - "Unparseable \"number\" value: " + pValue + " !"); + "Unparseable \"number\" value: " + pValue + "!"); } else if (this.iValueTypeStr.equals(MOF.DT_STR)) { if (!setDTAbsolute(pValue) && !setDTInterval(pValue)) { this.iValue = pValue; @@ -132,7 +133,7 @@ } } else if (this.iValueTypeStr.equals(MOF.DT_BOOL)) { if (!setBoolean(pValue)) throw new SAXException("Unparseable \"boolean\" value: " - + pValue + " !"); + + pValue + "!"); } else { throw new SAXException("KEYVALUE node's VALUETYPE attribute must be " + MOF.DT_STR + ", " + MOF.DT_BOOL + " or numeric! " + pValue + " is not allowed!"); |
