From: Dave B. <bla...@us...> - 2013-12-11 16:19:19
|
Update of /cvsroot/sblim/jsr48-client/src/javax/cim In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23307/src/javax/cim Modified Files: Tag: Experimental UnsignedInteger64.java UnsignedInteger32.java CIMObjectPath.java CIMValuedElement.java CIMClass.java UnsignedInteger16.java CIMDateTimeInterval.java UnsignedInteger8.java CIMDateTimeAbsolute.java CIMElement.java Log Message: 2716 Sync up javax.* javadoc with JSR48 1.0.0 Final V Index: CIMDateTimeInterval.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMDateTimeInterval.java,v retrieving revision 1.5.2.21 retrieving revision 1.5.2.22 diff -u -d -r1.5.2.21 -r1.5.2.22 --- CIMDateTimeInterval.java 11 Oct 2013 10:12:42 -0000 1.5.2.21 +++ CIMDateTimeInterval.java 11 Dec 2013 16:19:16 -0000 1.5.2.22 @@ -32,6 +32,7 @@ * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods * 2674 2013-09-26 blaschke-oss Null pointer exception in CIMDateTime(String) + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V */ package javax.cim; @@ -39,7 +40,7 @@ import org.sblim.cimclient.internal.cim.DTStringReader; import org.sblim.cimclient.internal.cim.DTStringWriter; -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:58 EST 2010 +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 /** * This class represents the datetime data type when used as a time value as * specified by the Distributed Management Task Force (<a @@ -118,6 +119,7 @@ * @param pMicroseconds * Number of microseconds in the interval (-1 - 999999). * @throws IllegalArgumentException + * If any value is not valid. */ public CIMDateTimeInterval(int pDays, int pHours, int pMinutes, int pSeconds, int pMicroseconds) throws IllegalArgumentException { @@ -192,7 +194,7 @@ * @param pIntervalString * A string in the format of ddddddddHHMMSS.mmmmmm:000. * @throws IllegalArgumentException - * If string is not in the correct format. + * If string is not in the correct format or <code>null</code>. */ public CIMDateTimeInterval(String pIntervalString) throws IllegalArgumentException { if (pIntervalString == null) throw new IllegalArgumentException( Index: UnsignedInteger32.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/UnsignedInteger32.java,v retrieving revision 1.4.2.12 retrieving revision 1.4.2.13 diff -u -d -r1.4.2.12 -r1.4.2.13 --- UnsignedInteger32.java 10 Dec 2013 20:28:52 -0000 1.4.2.12 +++ UnsignedInteger32.java 11 Dec 2013 16:19:14 -0000 1.4.2.13 @@ -22,11 +22,12 @@ * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 * 2973233 2010-03-19 blaschke-oss TCK: UnsignedIntegerNN.hashCode() not working * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V */ package javax.cim; -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 /** * This class represents an <code>UnsignedInteger32</code>. A * <code>uint32</code> data type is defined by the (<a @@ -88,6 +89,8 @@ * The string to be represented as an unsigned 32-bit integer. * @throws NumberFormatException * If the number is out of range. + * @throws IllegalArgumentException + * If value is <code>null</code>. */ public UnsignedInteger32(String pValue) throws NumberFormatException { if (pValue == null) throw new IllegalArgumentException("String value cannot be null!"); @@ -103,6 +106,11 @@ * The Object to be compared. * @return A negative integer, zero, or a positive integer as this object is * less than, equal to, or greater than the specified object. + * @throws ClassCastException + * If the specified object's type prevents it from being + * compared to this Object. + * @throws IllegalArgumentException + * If value is <code>null</code>. */ public int compareTo(UnsignedInteger32 pOther) { if (pOther == null) throw new IllegalArgumentException( Index: CIMElement.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMElement.java,v retrieving revision 1.3.2.12 retrieving revision 1.3.2.13 diff -u -d -r1.3.2.12 -r1.3.2.13 --- CIMElement.java 15 Sep 2011 22:13:05 -0000 1.3.2.12 +++ CIMElement.java 11 Dec 2013 16:19:16 -0000 1.3.2.13 @@ -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 @@ -22,13 +22,14 @@ * 2795671 2009-05-22 raman_arora Add Type to Comparable <T> * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 * 3410126 2011-09-15 blaschke-oss TCK: CIM element name cannot be null + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V */ package javax.cim; import java.io.Serializable; -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:58 EST 2010 +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 /** * <code>CIMElement</code> is an abstract base class that represents a CIM * Element as defined by the Distributed Management Task Force (<a @@ -47,6 +48,8 @@ * * @param pName * The string for the name of the element. + * @throws IllegalArgumentException + * If name is <code>null</code>. */ public CIMElement(String pName) { if (pName == null) throw new IllegalArgumentException("CIM element name cannot be null"); Index: CIMClass.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMClass.java,v retrieving revision 1.9.2.21 retrieving revision 1.9.2.22 diff -u -d -r1.9.2.21 -r1.9.2.22 --- CIMClass.java 10 Dec 2013 19:16:22 -0000 1.9.2.21 +++ CIMClass.java 11 Dec 2013 16:19:15 -0000 1.9.2.22 @@ -32,6 +32,7 @@ * 3521119 2012-04-24 blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V */ package javax.cim; @@ -44,7 +45,7 @@ import org.sblim.cimclient.internal.cim.CIMQualifiedElementInterfaceImpl; import org.sblim.cimclient.internal.util.MOF; -//Sync'd against JSR48 1.0.0 javadoc (build 1.6.0_18) on Thu Mar 01 12:21:26 EST 2012 +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 /** * This class represents a CIM class as defined by the Distributed Management * Task Force (<a href=http://www.dmtf.org>DMTF</a>) CIM Infrastructure @@ -101,6 +102,9 @@ * @param pIsKeyed * <code>true</code> if the CIM class has Keys, * <code>false</code> otherwise. + * @throws IllegalArgumentException + * If pPath is null. + * */ public CIMClass(CIMObjectPath pPath, String pSuperClass, CIMQualifier<?>[] pQualifiers, CIMClassProperty<?>[] pProperties, CIMMethod<?>[] pMethods, boolean pIsAssociation, @@ -140,6 +144,8 @@ * List of properties of the CIM class. * @param pMethods * List of methods of the CIM class. + * @throws IllegalArgumentException + * If pName is null. */ public CIMClass(String pName, String pSuperClass, CIMQualifier<?>[] pQualifiers, CIMClassProperty<?>[] pProperties, CIMMethod<?>[] pMethods) { Index: CIMValuedElement.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMValuedElement.java,v retrieving revision 1.6.2.10 retrieving revision 1.6.2.11 diff -u -d -r1.6.2.10 -r1.6.2.11 --- CIMValuedElement.java 20 Sep 2011 15:53:14 -0000 1.6.2.10 +++ CIMValuedElement.java 11 Dec 2013 16:19:15 -0000 1.6.2.11 @@ -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 @@ -20,6 +20,7 @@ * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues * 3411879 2011-09-20 blaschke-oss TCK: CIM element value must match type + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V */ package javax.cim; @@ -28,7 +29,7 @@ import org.sblim.cimclient.internal.util.MOF; -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 /** * <code>CIMValuedElement</code> is a base class used by any element that * contains a name, type and value. @@ -52,6 +53,8 @@ * @param pValue * The value for this element. <code>null</code> is a valid * value. + * @throws IllegalArgumentException + * If the value does not match the data type. */ protected CIMValuedElement(String pName, CIMDataType pType, E pValue) { super(pName, pType); Index: UnsignedInteger64.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/UnsignedInteger64.java,v retrieving revision 1.4.2.10 retrieving revision 1.4.2.11 diff -u -d -r1.4.2.10 -r1.4.2.11 --- UnsignedInteger64.java 10 Dec 2013 20:28:52 -0000 1.4.2.10 +++ UnsignedInteger64.java 11 Dec 2013 16:19:14 -0000 1.4.2.11 @@ -21,13 +21,14 @@ * 2935258 2010-01-19 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 * 2973230 2010-03-19 blaschke-oss TCK: UnsignedInteger64.equals() does not handle null * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V */ package javax.cim; import java.math.BigInteger; -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 /** * This class represents an <code>UnsignedInteger64</code>. A * <code>uint64</code> data type is defined by the (<a @@ -77,6 +78,8 @@ * 64-bit integer. * @throws NumberFormatException * If the number is out of range. + * @throws IllegalArgumentException + * If value is <code>null</code>. */ public UnsignedInteger64(BigInteger pValue) throws NumberFormatException { if (pValue == null) throw new IllegalArgumentException("BigInteger value cannot be null!"); @@ -92,6 +95,8 @@ * integer. * @throws NumberFormatException * If the number is out of range. + * @throws IllegalArgumentException + * If value is <code>null</code>. */ public UnsignedInteger64(byte[] pValue) throws NumberFormatException { if (pValue == null) throw new IllegalArgumentException("byte[] value cannot be null!"); @@ -106,6 +111,8 @@ * The string to be represented as an unsigned 64-bit integer. * @throws NumberFormatException * If the number is out of range. + * @throws IllegalArgumentException + * If value is <code>null</code>. */ public UnsignedInteger64(String pValue) throws NumberFormatException { if (pValue == null) throw new IllegalArgumentException("String value cannot be null!"); @@ -130,6 +137,11 @@ * The Object to be compared. * @return A negative integer, zero, or a positive integer as this object is * less than, equal to, or greater than the specified object. + * @throws ClassCastException + * If the specified object's type prevents it from being + * compared to this Object. + * @throws IllegalArgumentException + * If value is <code>null</code>. */ public int compareTo(UnsignedInteger64 pOther) { if (pOther == null) throw new IllegalArgumentException( Index: CIMObjectPath.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMObjectPath.java,v retrieving revision 1.11.2.25 retrieving revision 1.11.2.26 diff -u -d -r1.11.2.25 -r1.11.2.26 --- CIMObjectPath.java 12 Sep 2013 14:18:14 -0000 1.11.2.25 +++ CIMObjectPath.java 11 Dec 2013 16:19:15 -0000 1.11.2.26 @@ -34,6 +34,7 @@ * 3521119 2012-04-24 blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors * 3529151 2012-08-22 blaschke-oss TCK: CIMInstance property APIs include keys from COP * 2660 2013-09-04 blaschke-oss CIMObjectPath.equalsModelPath same as equals + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V */ package javax.cim; @@ -58,14 +59,15 @@ import org.sblim.cimclient.internal.uri.Value; import org.sblim.cimclient.internal.util.MOF; -//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_02) on Sun Apr 22 15:31:53 EDT 2012 +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 /** * This class represents the CIM Object Path as defined by the Distributed * Management Task Force (<a href=http://www.dmtf.org>DMTF</a>) CIM - * Infrastructure Specification (<a - * href=http://www.dmtf.org/standards/published_documents/DSP0004V2.3_final.pdf + * Infrastructure Specification (<a href= + * "http://dmtf.org/sites/default/files/standards/documents/DSP0004_2.7.0.pdf" * >DSP004</a>). In order to uniquely identify a given object, a CIM object path - * includes the namespace, object name and keys (if the object is an instance). <br> + * includes the host, namespace, object name and keys (if the object is an + * instance).<br> * <br> * For example, the object path:<br> * <br> @@ -76,14 +78,23 @@ * <br> * has two parts:<br> * <br> - * <ul type="disc"> <li> <code>http://myserver/root/cimv2</code>- Specifies the - * <code>"root/cimv2"</code> namespace on the host <code>myserver</code>.</li> - * <li> + * <ul type="disc"> <li>Namespace Path</li> + * <code>http://myserver/root/cimv2</code><br> + * JSR48 defines the namespace path to include the scheme, host, port (optional) + * and namespace<br> + * The example specifies the <code>"root/cimv2"</code> namespace on the host + * <code>myserver</code>.</li> <li>Model Path</li> * <code>My_ComputerSystem.Name=mycomputer,CreationClassName=My_ComputerSystem - * </code> - Specifies a <code>My_ComputerSystem</code> object which is - * uniquely identified by two key properties and their corresponding values in - * the format (key=value): <ul type="disc"> <li><code>Name=mycomputer</code></li> - * <li><code>CreationClassName=My_ComputerSystem</code></li> </ul> </li> </ul> + * </code><br> + * DSP0004 defines the model path for a class or qualifier type as the name of + * the class/qualifier type<br> + * DSP0004 defines the model path for an instance as the class + * name.(key=value),*<br> + * The example specifies an instance for the class + * <code>My_ComputerSystem</code> which is uniquely identified by two key + * properties and values: <ul type="disc"> <li><code>Name=mycomputer</code></li> + * <li> + * <code>CreationClassName=My_ComputerSystem</code></li> </ul> </ul> */ public class CIMObjectPath extends Object implements Serializable { @@ -514,7 +525,10 @@ } /** - * Compares this model path with the specified model path for equality. + * Compares this model path with the specified model path for equality. If + * the model path includes references, then the references will also be + * compared for the model path (i.e. the namespace part of the object path + * will be ignored). * * @param pModelPath * The object to compare. Index: UnsignedInteger16.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/UnsignedInteger16.java,v retrieving revision 1.4.2.12 retrieving revision 1.4.2.13 diff -u -d -r1.4.2.12 -r1.4.2.13 --- UnsignedInteger16.java 10 Dec 2013 20:28:52 -0000 1.4.2.12 +++ UnsignedInteger16.java 11 Dec 2013 16:19:15 -0000 1.4.2.13 @@ -22,11 +22,12 @@ * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 * 2973233 2010-03-19 blaschke-oss TCK: UnsignedIntegerNN.hashCode() not working * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V */ package javax.cim; -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 /** * This class represents an <code>UnsignedInteger16</code>. A * <code>uint16</code> data type is defined by the (<a @@ -88,6 +89,8 @@ * The string to be represented as an unsigned 16-bit integer. * @throws NumberFormatException * If the number is out of range. + * @throws IllegalArgumentException + * If value is <code>null</code>. */ public UnsignedInteger16(String pValue) throws NumberFormatException { if (pValue == null) throw new IllegalArgumentException("String value cannot be null!"); @@ -103,6 +106,11 @@ * The Object to be compared. * @return A negative integer, zero, or a positive integer as this object is * less than, equal to, or greater than the specified object. + * @throws ClassCastException + * If the specified object's type prevents it from being + * compared to this Object. + * @throws IllegalArgumentException + * If value is <code>null</code>. */ public int compareTo(UnsignedInteger16 pOther) { if (pOther == null) throw new IllegalArgumentException( Index: CIMDateTimeAbsolute.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMDateTimeAbsolute.java,v retrieving revision 1.7.2.19 retrieving revision 1.7.2.20 diff -u -d -r1.7.2.19 -r1.7.2.20 --- CIMDateTimeAbsolute.java 26 Sep 2013 23:23:56 -0000 1.7.2.19 +++ CIMDateTimeAbsolute.java 11 Dec 2013 16:19:16 -0000 1.7.2.20 @@ -28,6 +28,7 @@ * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods * 2674 2013-09-26 blaschke-oss Null pointer exception in CIMDateTime(String) + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V */ package javax.cim; @@ -37,7 +38,7 @@ import org.sblim.cimclient.internal.cim.DTStringReader; import org.sblim.cimclient.internal.cim.DTStringWriter; -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:58 EST 2010 +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 /** * This class represents the datetime data type when used as a time value as * specified in the CIM Infrastructure specification. It is in the format @@ -99,7 +100,7 @@ * @param pDateTime * A string in the format of yyyyMMddHHmmss.SSSSSSsutc. * @throws IllegalArgumentException - * If string is not in the correct format. + * If string is not in the correct format or <code>null</code>. */ public CIMDateTimeAbsolute(String pDateTime) throws IllegalArgumentException { if (pDateTime == null) throw new IllegalArgumentException("Null DateTime is not allowed!"); Index: UnsignedInteger8.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/UnsignedInteger8.java,v retrieving revision 1.4.2.13 retrieving revision 1.4.2.14 diff -u -d -r1.4.2.13 -r1.4.2.14 --- UnsignedInteger8.java 10 Dec 2013 20:28:52 -0000 1.4.2.13 +++ UnsignedInteger8.java 11 Dec 2013 16:19:16 -0000 1.4.2.14 @@ -23,11 +23,12 @@ * 2944833 2010-02-08 blaschke-oss Need private setValue in UnsignedInteger8 * 2973233 2010-03-19 blaschke-oss TCK: UnsignedIntegerNN.hashCode() not working * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V */ package javax.cim; -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 /** * This class represents an <code>UnsignedInteger8</code>. A <code>uint8</code> * data type is defined by the (<a href=http://www.dmtf.org>DMTF</a>) CIM @@ -90,6 +91,8 @@ * The string to be represented as an unsigned 8-bit integer. * @throws NumberFormatException * If the number is out of range. + * @throws IllegalArgumentException + * If value is <code>null</code>. */ public UnsignedInteger8(String pValue) throws NumberFormatException { if (pValue == null) throw new IllegalArgumentException("String value cannot be null!"); @@ -105,6 +108,11 @@ * The Object to be compared. * @return A negative integer, zero, or a positive integer as this object is * less than, equal to, or greater than the specified object. + * @throws ClassCastException + * If the specified object's type prevents it from being + * compared to this Object. + * @throws IllegalArgumentException + * If value is <code>null</code>. */ public int compareTo(UnsignedInteger8 pOther) { if (pOther == null) throw new IllegalArgumentException( |