Skip to content

Commit c43e749

Browse files
committed
Fixed typo: "occured"->"occurred"
1 parent 23c2b6a commit c43e749

File tree

12 files changed

+26
-26
lines changed

12 files changed

+26
-26
lines changed

spring-beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public Class<?> getPropertyType(String propertyPath) {
148148
* @throws InvalidPropertyException if there is no such property or
149149
* if the property isn't writable
150150
* @throws PropertyAccessException if the property was valid but the
151-
* accessor method failed or a type mismatch occured
151+
* accessor method failed or a type mismatch occurred
152152
*/
153153
@Override
154154
public abstract void setPropertyValue(String propertyName, Object value) throws BeansException;

spring-beans/src/main/java/org/springframework/beans/PropertyAccessor.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2012 the original author or authors.
2+
* Copyright 2002-2016 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -120,7 +120,7 @@ public interface PropertyAccessor {
120120
* @throws InvalidPropertyException if there is no such property or
121121
* if the property isn't writable
122122
* @throws PropertyAccessException if the property was valid but the
123-
* accessor method failed or a type mismatch occured
123+
* accessor method failed or a type mismatch occurred
124124
*/
125125
void setPropertyValue(String propertyName, Object value) throws BeansException;
126126

@@ -130,7 +130,7 @@ public interface PropertyAccessor {
130130
* @throws InvalidPropertyException if there is no such property or
131131
* if the property isn't writable
132132
* @throws PropertyAccessException if the property was valid but the
133-
* accessor method failed or a type mismatch occured
133+
* accessor method failed or a type mismatch occurred
134134
*/
135135
void setPropertyValue(PropertyValue pv) throws BeansException;
136136

@@ -144,7 +144,7 @@ public interface PropertyAccessor {
144144
* @throws InvalidPropertyException if there is no such property or
145145
* if the property isn't writable
146146
* @throws PropertyBatchUpdateException if one or more PropertyAccessExceptions
147-
* occured for specific properties during the batch update. This exception bundles
147+
* occurred for specific properties during the batch update. This exception bundles
148148
* all individual PropertyAccessExceptions. All other properties will have been
149149
* successfully updated.
150150
*/
@@ -164,7 +164,7 @@ public interface PropertyAccessor {
164164
* @throws InvalidPropertyException if there is no such property or
165165
* if the property isn't writable
166166
* @throws PropertyBatchUpdateException if one or more PropertyAccessExceptions
167-
* occured for specific properties during the batch update. This exception bundles
167+
* occurred for specific properties during the batch update. This exception bundles
168168
* all individual PropertyAccessExceptions. All other properties will have been
169169
* successfully updated.
170170
* @see #setPropertyValues(PropertyValues, boolean, boolean)
@@ -185,7 +185,7 @@ public interface PropertyAccessor {
185185
* @throws InvalidPropertyException if there is no such property or
186186
* if the property isn't writable
187187
* @throws PropertyBatchUpdateException if one or more PropertyAccessExceptions
188-
* occured for specific properties during the batch update. This exception bundles
188+
* occurred for specific properties during the batch update. This exception bundles
189189
* all individual PropertyAccessExceptions. All other properties will have been
190190
* successfully updated.
191191
* @see #setPropertyValues(PropertyValues, boolean, boolean)
@@ -208,7 +208,7 @@ void setPropertyValues(PropertyValues pvs, boolean ignoreUnknown)
208208
* @throws InvalidPropertyException if there is no such property or
209209
* if the property isn't writable
210210
* @throws PropertyBatchUpdateException if one or more PropertyAccessExceptions
211-
* occured for specific properties during the batch update. This exception bundles
211+
* occurred for specific properties during the batch update. This exception bundles
212212
* all individual PropertyAccessExceptions. All other properties will have been
213213
* successfully updated.
214214
*/

spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public String getResourceDescription() {
123123

124124
/**
125125
* Add a related cause to this bean creation exception,
126-
* not being a direct cause of the failure but having occured
126+
* not being a direct cause of the failure but having occurred
127127
* earlier in the creation of the same bean instance.
128128
* @param ex the related cause to add
129129
*/

spring-beans/src/main/java/org/springframework/beans/factory/config/AbstractFactoryBean.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2012 the original author or authors.
2+
* Copyright 2002-2016 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -208,7 +208,7 @@ public void destroy() throws Exception {
208208
* <p>Invoked on initialization of this FactoryBean in case of
209209
* a singleton; else, on each {@link #getObject()} call.
210210
* @return the object returned by this factory
211-
* @throws Exception if an exception occured during object creation
211+
* @throws Exception if an exception occurred during object creation
212212
* @see #getObject()
213213
*/
214214
protected abstract T createInstance() throws Exception;

spring-beans/src/main/java/org/springframework/beans/factory/config/PropertiesFactoryBean.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2013 the original author or authors.
2+
* Copyright 2002-2016 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -95,7 +95,7 @@ public Class<Properties> getObjectType() {
9595
* <p>Invoked on initialization of this FactoryBean in case of a
9696
* shared singleton; else, on each {@link #getObject()} call.
9797
* @return the object returned by this factory
98-
* @throws IOException if an exception occured during properties loading
98+
* @throws IOException if an exception occurred during properties loading
9999
* @see #mergeProperties()
100100
*/
101101
protected Properties createProperties() throws IOException {

spring-context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2015 the original author or authors.
2+
* Copyright 2002-2016 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -79,7 +79,7 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B
7979
logger.warn(String.format("%s was imported but no annotations were found " +
8080
"having both 'mode' and 'proxyTargetClass' attributes of type " +
8181
"AdviceMode and boolean respectively. This means that auto proxy " +
82-
"creator registration and configuration may not have occured as " +
82+
"creator registration and configuration may not have occurred as " +
8383
"intended, and components may not be proxied as expected. Check to " +
8484
"ensure that %s has been @Import'ed on the same class where these " +
8585
"annotations are declared; otherwise remove the import of %s " +

spring-context/src/main/java/org/springframework/context/annotation/ComponentScanAnnotationParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ private List<TypeFilter> typeFiltersFor(AnnotationAttributes filterAttributes) {
152152
switch (filterType) {
153153
case ANNOTATION:
154154
Assert.isAssignable(Annotation.class, filterClass,
155-
"An error occured while processing a @ComponentScan ANNOTATION type filter: ");
155+
"An error occurred while processing a @ComponentScan ANNOTATION type filter: ");
156156
@SuppressWarnings("unchecked")
157157
Class<Annotation> annotationType = (Class<Annotation>) filterClass;
158158
typeFilters.add(new AnnotationTypeFilter(annotationType));
@@ -162,7 +162,7 @@ private List<TypeFilter> typeFiltersFor(AnnotationAttributes filterAttributes) {
162162
break;
163163
case CUSTOM:
164164
Assert.isAssignable(TypeFilter.class, filterClass,
165-
"An error occured while processing a @ComponentScan CUSTOM type filter: ");
165+
"An error occurred while processing a @ComponentScan CUSTOM type filter: ");
166166
TypeFilter filter = BeanUtils.instantiateClass(filterClass, TypeFilter.class);
167167
invokeAwareMethods(filter);
168168
typeFilters.add(filter);

spring-context/src/main/java/org/springframework/jmx/support/ConnectorServerFactoryBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public void setDaemon(boolean daemon) {
138138
* the {@code JMXConnectorServer} will be started in a separate thread.
139139
* If the {@code daemon} flag is set to {@code true}, that thread will be
140140
* started as a daemon thread.
141-
* @throws JMException if a problem occured when registering the connector server
141+
* @throws JMException if a problem occurred when registering the connector server
142142
* with the {@code MBeanServer}
143143
* @throws IOException if there is a problem starting the connector server
144144
*/

spring-jms/src/main/java/org/springframework/jms/UncategorizedJmsException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2012 the original author or authors.
2+
* Copyright 2002-2016 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ public UncategorizedJmsException(String msg, Throwable cause) {
5151
* but can also be a JNDI NamingException or the like.
5252
*/
5353
public UncategorizedJmsException(Throwable cause) {
54-
super("Uncategorized exception occured during JMS processing", cause);
54+
super("Uncategorized exception occurred during JMS processing", cause);
5555
}
5656

5757
}

spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateExceptionTranslator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2015 the original author or authors.
2+
* Copyright 2002-2016 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
4949
/**
5050
* Convert the given HibernateException to an appropriate exception from the
5151
* {@code org.springframework.dao} hierarchy.
52-
* @param ex HibernateException that occured
52+
* @param ex HibernateException that occurred
5353
* @return a corresponding DataAccessException
5454
* @see SessionFactoryUtils#convertHibernateAccessException
5555
*/

0 commit comments

Comments
 (0)