Menu
▾
▴
[Sblim-commit] jsr48-client/src/javax/cim CIMClass.java, 1.25, 1.26 CIMProperty.java, 1.17, 1.18 CIMDateTime.java, 1.12, 1.13
|
From: Dave B. <bla...@us...> - 2012-03-14 10:39:55
|
Update of /cvsroot/sblim/jsr48-client/src/javax/cim
In directory vz-cvs-3.sog:/tmp/cvs-serv32687/src/javax/cim
Modified Files:
CIMClass.java CIMProperty.java CIMDateTime.java
Log Message:
3496301 - Sync up javax.* javadoc with JSR48 1.0.0 Final
Index: CIMProperty.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMProperty.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- CIMProperty.java 8 Sep 2011 13:03:52 -0000 1.17
+++ CIMProperty.java 14 Mar 2012 10:39:53 -0000 1.18
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2011
+ * (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
@@ -21,13 +21,14 @@
* 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
* 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
+ * 3496301 2012-03-02 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final
*/
package javax.cim;
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 (build 1.6.0_18) on Thu Mar 01 12:21:26 EST 2012
/**
* This class represents a CIM Property as defined by the Distributed Management
* Task Force (<a href=http://www.dmtf.org>DMTF</a>) CIM Infrastructure
@@ -52,7 +53,7 @@
/**
* Constructs a <code>CIMProperty</code> to be used in instances. For a
- * <code>CIMClass</code>, <code>CIMClassProperty</code> should be used. This
+ * <code>CIMClass</code>, <code>CIMClassProperty</code> shall be used. This
* can only be used for non-Key properties, non-propagated properties and
* when the the origin class is not needed.
*
@@ -69,7 +70,7 @@
/**
* Constructs a <code>CIMProperty</code> to be used in instances. For a
- * <code>CIMClass</code>, <code>CIMClassProperty</code> should be used.
+ * <code>CIMClass</code>, <code>CIMClassProperty</code> shall be used.
*
* @param pName
* The name of the property.
Index: CIMClass.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMClass.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- CIMClass.java 8 Sep 2011 13:03:52 -0000 1.25
+++ CIMClass.java 14 Mar 2012 10:39:53 -0000 1.26
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2011
+ * (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
@@ -27,6 +27,7 @@
* 2944842 2010-02-08 blaschke-oss Missing thrown ArrayIndexOutOfBoundsException
* 2975917 2010-03-24 blaschke-oss TCK: CIMClass.getProperty() does not handle null property
* 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues
+ * 3496301 2012-03-02 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final
*/
package javax.cim;
@@ -39,7 +40,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.5.0_10) on Wed Jan 20 02:20:58 EST 2010
+//Sync'd against JSR48 1.0.0 javadoc (build 1.6.0_18) on Thu Mar 01 12:21:26 EST 2012
/**
* This class represents a CIM class as defined by the Distributed Management
* Task Force (<a href=http://www.dmtf.org>DMTF</a>) CIM Infrastructure
@@ -74,7 +75,11 @@
private boolean iIsAssoc;
/**
- * Creates and instantiates a Java object representing a CIM Class.
+ * Creates and instantiates a Java object representing a CIM Class. This
+ * method may or may not validate the <code>isAssociation</code> and
+ * <code>isKeyed</code>. If an invalid value is supplied (i.e. the class is
+ * an association, but the <code>isAssociation</code> was set to
+ * <code>false</code>), it may or may not be corrected.
*
* @param pPath
* Object Name of the CIM class.
@@ -82,7 +87,7 @@
* Name of the superclass.
* @param pQualifiers
* List of qualifiers of the CIM class.
- * @param pProps
+ * @param pProperties
* List of properties of the CIM class.
* @param pMethods
* List of methods of the CIM class.
@@ -94,22 +99,24 @@
* <code>false</code> otherwise.
*/
public CIMClass(CIMObjectPath pPath, String pSuperClass, CIMQualifier<?>[] pQualifiers,
- CIMClassProperty<?>[] pProps, CIMMethod<?>[] pMethods, boolean pIsAssociation,
+ CIMClassProperty<?>[] pProperties, CIMMethod<?>[] pMethods, boolean pIsAssociation,
boolean pIsKeyed) {
super(pPath.getObjectName());
this.iObjPath = pPath;
this.iSuperClass = pSuperClass;
this.iQualiImpl = new CIMQualifiedElementInterfaceImpl(pQualifiers, false, false,
pIsAssociation);
- this.iProps = (CIMClassProperty[]) CIMElementSorter.sort(pProps);
+ this.iProps = (CIMClassProperty[]) CIMElementSorter.sort(pProperties);
this.iMethods = (CIMMethod[]) CIMElementSorter.sort(pMethods);
this.iIsAssoc = pIsAssociation;
// ignoring pIsKeyed
- this.iIsKeyed = hasKey(pProps);
+ this.iIsKeyed = hasKey(pProperties);
}
/**
- * Creates and instantiates a Java object representing a CIM Class.
+ * Creates and instantiates a Java object representing a CIM Class. This
+ * constructor will inspect the class to determine if it is an association
+ * or has keys.
*
* @param pName
* Name of the CIM class.
@@ -117,21 +124,21 @@
* Name of the superclass.
* @param pQualifiers
* List of qualifiers of the CIM class.
- * @param pProps
+ * @param pProperties
* List of properties of the CIM class.
* @param pMethods
* List of methods of the CIM class.
*/
public CIMClass(String pName, String pSuperClass, CIMQualifier<?>[] pQualifiers,
- CIMClassProperty<?>[] pProps, CIMMethod<?>[] pMethods) {
+ CIMClassProperty<?>[] pProperties, CIMMethod<?>[] pMethods) {
super(pName);
this.iObjPath = new CIMObjectPath(pName, null);
this.iSuperClass = pSuperClass;
this.iQualiImpl = new CIMQualifiedElementInterfaceImpl(pQualifiers);
- this.iProps = (CIMClassProperty[]) CIMElementSorter.sort(pProps);
+ this.iProps = (CIMClassProperty[]) CIMElementSorter.sort(pProperties);
this.iMethods = (CIMMethod[]) CIMElementSorter.sort(pMethods);
this.iIsAssoc = this.iQualiImpl.hasQualifierValue("Association", Boolean.TRUE);
- this.iIsKeyed = hasKey(pProps);
+ this.iIsKeyed = hasKey(pProperties);
}
/**
Index: CIMDateTime.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMDateTime.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- CIMDateTime.java 18 Feb 2010 21:50:01 -0000 1.12
+++ CIMDateTime.java 14 Mar 2012 10:39:53 -0000 1.13
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2010
+ * (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
@@ -17,18 +17,19 @@
* 2204488 2008-10-28 raman_arora Fix code to remove compiler warnings
* 2227442 2008-11-05 blaschke-oss Add missing serialVersionUID
* 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)
* 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
+ * 3496301 2012-03-02 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final
*/
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 (build 1.6.0_18) on Thu Mar 01 12:21:26 EST 2012
/**
- * This abstract class represents a CIM datetime data type as defined by the
+ * This abstract class represents a CIM Datetime data type 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
@@ -54,7 +55,7 @@
* zero-padded so that the entire string is always the same 25-character length.
* Fields which are not significant must be replaced with asterisk characters.
* Similarly, intervals use the same format, except that the interpretation of
- * the field is based on elapsed time. <br>
+ * the fields is based on elapsed time. <br>
* For example, the interval datetime for an elapsed time of 1 day, 13 hours, 23
* minutes, 12 seconds would be: 00000001132312.000000:000. A UTC offset of zero
* is always used for interval properties.
|
