From 9be887cc6d82107f2e5119b7256ba74aaf169c3e Mon Sep 17 00:00:00 2001 From: qi_liang Date: Thu, 3 Dec 2020 17:20:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spring-aop/src/main/java/org/aopalliance/aop/Advice.java | 1 + .../src/main/java/org/aopalliance/aop/AspectException.java | 2 ++ .../src/main/java/org/aopalliance/aop/package-info.java | 1 + .../src/main/java/org/springframework/beans/BeanUtils.java | 6 ------ .../java/org/springframework/beans/factory/BeanFactory.java | 1 - .../context/support/AbstractApplicationContext.java | 1 + .../AbstractRefreshableConfigApplicationContext.java | 1 + .../context/support/ClassPathXmlApplicationContext.java | 4 +++- .../java/org/springframework/mock/env/MockEnvironment.java | 1 + 9 files changed, 10 insertions(+), 8 deletions(-) diff --git a/spring-aop/src/main/java/org/aopalliance/aop/Advice.java b/spring-aop/src/main/java/org/aopalliance/aop/Advice.java index 38f9999458..acec9e814e 100644 --- a/spring-aop/src/main/java/org/aopalliance/aop/Advice.java +++ b/spring-aop/src/main/java/org/aopalliance/aop/Advice.java @@ -19,6 +19,7 @@ package org.aopalliance.aop; /** * Tag interface for Advice. Implementations can be any type * of advice, such as Interceptors. + * 提供建议的标签接口。实现可以是任何类型的通知，比如拦截器。 * * @author Rod Johnson * @version $Id: Advice.java,v 1.1 2004/03/19 17:02:16 johnsonr Exp $ diff --git a/spring-aop/src/main/java/org/aopalliance/aop/AspectException.java b/spring-aop/src/main/java/org/aopalliance/aop/AspectException.java index a91c2ac61e..b189a08330 100644 --- a/spring-aop/src/main/java/org/aopalliance/aop/AspectException.java +++ b/spring-aop/src/main/java/org/aopalliance/aop/AspectException.java @@ -18,8 +18,10 @@ package org.aopalliance.aop; /** * Superclass for all AOP infrastructure exceptions. + * 所有AOP基础结构异常的超类 * Unchecked, as such exceptions are fatal and end user * code shouldn't be forced to catch them. + * 未选中，因为此类异常是致命的，不应该强迫终端用户代码捕获它们。 * * @author Rod Johnson * @author Bob Lee diff --git a/spring-aop/src/main/java/org/aopalliance/aop/package-info.java b/spring-aop/src/main/java/org/aopalliance/aop/package-info.java index add1d414f6..d718fd5689 100644 --- a/spring-aop/src/main/java/org/aopalliance/aop/package-info.java +++ b/spring-aop/src/main/java/org/aopalliance/aop/package-info.java @@ -1,4 +1,5 @@ /** * The core AOP Alliance advice marker. + * 核心AOP联盟建议标记。 */ package org.aopalliance.aop; diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java index aab28c07f4..384b6cda10 100644 --- a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java +++ b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java @@ -783,10 +783,4 @@ public abstract class BeanUtils { } - public static void main(String[] args) { - System.out.println("============"); - } - - - } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java index 367ec44733..5d2afcb4ca 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java @@ -139,7 +139,6 @@ public interface BeanFactory { Object getBean(String name) throws BeansException; /** - * 返回指定bean的实例，该实例可以是共享的或独立的。 *

Behaves the same as {@link #getBean(String)}, but provides a measure of type * safety by throwing a BeanNotOfRequiredTypeException if the bean is not of the * required type. This means that ClassCastException can't be thrown on casting diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java index bcb11ef4b6..efcda170d7 100644 --- a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java @@ -506,6 +506,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader /** * Return the list of statically specified ApplicationListeners. + * 返回静态指定的ApplicationListeners列表。 */ public Collection> getApplicationListeners() { return this.applicationListeners; diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java index 901e715230..d99cb13e44 100644 --- a/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java @@ -71,6 +71,7 @@ public abstract class AbstractRefreshableConfigApplicationContext extends Abstra /** * Set the config locations for this application context. + * 设置此应用程序上下文的配置位置。 *

If not set, the implementation may use a default as appropriate. */ public void setConfigLocations(@Nullable String... locations) { diff --git a/spring-context/src/main/java/org/springframework/context/support/ClassPathXmlApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/ClassPathXmlApplicationContext.java index 9b72875faa..584d72eadf 100644 --- a/spring-context/src/main/java/org/springframework/context/support/ClassPathXmlApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/support/ClassPathXmlApplicationContext.java @@ -78,7 +78,8 @@ public class ClassPathXmlApplicationContext extends AbstractXmlApplicationContex /** * Create a new ClassPathXmlApplicationContext, loading the definitions * from the given XML file and automatically refreshing the context. - * @param configLocation resource location + * 创建一个新的ClassPathXmlApplicationContext，从给定的XML文件加载定义并自动刷新上下文。 + * @param configLocation resource location （资源位置） * @throws BeansException if context creation failed */ public ClassPathXmlApplicationContext(String configLocation) throws BeansException { @@ -126,6 +127,7 @@ public class ClassPathXmlApplicationContext extends AbstractXmlApplicationContex /** * Create a new ClassPathXmlApplicationContext with the given parent, * loading the definitions from the given XML files. + * 使用给定的父级创建一个新的ClassPathXmlApplicationContext，从给定的XML文件加载定义。 * @param configLocations array of resource locations * @param refresh whether to automatically refresh the context, * loading all bean definitions and creating all singletons. diff --git a/spring-test/src/main/java/org/springframework/mock/env/MockEnvironment.java b/spring-test/src/main/java/org/springframework/mock/env/MockEnvironment.java index 8495e7c37b..f46d9c1182 100644 --- a/spring-test/src/main/java/org/springframework/mock/env/MockEnvironment.java +++ b/spring-test/src/main/java/org/springframework/mock/env/MockEnvironment.java @@ -58,4 +58,5 @@ public class MockEnvironment extends AbstractEnvironment { return this; } + }