From c35b216431990c785ad3ed5f229a1085e5a13b13 Mon Sep 17 00:00:00 2001 From: Egon Willighagen Date: Wed, 24 Aug 2016 16:59:15 +0200 Subject: [PATCH] Fixed a number of spelling errors --- .../java/org/openscience/cdk/exception/CDKException.java | 2 +- .../openscience/cdk/exception/InvalidSmilesException.java | 2 +- .../qsar/descriptors/atomic/RDFProtonDescriptor_GDR.java | 2 +- .../java/org/openscience/cdk/qsar/DescriptorEngine.java | 2 +- .../molecular/AutocorrelationDescriptorPolarizability.java | 2 +- .../cdk/qsar/descriptors/molecular/BCUTDescriptor.java | 2 +- .../cdk/qsar/descriptors/molecular/ChiIndexUtils.java | 2 +- .../openscience/cdk/fingerprint/SignatureFingerprinter.java | 2 +- .../java/org/openscience/cdk/renderer/SymbolVisibility.java | 2 +- .../cdk/renderer/visitor/AbstractAWTDrawVisitor.java | 4 ++-- .../java/org/openscience/cdk/templates/MoleculeFactory.java | 2 +- .../main/java/org/openscience/cdk/tools/LoggingTool.java | 6 +++--- .../java/org/openscience/cdk/io/PCCompoundASNReader.java | 4 ++-- .../java/org/openscience/cdk/io/PCCompoundXMLReader.java | 4 ++-- .../java/org/openscience/cdk/io/PCSubstanceXMLReader.java | 4 ++-- .../org/openscience/cdk/fingerprint/LingoFingerprinter.java | 2 +- .../src/main/java/org/openscience/cdk/io/SMILESReader.java | 6 +++--- .../src/main/java/org/openscience/cdk/io/SMILESWriter.java | 4 ++-- .../main/java/org/openscience/cdk/normalize/Normalizer.java | 4 ++-- .../openscience/cdk/layout/StructureDiagramGenerator.java | 2 +- .../cdk/layout/StructureDiagramGeneratorTest.java | 4 ++-- .../cdk/smsd/algorithm/rgraph/CDKRMapHandler.java | 2 +- .../openscience/cdk/tautomers/InChITautomerGenerator.java | 2 +- 23 files changed, 34 insertions(+), 34 deletions(-) diff --git a/base/core/src/main/java/org/openscience/cdk/exception/CDKException.java b/base/core/src/main/java/org/openscience/cdk/exception/CDKException.java index 9cd3c32403d..22e50e02e9f 100644 --- a/base/core/src/main/java/org/openscience/cdk/exception/CDKException.java +++ b/base/core/src/main/java/org/openscience/cdk/exception/CDKException.java @@ -23,7 +23,7 @@ package org.openscience.cdk.exception; /** - * Exception that is thrown by CDK classes when some problem has occured. + * Exception that is thrown by CDK classes when some problem has occurred. * * @cdk.module core * @cdk.githash diff --git a/base/standard/src/main/java/org/openscience/cdk/exception/InvalidSmilesException.java b/base/standard/src/main/java/org/openscience/cdk/exception/InvalidSmilesException.java index ee19d510783..b3ac38a9b0b 100644 --- a/base/standard/src/main/java/org/openscience/cdk/exception/InvalidSmilesException.java +++ b/base/standard/src/main/java/org/openscience/cdk/exception/InvalidSmilesException.java @@ -26,7 +26,7 @@ /** - * Exception thrown when an error is occured during SMILES parsing. + * Exception thrown when an error is occurred during SMILES parsing. * * @cdk.module standard * @cdk.githash diff --git a/descriptor/qsaratomic/src/main/java/org/openscience/cdk/qsar/descriptors/atomic/RDFProtonDescriptor_GDR.java b/descriptor/qsaratomic/src/main/java/org/openscience/cdk/qsar/descriptors/atomic/RDFProtonDescriptor_GDR.java index c20a6783d7e..b2f371a07ea 100644 --- a/descriptor/qsaratomic/src/main/java/org/openscience/cdk/qsar/descriptors/atomic/RDFProtonDescriptor_GDR.java +++ b/descriptor/qsaratomic/src/main/java/org/openscience/cdk/qsar/descriptors/atomic/RDFProtonDescriptor_GDR.java @@ -446,7 +446,7 @@ && getIfBondIsNotRotatable(mol, LOGGER.debug("GDR prob dist.: " + sum + " at distance " + ghd); } } else { - return getDummyDescriptorValue(new CDKException("Some error occured. Please report")); + return getDummyDescriptorValue(new CDKException("Some error occurred. Please report")); } return new DescriptorValue(getSpecification(), getParameterNames(), getParameters(), rdfProtonCalculatedValues, getDescriptorNames()); diff --git a/descriptor/qsarmolecular/src/main/java/org/openscience/cdk/qsar/DescriptorEngine.java b/descriptor/qsarmolecular/src/main/java/org/openscience/cdk/qsar/DescriptorEngine.java index 516d5abc2db..00d28333500 100644 --- a/descriptor/qsarmolecular/src/main/java/org/openscience/cdk/qsar/DescriptorEngine.java +++ b/descriptor/qsarmolecular/src/main/java/org/openscience/cdk/qsar/DescriptorEngine.java @@ -161,7 +161,7 @@ public DescriptorEngine(Class c, IChemObjectBuilder build * on the DescriptorSpecification object for that descriptor * * @param molecule The molecule for which we want to calculate descriptors - * @throws CDKException if an error occured during descriptor calculation or the descriptors and/or + * @throws CDKException if an error occurred during descriptor calculation or the descriptors and/or * specifications have not been initialized */ public void process(IAtomContainer molecule) throws CDKException { diff --git a/descriptor/qsarmolecular/src/main/java/org/openscience/cdk/qsar/descriptors/molecular/AutocorrelationDescriptorPolarizability.java b/descriptor/qsarmolecular/src/main/java/org/openscience/cdk/qsar/descriptors/molecular/AutocorrelationDescriptorPolarizability.java index 3ace6033b6a..3179fa30c9b 100644 --- a/descriptor/qsarmolecular/src/main/java/org/openscience/cdk/qsar/descriptors/molecular/AutocorrelationDescriptorPolarizability.java +++ b/descriptor/qsarmolecular/src/main/java/org/openscience/cdk/qsar/descriptors/molecular/AutocorrelationDescriptorPolarizability.java @@ -82,7 +82,7 @@ public DescriptorValue calculate(IAtomContainer container) { try { molecule = (IAtomContainer) container.clone(); } catch (CloneNotSupportedException e) { - return getDummyDescriptorValue(new CDKException("Error occured during clone " + e)); + return getDummyDescriptorValue(new CDKException("Error occurred during clone " + e)); } // add H's in case they're not present diff --git a/descriptor/qsarmolecular/src/main/java/org/openscience/cdk/qsar/descriptors/molecular/BCUTDescriptor.java b/descriptor/qsarmolecular/src/main/java/org/openscience/cdk/qsar/descriptors/molecular/BCUTDescriptor.java index b26ab2a2536..d8e5f2328de 100644 --- a/descriptor/qsarmolecular/src/main/java/org/openscience/cdk/qsar/descriptors/molecular/BCUTDescriptor.java +++ b/descriptor/qsarmolecular/src/main/java/org/openscience/cdk/qsar/descriptors/molecular/BCUTDescriptor.java @@ -315,7 +315,7 @@ public DescriptorValue calculate(IAtomContainer container) { molecule = (IAtomContainer) container.clone(); } catch (CloneNotSupportedException e) { logger.debug("Error during clone"); - return getDummyDescriptorValue(new CDKException("Error occured during clone " + e)); + return getDummyDescriptorValue(new CDKException("Error occurred during clone " + e)); } // add H's in case they're not present diff --git a/descriptor/qsarmolecular/src/main/java/org/openscience/cdk/qsar/descriptors/molecular/ChiIndexUtils.java b/descriptor/qsarmolecular/src/main/java/org/openscience/cdk/qsar/descriptors/molecular/ChiIndexUtils.java index d922b171f40..05afc537234 100644 --- a/descriptor/qsarmolecular/src/main/java/org/openscience/cdk/qsar/descriptors/molecular/ChiIndexUtils.java +++ b/descriptor/qsarmolecular/src/main/java/org/openscience/cdk/qsar/descriptors/molecular/ChiIndexUtils.java @@ -134,7 +134,7 @@ public static double evalValenceIndex(IAtomContainer atomContainer, List aFragList : fragList) { diff --git a/descriptor/signature/src/main/java/org/openscience/cdk/fingerprint/SignatureFingerprinter.java b/descriptor/signature/src/main/java/org/openscience/cdk/fingerprint/SignatureFingerprinter.java index ad68d344b19..bfb21a721fb 100644 --- a/descriptor/signature/src/main/java/org/openscience/cdk/fingerprint/SignatureFingerprinter.java +++ b/descriptor/signature/src/main/java/org/openscience/cdk/fingerprint/SignatureFingerprinter.java @@ -42,7 +42,7 @@ public class SignatureFingerprinter implements IFingerprinter { private int signatureDepth; /** - * Initialize the fingerprinter with a defult signature depth of 1. + * Initialize the fingerprinter with a default signature depth of 1. */ public SignatureFingerprinter() { this(1); diff --git a/display/render/src/main/java/org/openscience/cdk/renderer/SymbolVisibility.java b/display/render/src/main/java/org/openscience/cdk/renderer/SymbolVisibility.java index 89e46ef7ac8..9dd65abcca3 100644 --- a/display/render/src/main/java/org/openscience/cdk/renderer/SymbolVisibility.java +++ b/display/render/src/main/java/org/openscience/cdk/renderer/SymbolVisibility.java @@ -185,7 +185,7 @@ private static boolean isFourValent(IAtom atom, List bonds) { * * @param atom an atom * @param bonds bonds connected to the atom - * @return whether the atom has parallele bonds + * @return whether the atom has parallel bonds */ private static boolean hasParallelBonds(IAtom atom, List bonds) { if (bonds.size() != 2) return false; diff --git a/display/renderawt/src/main/java/org/openscience/cdk/renderer/visitor/AbstractAWTDrawVisitor.java b/display/renderawt/src/main/java/org/openscience/cdk/renderer/visitor/AbstractAWTDrawVisitor.java index d95376c75fd..87b79acae98 100644 --- a/display/renderawt/src/main/java/org/openscience/cdk/renderer/visitor/AbstractAWTDrawVisitor.java +++ b/display/renderawt/src/main/java/org/openscience/cdk/renderer/visitor/AbstractAWTDrawVisitor.java @@ -67,7 +67,7 @@ public void transformPoint(double[] xy) { * @param text the text string * @param xCoord the world x-coordinate of where the text should be placed * @param yCoord the world y-coordinate of where the text should be placed - * @param graphics the graphics to which the text is outputted + * @param graphics the graphics to which the text is provided as output * @return the screen coordinates */ protected Rectangle2D getTextBounds(String text, double xCoord, double yCoord, Graphics2D graphics) { @@ -94,7 +94,7 @@ protected Rectangle2D getTextBounds(String text, double xCoord, double yCoord, G * @param text the text string * @param xCoord the world x-coordinate of where the text should be placed * @param yCoord the world y-coordinate of where the text should be placed - * @param graphics the graphics to which the text is outputted + * @param graphics the graphics to which the text is provided as output * @return the screen coordinates */ protected Point getTextBasePoint(String text, double xCoord, double yCoord, Graphics2D graphics) { diff --git a/misc/extra/src/main/java/org/openscience/cdk/templates/MoleculeFactory.java b/misc/extra/src/main/java/org/openscience/cdk/templates/MoleculeFactory.java index d02e1d53956..12e6db39f9f 100644 --- a/misc/extra/src/main/java/org/openscience/cdk/templates/MoleculeFactory.java +++ b/misc/extra/src/main/java/org/openscience/cdk/templates/MoleculeFactory.java @@ -1257,7 +1257,7 @@ public static IAtomContainer loadMolecule(String inFile) { } } catch (CDKException | IOException exc) { // we just return null if something went wrong - logger.error("An exception occured while loading a molecule: " + inFile); + logger.error("An exception occurred while loading a molecule: " + inFile); logger.debug(exc); } diff --git a/misc/log4j/src/main/java/org/openscience/cdk/tools/LoggingTool.java b/misc/log4j/src/main/java/org/openscience/cdk/tools/LoggingTool.java index aa632bbf4f8..24fd48a8a47 100644 --- a/misc/log4j/src/main/java/org/openscience/cdk/tools/LoggingTool.java +++ b/misc/log4j/src/main/java/org/openscience/cdk/tools/LoggingTool.java @@ -135,7 +135,7 @@ public LoggingTool(Class classInst) { logger.debug("Properties file not found!"); } catch (Exception e) { toSTDOUT = true; - logger.debug("Unknown error occured: ", e.getMessage()); + logger.debug("Unknown error occurred: ", e.getMessage()); } /* ************************************************************** * but some JVMs (i.e. MSFT) won't pass the SecurityException to this @@ -163,7 +163,7 @@ public LoggingTool(Class classInst) { } /** - * Forces the LoggingTool to configurate the Log4J toolkit. + * Forces the LoggingTool to configure the Log4J toolkit. * Normally this should be done by the application that uses the CDK library, * but is available for convenience. */ @@ -176,7 +176,7 @@ public static void configureLog4j() { localLogger.error("Properties file not found: ", e.getMessage()); localLogger.debug(e); } catch (Exception e) { - localLogger.error("Unknown error occured: ", e.getMessage()); + localLogger.error("Unknown error occurred: ", e.getMessage()); localLogger.debug(e); } } diff --git a/storage/io/src/main/java/org/openscience/cdk/io/PCCompoundASNReader.java b/storage/io/src/main/java/org/openscience/cdk/io/PCCompoundASNReader.java index c1b7769b41c..75ef793aa27 100644 --- a/storage/io/src/main/java/org/openscience/cdk/io/PCCompoundASNReader.java +++ b/storage/io/src/main/java/org/openscience/cdk/io/PCCompoundASNReader.java @@ -119,11 +119,11 @@ public T read(T object) throws CDKException { try { return (T) readChemFile((IChemFile) object); } catch (IOException e) { - throw new CDKException("An IO Exception occured while reading the file.", e); + throw new CDKException("An IO Exception occurred while reading the file.", e); } catch (CDKException e) { throw e; } catch (Exception e) { - throw new CDKException("An error occured.", e); + throw new CDKException("An error occurred.", e); } } else { throw new CDKException("Only supported is reading of ChemFile objects."); diff --git a/storage/io/src/main/java/org/openscience/cdk/io/PCCompoundXMLReader.java b/storage/io/src/main/java/org/openscience/cdk/io/PCCompoundXMLReader.java index e90a2f6b786..6ce8a502b00 100644 --- a/storage/io/src/main/java/org/openscience/cdk/io/PCCompoundXMLReader.java +++ b/storage/io/src/main/java/org/openscience/cdk/io/PCCompoundXMLReader.java @@ -112,11 +112,11 @@ public T read(T object) throws CDKException { builder = object.getBuilder(); return (T) readMolecule(); } catch (IOException e) { - throw new CDKException("An IO Exception occured while reading the file.", e); + throw new CDKException("An IO Exception occurred while reading the file.", e); } catch (CDKException e) { throw e; } catch (Exception e) { - throw new CDKException("An error occured: " + e.getMessage(), e); + throw new CDKException("An error occurred: " + e.getMessage(), e); } } else { throw new CDKException("Only supported is reading of IAtomContainer objects."); diff --git a/storage/io/src/main/java/org/openscience/cdk/io/PCSubstanceXMLReader.java b/storage/io/src/main/java/org/openscience/cdk/io/PCSubstanceXMLReader.java index dac8484ceb7..0483ad45c34 100644 --- a/storage/io/src/main/java/org/openscience/cdk/io/PCSubstanceXMLReader.java +++ b/storage/io/src/main/java/org/openscience/cdk/io/PCSubstanceXMLReader.java @@ -112,11 +112,11 @@ public T read(T object) throws CDKException { builder = object.getBuilder(); return (T) readMolecule(); } catch (IOException e) { - throw new CDKException("An IO Exception occured while reading the file.", e); + throw new CDKException("An IO Exception occurred while reading the file.", e); } catch (CDKException e) { throw e; } catch (Exception e) { - throw new CDKException("An error occured: " + e.getMessage(), e); + throw new CDKException("An error occurred: " + e.getMessage(), e); } } else { throw new CDKException("Only supported is reading of ChemFile objects."); diff --git a/storage/smiles/src/main/java/org/openscience/cdk/fingerprint/LingoFingerprinter.java b/storage/smiles/src/main/java/org/openscience/cdk/fingerprint/LingoFingerprinter.java index 0443d8a818b..07175a475e8 100644 --- a/storage/smiles/src/main/java/org/openscience/cdk/fingerprint/LingoFingerprinter.java +++ b/storage/smiles/src/main/java/org/openscience/cdk/fingerprint/LingoFingerprinter.java @@ -59,7 +59,7 @@ public class LingoFingerprinter implements IFingerprinter { or(all(), relevant())); /** - * Initialize the fingerprinter with a defult substring length of 4. + * Initialize the fingerprinter with a default substring length of 4. */ public LingoFingerprinter() { this(4); diff --git a/storage/smiles/src/main/java/org/openscience/cdk/io/SMILESReader.java b/storage/smiles/src/main/java/org/openscience/cdk/io/SMILESReader.java index 7787aa663a2..57ca19a15cc 100644 --- a/storage/smiles/src/main/java/org/openscience/cdk/io/SMILESReader.java +++ b/storage/smiles/src/main/java/org/openscience/cdk/io/SMILESReader.java @@ -125,8 +125,8 @@ public boolean accepts(Class classObject) { } /** - * reads the content from a XYZ input. It can only return a - * IChemObject of type ChemFile + * Reads the content from a XYZ input. It can only return a + * {@link IChemObject} of type {@link IChemFile}. * * @param object class must be of type ChemFile * @@ -157,7 +157,7 @@ public T read(T object) throws CDKException { * Private method that actually parses the input to read a ChemFile * object. * - * @param som The set of molecules that came fron the file + * @param som The set of molecules that came from the file * @return A ChemFile containing the data parsed from input. */ private IAtomContainerSet readAtomContainerSet(IAtomContainerSet som) { diff --git a/storage/smiles/src/main/java/org/openscience/cdk/io/SMILESWriter.java b/storage/smiles/src/main/java/org/openscience/cdk/io/SMILESWriter.java index 17896b80e15..d17c5807e9a 100644 --- a/storage/smiles/src/main/java/org/openscience/cdk/io/SMILESWriter.java +++ b/storage/smiles/src/main/java/org/openscience/cdk/io/SMILESWriter.java @@ -138,7 +138,7 @@ public boolean accepts(Class classObject) { /** * Writes the content from object to output. * - * @param object IChemObject of which the data is outputted. + * @param object IChemObject of which the data is given as output. */ @Override public void write(IChemObject object) throws CDKException { @@ -169,7 +169,7 @@ public void writeAtomContainerSet(IAtomContainerSet som) { /** * Writes the content from molecule to output. * - * @param molecule Molecule of which the data is outputted. + * @param molecule Molecule of which the data is given as output. */ public void writeAtomContainer(IAtomContainer molecule) { SmilesGenerator sg = new SmilesGenerator(); diff --git a/storage/smiles/src/main/java/org/openscience/cdk/normalize/Normalizer.java b/storage/smiles/src/main/java/org/openscience/cdk/normalize/Normalizer.java index b708331b965..226b3e55a1b 100644 --- a/storage/smiles/src/main/java/org/openscience/cdk/normalize/Normalizer.java +++ b/storage/smiles/src/main/java/org/openscience/cdk/normalize/Normalizer.java @@ -41,7 +41,7 @@ import org.w3c.dom.NodeList; /** - * Adjusts parts of an AtomContainer to the congiguratin of a fragment. + * Adjusts parts of an AtomContainer to the configuration of a fragment. * * @author shk3 * @cdk.created 2004-03-04 @@ -51,7 +51,7 @@ public class Normalizer { /** - * The method takes an xml files like the following:
+ * The method takes an XML files like the following:
* <replace-set>
* <replace>O=N=O</replace>
* <replacement>[O-][N+]=O</replacement>
diff --git a/tool/sdg/src/main/java/org/openscience/cdk/layout/StructureDiagramGenerator.java b/tool/sdg/src/main/java/org/openscience/cdk/layout/StructureDiagramGenerator.java index dc5495f3da2..30956ca04d3 100644 --- a/tool/sdg/src/main/java/org/openscience/cdk/layout/StructureDiagramGenerator.java +++ b/tool/sdg/src/main/java/org/openscience/cdk/layout/StructureDiagramGenerator.java @@ -310,7 +310,7 @@ public void setMolecule(IAtomContainer mol, boolean clone, Set afix, Set< try { this.molecule = (IAtomContainer) mol.clone(); } catch (CloneNotSupportedException e) { - logger.error("Should clone, but exception occured: ", e.getMessage()); + logger.error("Should clone, but exception occurred: ", e.getMessage()); logger.debug(e); } } else { diff --git a/tool/sdg/src/test/java/org/openscience/cdk/layout/StructureDiagramGeneratorTest.java b/tool/sdg/src/test/java/org/openscience/cdk/layout/StructureDiagramGeneratorTest.java index f8e9bf5183e..3d65f889888 100644 --- a/tool/sdg/src/test/java/org/openscience/cdk/layout/StructureDiagramGeneratorTest.java +++ b/tool/sdg/src/test/java/org/openscience/cdk/layout/StructureDiagramGeneratorTest.java @@ -353,7 +353,7 @@ public void testBug1677912SDGHangs() throws Exception { // Generate 2D coordinates layout(molecule); - // Test completed, no timeout occured + // Test completed, no timeout occurred } /** @@ -706,7 +706,7 @@ public void testBug1784850InfiniteLoop() throws Exception { // rebuild 2D coordinates layout(molecule); - // test completed, no timeout occured + // test completed, no timeout occurred } /** diff --git a/tool/smsd/src/main/java/org/openscience/cdk/smsd/algorithm/rgraph/CDKRMapHandler.java b/tool/smsd/src/main/java/org/openscience/cdk/smsd/algorithm/rgraph/CDKRMapHandler.java index b995ea3210e..4403f1dca48 100644 --- a/tool/smsd/src/main/java/org/openscience/cdk/smsd/algorithm/rgraph/CDKRMapHandler.java +++ b/tool/smsd/src/main/java/org/openscience/cdk/smsd/algorithm/rgraph/CDKRMapHandler.java @@ -649,7 +649,7 @@ public void setMappings(List> mappings) { } /** - * Returns true if a time out occured else false + * Returns true if a time out occurred else false * @return the timeoutFlag */ public boolean isTimeoutFlag() { diff --git a/tool/tautomer/src/main/java/org/openscience/cdk/tautomers/InChITautomerGenerator.java b/tool/tautomer/src/main/java/org/openscience/cdk/tautomers/InChITautomerGenerator.java index 374ef4c17d9..241ab361f8b 100644 --- a/tool/tautomer/src/main/java/org/openscience/cdk/tautomers/InChITautomerGenerator.java +++ b/tool/tautomer/src/main/java/org/openscience/cdk/tautomers/InChITautomerGenerator.java @@ -63,7 +63,7 @@ public class InChITautomerGenerator { private final static ILoggingTool LOGGER = LoggingToolFactory.createLoggingTool(InChITautomerGenerator.class); /** - * Public method to get tautomers for an input molecule, based on the InChI which will be calculated by jniinchi. + * Public method to get tautomers for an input molecule, based on the InChI which will be calculated by JNI-InChI. * @param molecule molecule for which to generate tautomers * @return a list of tautomers, if any * @throws CDKException