Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
62ddef47
K
kotlin
项目概览
硅谷海盗
/
kotlin
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kotlin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
62ddef47
编写于
2月 22, 2012
作者:
S
Stepan Koltsov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix tests after javabean properties parsing
上级
71f62f87
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
20 addition
and
8 deletion
+20
-8
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
...tbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+20
-4
testlib/test/Test.kt
testlib/test/Test.kt
+0
-4
未找到文件。
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
浏览文件 @
62ddef47
...
...
@@ -1034,6 +1034,7 @@ public class JavaDescriptorResolver {
PropertyAccessorData
getter
;
PropertyAccessorData
setter
;
PropertyAccessorData
field
;
boolean
ext
;
}
Map
<
Object
,
GroupingValue
>
map
=
new
HashMap
<
Object
,
GroupingValue
>();
...
...
@@ -1045,9 +1046,14 @@ public class JavaDescriptorResolver {
GroupingValue
value
=
map
.
get
(
key
);
if
(
value
==
null
)
{
value
=
new
GroupingValue
();
value
.
ext
=
propertyAccessor
.
getReceiverType
()
!=
null
;
map
.
put
(
key
,
value
);
}
if
(
value
.
ext
!=
(
propertyAccessor
.
getReceiverType
()
!=
null
))
{
throw
new
IllegalStateException
(
"internal error, incorrect key"
);
}
if
(
propertyAccessor
.
isGetter
())
{
if
(
value
.
getter
!=
null
)
{
throw
new
IllegalStateException
(
"oops, duplicate key"
);
...
...
@@ -1071,10 +1077,20 @@ public class JavaDescriptorResolver {
Set
<
VariableDescriptor
>
r
=
new
HashSet
<
VariableDescriptor
>(
1
);
// we cannot have more then one property with given name even if java code
// has several fields, getters and setter of different types
if
(
map
.
size
()
==
1
)
{
GroupingValue
members
=
map
.
values
().
iterator
().
next
();
int
regularProperitesCount
=
0
;
for
(
GroupingValue
members
:
map
.
values
())
{
if
(!
members
.
ext
)
{
++
regularProperitesCount
;
}
}
for
(
GroupingValue
members
:
map
.
values
())
{
// we cannot have more then one property with given name even if java code
// has several fields, getters and setter of different types
if
(!
members
.
ext
&&
regularProperitesCount
>
1
)
{
continue
;
}
boolean
isFinal
;
if
(
members
.
setter
==
null
&&
members
.
getter
==
null
)
{
...
...
testlib/test/Test.kt
浏览文件 @
62ddef47
...
...
@@ -18,10 +18,6 @@ protected class TestBuilt<T>(name: String, val builder: TestBuilder<T>, val test
override
fun
countTestCases
():
Int
=
1
var
name
:
String
get
()
=
super
.
getName
().
sure
()
set
(
newName
:
String
)
=
super
.
setName
(
newName
)
override
fun
setUp
()
=
this
.(
builder
.
setUp
)()
override
fun
tearDown
()
=
this
.(
builder
.
tearDown
)()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录