Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
257be8a7
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dbeaver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
257be8a7
编写于
2月 22, 2019
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#5278 Plaintext view: extra spaces render fix
上级
0750d4cc
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
10 addition
and
9 deletion
+10
-9
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/plaintext/PlainTextPresentation.java
...i/controls/resultset/plaintext/PlainTextPresentation.java
+10
-9
未找到文件。
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/plaintext/PlainTextPresentation.java
浏览文件 @
257be8a7
...
...
@@ -266,23 +266,23 @@ public class PlainTextPresentation extends AbstractPresentation implements IAdap
List
<
DBDAttributeBinding
>
attrs
=
model
.
getVisibleAttributes
();
List
<
ResultSetRow
>
allRows
=
model
.
getAllRows
();
int
extraSpacesNum
=
extraSpaces
?
2
:
0
;
if
(
colWidths
==
null
)
{
// Calculate column widths
colWidths
=
new
int
[
attrs
.
size
()];
for
(
int
i
=
0
;
i
<
attrs
.
size
();
i
++)
{
DBDAttributeBinding
attr
=
attrs
.
get
(
i
);
colWidths
[
i
]
=
getAttributeName
(
attr
).
length
();
colWidths
[
i
]
=
getAttributeName
(
attr
).
length
()
+
extraSpacesNum
;
if
(
showNulls
&&
!
attr
.
isRequired
())
{
colWidths
[
i
]
=
Math
.
max
(
colWidths
[
i
],
DBConstants
.
NULL_VALUE_LABEL
.
length
());
}
for
(
ResultSetRow
row
:
allRows
)
{
String
displayString
=
getCellString
(
model
,
attr
,
row
,
displayFormat
);
colWidths
[
i
]
=
Math
.
max
(
colWidths
[
i
],
getStringWidth
(
displayString
));
colWidths
[
i
]
=
Math
.
max
(
colWidths
[
i
],
getStringWidth
(
displayString
)
+
extraSpacesNum
);
}
}
for
(
int
i
=
0
;
i
<
colWidths
.
length
;
i
++)
{
if
(
extraSpaces
)
colWidths
[
i
]++;
if
(
colWidths
[
i
]
>
maxColumnSize
)
{
colWidths
[
i
]
=
maxColumnSize
;
}
...
...
@@ -294,12 +294,14 @@ public class PlainTextPresentation extends AbstractPresentation implements IAdap
if
(
delimLeading
)
grid
.
append
(
"|"
);
for
(
int
i
=
0
;
i
<
attrs
.
size
();
i
++)
{
if
(
i
>
0
)
grid
.
append
(
"|"
);
if
(
extraSpaces
)
grid
.
append
(
" "
);
DBDAttributeBinding
attr
=
attrs
.
get
(
i
);
String
attrName
=
getAttributeName
(
attr
);
grid
.
append
(
attrName
);
for
(
int
k
=
colWidths
[
i
]
-
attrName
.
length
();
k
>
0
;
k
--)
{
for
(
int
k
=
colWidths
[
i
]
-
attrName
.
length
()
-
extraSpacesNum
;
k
>
0
;
k
--)
{
grid
.
append
(
" "
);
}
if
(
extraSpaces
)
grid
.
append
(
" "
);
}
if
(
delimTrailing
)
grid
.
append
(
"|"
);
grid
.
append
(
"\n"
);
...
...
@@ -334,25 +336,24 @@ public class PlainTextPresentation extends AbstractPresentation implements IAdap
}
int
stringWidth
=
getStringWidth
(
displayString
);
if
(
extraSpaces
)
stringWidth
++;
if
(
extraSpaces
)
grid
.
append
(
" "
);
DBPDataKind
dataKind
=
attr
.
getDataKind
();
if
((
dataKind
==
DBPDataKind
.
NUMERIC
&&
rightJustifyNumbers
)
||
(
dataKind
==
DBPDataKind
.
DATETIME
&&
rightJustifyDateTime
))
{
// Right justify value
for
(
int
j
=
colWidths
[
k
]
-
stringWidth
;
j
>
0
;
j
--)
{
for
(
int
j
=
colWidths
[
k
]
-
stringWidth
-
extraSpacesNum
;
j
>
0
;
j
--)
{
grid
.
append
(
" "
);
}
grid
.
append
(
displayString
);
if
(
extraSpaces
)
grid
.
append
(
" "
);
}
else
{
if
(
extraSpaces
)
grid
.
append
(
" "
);
grid
.
append
(
displayString
);
for
(
int
j
=
colWidths
[
k
]
-
stringWidth
;
j
>
0
;
j
--)
{
for
(
int
j
=
colWidths
[
k
]
-
stringWidth
-
extraSpacesNum
;
j
>
0
;
j
--)
{
grid
.
append
(
" "
);
}
}
if
(
extraSpaces
)
grid
.
append
(
" "
);
}
if
(
delimTrailing
)
grid
.
append
(
"|"
);
grid
.
append
(
"\n"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录