From: <eg...@us...> - 2009-03-23 21:16:46
|
Revision: 14513 http://cdk.svn.sourceforge.net/cdk/?rev=14513&view=rev Author: egonw Date: 2009-03-23 21:16:32 +0000 (Mon, 23 Mar 2009) Log Message: ----------- Cleaned up code: reuse info Modified Paths: -------------- cdk-xws/trunk/xws-qsar-services/src/org/openscience/cdk/xws/services/descriptor/BCUT.java cdk-xws/trunk/xws-qsar-services/src/org/openscience/cdk/xws/services/descriptor/Lipinski.java cdk-xws/trunk/xws-qsar-services/src/org/openscience/cdk/xws/services/descriptor/TPSA.java cdk-xws/trunk/xws-qsar-services/src/org/openscience/cdk/xws/services/descriptor/XLogP.java Modified: cdk-xws/trunk/xws-qsar-services/src/org/openscience/cdk/xws/services/descriptor/BCUT.java =================================================================== --- cdk-xws/trunk/xws-qsar-services/src/org/openscience/cdk/xws/services/descriptor/BCUT.java 2009-03-23 21:15:49 UTC (rev 14512) +++ cdk-xws/trunk/xws-qsar-services/src/org/openscience/cdk/xws/services/descriptor/BCUT.java 2009-03-23 21:16:32 UTC (rev 14513) @@ -48,24 +48,24 @@ private final static String FUNCTION_DESCRIPTION = "Calculates the BCUT descriptor."; private final static String FUNCTION_DETAILS = "Uses the CDK to calculate the BCUT value for a molecule."; - private final static String INPUT_SCHEMATA = + private final static String SCHEMATA = ResourceAsStringTool.getAsString("org/openscience/cdk/xws/schema/cml.xml"); - private final static String OUTPUT_SCHEMATA = - ResourceAsStringTool.getAsString("org/openscience/cdk/xws/schema/cml.xml"); private static IMolecularDescriptor descriptor; + private static FunctionInformation info = null; + public FunctionInformation getFunctionInformation() { - - FunctionInformation info = new FunctionInformation( - FUNCTION_NAME, - FUNCTION_DESCRIPTION, - FUNCTION_DETAILS, - INPUT_SCHEMATA, - OUTPUT_SCHEMATA, - false - ); - + if (info == null) { + info = new FunctionInformation( + FUNCTION_NAME, + FUNCTION_DESCRIPTION, + FUNCTION_DETAILS, + SCHEMATA, + SCHEMATA, + false + ); + } return info; } Modified: cdk-xws/trunk/xws-qsar-services/src/org/openscience/cdk/xws/services/descriptor/Lipinski.java =================================================================== --- cdk-xws/trunk/xws-qsar-services/src/org/openscience/cdk/xws/services/descriptor/Lipinski.java 2009-03-23 21:15:49 UTC (rev 14512) +++ cdk-xws/trunk/xws-qsar-services/src/org/openscience/cdk/xws/services/descriptor/Lipinski.java 2009-03-23 21:16:32 UTC (rev 14513) @@ -48,24 +48,24 @@ private final static String FUNCTION_DESCRIPTION = "Calculates the Lipinski Rule of Five."; private final static String FUNCTION_DETAILS = "Uses the CDK to calculate the Lipinski Rule of Five of a molecule."; - private final static String INPUT_SCHEMATA = + private final static String SCHEMATA = ResourceAsStringTool.getAsString("org/openscience/cdk/xws/schema/cml.xml"); - private final static String OUTPUT_SCHEMATA = - ResourceAsStringTool.getAsString("org/openscience/cdk/xws/schema/cml.xml"); private static IMolecularDescriptor descriptor; + private static FunctionInformation info = null; + public FunctionInformation getFunctionInformation() { - - FunctionInformation info = new FunctionInformation( - FUNCTION_NAME, - FUNCTION_DESCRIPTION, - FUNCTION_DETAILS, - INPUT_SCHEMATA, - OUTPUT_SCHEMATA, - false - ); - + if (info == null) { + info = new FunctionInformation( + FUNCTION_NAME, + FUNCTION_DESCRIPTION, + FUNCTION_DETAILS, + SCHEMATA, + SCHEMATA, + false + ); + } return info; } Modified: cdk-xws/trunk/xws-qsar-services/src/org/openscience/cdk/xws/services/descriptor/TPSA.java =================================================================== --- cdk-xws/trunk/xws-qsar-services/src/org/openscience/cdk/xws/services/descriptor/TPSA.java 2009-03-23 21:15:49 UTC (rev 14512) +++ cdk-xws/trunk/xws-qsar-services/src/org/openscience/cdk/xws/services/descriptor/TPSA.java 2009-03-23 21:16:32 UTC (rev 14513) @@ -48,24 +48,24 @@ private final static String FUNCTION_DESCRIPTION = "Calculates the Total Polar Surface Area."; private final static String FUNCTION_DETAILS = "Uses the CDK to calculate the TPSA of a molecule."; - private final static String INPUT_SCHEMATA = + private final static String SCHEMATA = ResourceAsStringTool.getAsString("org/openscience/cdk/xws/schema/cml.xml"); - private final static String OUTPUT_SCHEMATA = - ResourceAsStringTool.getAsString("org/openscience/cdk/xws/schema/cml.xml"); private static IMolecularDescriptor descriptor; + private static FunctionInformation info = null; + public FunctionInformation getFunctionInformation() { - - FunctionInformation info = new FunctionInformation( - FUNCTION_NAME, - FUNCTION_DESCRIPTION, - FUNCTION_DETAILS, - INPUT_SCHEMATA, - OUTPUT_SCHEMATA, - false - ); - + if (info == null) { + info = new FunctionInformation( + FUNCTION_NAME, + FUNCTION_DESCRIPTION, + FUNCTION_DETAILS, + SCHEMATA, + SCHEMATA, + false + ); + } return info; } Modified: cdk-xws/trunk/xws-qsar-services/src/org/openscience/cdk/xws/services/descriptor/XLogP.java =================================================================== --- cdk-xws/trunk/xws-qsar-services/src/org/openscience/cdk/xws/services/descriptor/XLogP.java 2009-03-23 21:15:49 UTC (rev 14512) +++ cdk-xws/trunk/xws-qsar-services/src/org/openscience/cdk/xws/services/descriptor/XLogP.java 2009-03-23 21:16:32 UTC (rev 14513) @@ -48,24 +48,24 @@ private final static String FUNCTION_DESCRIPTION = "Calculates the XLogP."; private final static String FUNCTION_DETAILS = "Uses the CDK to calculate the XLogP of a molecule."; - private final static String INPUT_SCHEMATA = + private final static String SCHEMATA = ResourceAsStringTool.getAsString("org/openscience/cdk/xws/schema/cml.xml"); - private final static String OUTPUT_SCHEMATA = - ResourceAsStringTool.getAsString("org/openscience/cdk/xws/schema/cml.xml"); private static IMolecularDescriptor descriptor; + private static FunctionInformation info = null; + public FunctionInformation getFunctionInformation() { - - FunctionInformation info = new FunctionInformation( - FUNCTION_NAME, - FUNCTION_DESCRIPTION, - FUNCTION_DETAILS, - INPUT_SCHEMATA, - OUTPUT_SCHEMATA, - false - ); - + if (info == null) { + info = new FunctionInformation( + FUNCTION_NAME, + FUNCTION_DESCRIPTION, + FUNCTION_DETAILS, + SCHEMATA, + SCHEMATA, + false + ); + } return info; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |