[Cdk-commits] CVS: cdk/src/org/openscience/cdk/qsar/descriptors/molecular HBondAcceptorCountDescriptor.java,1.4,1.5 RotatableBondsCountDescriptor.java,1.4,1.5 RuleOfFiveDescriptor.java,1.5,1.6 TPSADescriptor.java,1.4,1.5

[Rajarshi G. <raj...@us...>]

Update of /cvsroot/cdk/cdk/src/org/openscience/cdk/qsar/descriptors/molecular
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10985/src/org/openscience/cdk/qsar/descriptors/molecular

Modified Files:
	HBondAcceptorCountDescriptor.java 
	RotatableBondsCountDescriptor.java RuleOfFiveDescriptor.java 
	TPSADescriptor.java 
Log Message:
Updated the getParameterType() method to return single Objects (of the proper type) rather than an  Object[] of all the available parameters.

Index: HBondAcceptorCountDescriptor.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/qsar/descriptors/molecular/HBondAcceptorCountDescriptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HBondAcceptorCountDescriptor.java	15 Jan 2006 19:34:13 -0000	1.4
+++ HBondAcceptorCountDescriptor.java	16 Jan 2006 21:22:41 -0000	1.5
@@ -186,9 +186,7 @@
      * @return       The parameterType value
      */
     public Object getParameterType(String name) {
-        Object[] paramTypes = new Object[1];
-        paramTypes[0] = new Boolean(false);
-        return paramTypes;
+        return new Boolean(false);
     }
 }
 

Index: RotatableBondsCountDescriptor.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/qsar/descriptors/molecular/RotatableBondsCountDescriptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RotatableBondsCountDescriptor.java	15 Jan 2006 19:34:13 -0000	1.4
+++ RotatableBondsCountDescriptor.java	16 Jan 2006 21:22:41 -0000	1.5
@@ -188,9 +188,7 @@
 	 *@return       The parameterType value
 	 */
 	public Object getParameterType(String name) {
-		Object[] paramTypes = new Object[1];
-		paramTypes[0] = new Boolean(true);
-		return paramTypes;
+		return new Boolean(true);
 	}
 }
 

Index: RuleOfFiveDescriptor.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/qsar/descriptors/molecular/RuleOfFiveDescriptor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RuleOfFiveDescriptor.java	15 Jan 2006 19:34:13 -0000	1.5
+++ RuleOfFiveDescriptor.java	16 Jan 2006 21:22:41 -0000	1.6
@@ -195,9 +195,7 @@
      *@return       An Object of class equal to that of the parameter being requested
      */
     public Object getParameterType(String name) {
-        Object[] paramTypes = new Object[1];
-        paramTypes[0] = new Boolean(true);
-        return paramTypes;
+        return new Boolean(true);
     }
 }
 

Index: TPSADescriptor.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/qsar/descriptors/molecular/TPSADescriptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TPSADescriptor.java	15 Jan 2006 19:34:13 -0000	1.4
+++ TPSADescriptor.java	16 Jan 2006 21:22:41 -0000	1.5
@@ -325,9 +325,7 @@
 	 *@return       The parameterType value
 	 */
 	public Object getParameterType(String name) {
-		Object[] paramTypes = new Object[1];
-		paramTypes[0] = new Boolean(checkAromaticity);
-		return paramTypes;
+		return new Boolean(true);
 	}
 }