Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
01a71ef5
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
01a71ef5
编写于
7月 24, 2013
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polishing
上级
bb95a63e
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
16 addition
and
18 deletion
+16
-18
spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java
...springframework/aop/framework/DefaultAopProxyFactory.java
+1
-2
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java
...pringframework/context/annotation/ConfigurationClass.java
+3
-3
spring-oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml
...rg/springframework/oxm/config/oxmNamespaceHandlerTest.xml
+10
-11
spring-web/src/main/java/org/springframework/http/MediaType.java
...web/src/main/java/org/springframework/http/MediaType.java
+2
-2
未找到文件。
spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java
浏览文件 @
01a71ef5
/*
* Copyright 2002-201
2
the original author or authors.
* Copyright 2002-201
3
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -48,7 +48,6 @@ import org.springframework.aop.SpringProxy;
@SuppressWarnings
(
"serial"
)
public
class
DefaultAopProxyFactory
implements
AopProxyFactory
,
Serializable
{
@Override
public
AopProxy
createAopProxy
(
AdvisedSupport
config
)
throws
AopConfigException
{
if
(
config
.
isOptimize
()
||
config
.
isProxyTargetClass
()
||
hasNoUserSuppliedProxyInterfaces
(
config
))
{
...
...
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java
浏览文件 @
01a71ef5
...
...
@@ -152,7 +152,7 @@ final class ConfigurationClass {
* @see #getImportedBy()
*/
public
boolean
isImported
()
{
return
this
.
importedBy
!=
null
;
return
(
this
.
importedBy
!=
null
)
;
}
/**
...
...
@@ -162,7 +162,7 @@ final class ConfigurationClass {
* @see #isImported()
*/
public
ConfigurationClass
getImportedBy
()
{
return
importedBy
;
return
this
.
importedBy
;
}
public
void
addBeanMethod
(
BeanMethod
method
)
{
...
...
@@ -203,7 +203,7 @@ final class ConfigurationClass {
for
(
BeanMethod
beanMethod
:
this
.
beanMethods
)
{
String
fqMethodName
=
beanMethod
.
getFullyQualifiedMethodName
();
Integer
currentCount
=
methodNameCounts
.
get
(
fqMethodName
);
int
newCount
=
currentCount
!=
null
?
currentCount
+
1
:
1
;
int
newCount
=
(
currentCount
!=
null
?
currentCount
+
1
:
1
)
;
methodNameCounts
.
put
(
fqMethodName
,
newCount
);
}
for
(
String
fqMethodName
:
methodNameCounts
.
keySet
())
{
...
...
spring-oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml
浏览文件 @
01a71ef5
<?xml version="1.0" encoding="UTF-8"?>
<beans
xmlns=
"http://www.springframework.org/schema/beans"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xmlns:oxm=
"http://www.springframework.org/schema/oxm"
xsi:schemaLocation=
"http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-
2.0
.xsd
xsi:schemaLocation=
"http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-
3.1
.xsd
http://www.springframework.org/schema/oxm http://www.springframework.org/schema/oxm/spring-oxm-3.1.xsd"
>
<!-- XMLBeans -->
<oxm:xmlbeans-marshaller
id=
"xmlBeansMarshaller"
options=
"xmlBeansOptions"
/>
<oxm:xmlbeans-marshaller
id=
"xmlBeansMarshaller"
options=
"xmlBeansOptions"
/>
<bean
id=
"xmlBeansOptions"
class=
"org.springframework.oxm.xmlbeans.XmlOptionsFactoryBean"
>
<property
name=
"options"
>
...
...
@@ -17,22 +16,22 @@
</bean>
<!-- JAXB2 -->
<oxm:jaxb2-marshaller
id=
"jaxb2ContextPathMarshaller"
contextPath=
"org.springframework.oxm.jaxb.test"
/>
<oxm:jaxb2-marshaller
id=
"jaxb2ContextPathMarshaller"
contextPath=
"org.springframework.oxm.jaxb.test"
/>
<oxm:jaxb2-marshaller
id=
"jaxb2ClassesMarshaller"
>
<oxm:class-to-be-bound
name=
"org.springframework.oxm.jaxb.test.Flights"
/>
<oxm:class-to-be-bound
name=
"org.springframework.oxm.jaxb.test.FlightType"
/>
<oxm:class-to-be-bound
name=
"org.springframework.oxm.jaxb.test.Flights"
/>
<oxm:class-to-be-bound
name=
"org.springframework.oxm.jaxb.test.FlightType"
/>
</oxm:jaxb2-marshaller>
<!-- Castor -->
<oxm:castor-marshaller
id=
"castorEncodingMarshaller"
encoding=
"ISO-8859-1"
/>
<oxm:castor-marshaller
id=
"castorEncodingMarshaller"
encoding=
"ISO-8859-1"
/>
<oxm:castor-marshaller
id=
"castorTargetClassMarshaller"
target-class=
"org.springframework.oxm.castor.Flight"
/>
<oxm:castor-marshaller
id=
"castorTargetClassMarshaller"
target-class=
"org.springframework.oxm.castor.Flight"
/>
<oxm:castor-marshaller
id=
"castorTargetPackageMarshaller"
target-package=
"org.springframework.oxm.castor"
/>
<oxm:castor-marshaller
id=
"castorTargetPackageMarshaller"
target-package=
"org.springframework.oxm.castor"
/>
<oxm:castor-marshaller
id=
"castorMappingLocationMarshaller"
mapping-location=
"classpath:org/springframework/oxm/castor/mapping.xml"
/>
mapping-location=
"classpath:org/springframework/oxm/castor/mapping.xml"
/>
</beans>
spring-web/src/main/java/org/springframework/http/MediaType.java
浏览文件 @
01a71ef5
...
...
@@ -403,7 +403,7 @@ public class MediaType implements Comparable<MediaType> {
* Indicates whether the {@linkplain #getType() type} is the wildcard character {@code *} or not.
*/
public
boolean
isWildcardType
()
{
return
WILDCARD_TYPE
.
equals
(
type
);
return
WILDCARD_TYPE
.
equals
(
t
his
.
t
ype
);
}
/**
...
...
@@ -419,7 +419,7 @@ public class MediaType implements Comparable<MediaType> {
* @return whether the subtype is {@code *}
*/
public
boolean
isWildcardSubtype
()
{
return
WILDCARD_TYPE
.
equals
(
subtype
)
||
subtype
.
startsWith
(
"*+"
);
return
WILDCARD_TYPE
.
equals
(
this
.
subtype
)
||
this
.
subtype
.
startsWith
(
"*+"
);
}
/**
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录