Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
3c8bc43a
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
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,发现更多精彩内容 >>
提交
3c8bc43a
编写于
9月 23, 2016
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
JSON display string. TextUtils addition. Image detect fix
上级
34a13cd9
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
24 addition
and
11 deletion
+24
-11
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenArtifactVersion.java
...rg/jkiss/dbeaver/registry/maven/MavenArtifactVersion.java
+2
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/TextUtils.java
...kiss.dbeaver.core/src/org/jkiss/dbeaver/ui/TextUtils.java
+4
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetFilterPanel.java
...s/dbeaver/ui/controls/resultset/ResultSetFilterPanel.java
+3
-5
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/managers/stream/ImageStreamValueManager.java
...aver/ui/data/managers/stream/ImageStreamValueManager.java
+5
-3
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/handlers/CopyUnformattedTextAction.java
...er/ui/editors/sql/handlers/CopyUnformattedTextAction.java
+2
-1
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/oci/OCIUtils.java
...oracle/src/org/jkiss/dbeaver/ext/oracle/oci/OCIUtils.java
+2
-1
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/data/PostgreContentJSON.java
...dbeaver/ext/postgresql/model/data/PostgreContentJSON.java
+6
-0
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenArtifactVersion.java
浏览文件 @
3c8bc43a
...
...
@@ -21,6 +21,7 @@ import org.jkiss.code.NotNull;
import
org.jkiss.code.Nullable
;
import
org.jkiss.dbeaver.Log
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.ui.TextUtils
;
import
org.jkiss.dbeaver.utils.RuntimeUtils
;
import
org.jkiss.dbeaver.runtime.WebUtils
;
import
org.jkiss.dbeaver.utils.GeneralUtils
;
...
...
@@ -248,7 +249,7 @@ public class MavenArtifactVersion implements IMavenIdentifier {
version
=
XMLUtils
.
getChildElementBody
(
root
,
"version"
);
description
=
XMLUtils
.
getChildElementBody
(
root
,
"description"
);
if
(
description
!=
null
)
{
description
=
description
.
trim
().
replaceAll
(
"\\s+"
,
" "
);
description
=
TextUtils
.
compactWhiteSpaces
(
description
.
trim
()
);
}
{
// Parent
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/TextUtils.java
浏览文件 @
3c8bc43a
...
...
@@ -35,6 +35,10 @@ import java.util.StringTokenizer;
public
class
TextUtils
{
public
static
final
char
PARAGRAPH_CHAR
=
(
char
)
182
;
public
static
String
compactWhiteSpaces
(
String
str
)
{
return
str
.
replaceAll
(
"\\s+"
,
" "
);
}
public
static
boolean
isEmptyLine
(
IDocument
document
,
int
line
)
throws
BadLocationException
{
IRegion
region
=
document
.
getLineInformation
(
line
);
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetFilterPanel.java
浏览文件 @
3c8bc43a
...
...
@@ -53,10 +53,7 @@ import org.jkiss.dbeaver.model.sql.SQLSyntaxManager;
import
org.jkiss.dbeaver.model.sql.SQLUtils
;
import
org.jkiss.dbeaver.model.struct.DBSDataContainer
;
import
org.jkiss.dbeaver.model.struct.DBSEntity
;
import
org.jkiss.dbeaver.ui.ActionUtils
;
import
org.jkiss.dbeaver.ui.DBeaverIcons
;
import
org.jkiss.dbeaver.ui.UIIcon
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.*
;
import
org.jkiss.dbeaver.ui.controls.StyledTextContentAdapter
;
import
org.jkiss.dbeaver.ui.editors.StringEditorInput
;
import
org.jkiss.dbeaver.ui.editors.SubEditorSite
;
...
...
@@ -383,7 +380,8 @@ class ResultSetFilterPanel extends Composite implements IContentProposalProvider
displayName
=
m
.
replaceAll
(
""
);
}
displayName
=
displayName
.
replaceAll
(
"--.+"
,
""
).
replaceAll
(
"\\s+"
,
" "
);
displayName
=
displayName
.
replaceAll
(
"--.+"
,
""
);
displayName
=
TextUtils
.
compactWhiteSpaces
(
displayName
);
activeDisplayName
=
CommonUtils
.
notEmpty
(
CommonUtils
.
truncateString
(
displayName
,
200
));
if
(
CommonUtils
.
isEmpty
(
activeDisplayName
))
{
activeDisplayName
=
DEFAULT_QUERY_TEXT
;
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/managers/stream/ImageStreamValueManager.java
浏览文件 @
3c8bc43a
...
...
@@ -23,14 +23,12 @@ import org.jkiss.code.NotNull;
import
org.jkiss.code.Nullable
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.Log
;
import
org.jkiss.dbeaver.core.DBeaverUI
;
import
org.jkiss.dbeaver.model.DBUtils
;
import
org.jkiss.dbeaver.model.data.DBDContent
;
import
org.jkiss.dbeaver.model.data.DBDContentStorage
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress
;
import
org.jkiss.dbeaver.model.struct.DBSTypedObject
;
import
org.jkiss.dbeaver.ui.controls.imageview.ImageViewer
;
import
org.jkiss.dbeaver.ui.data.IStreamValueEditor
;
import
org.jkiss.dbeaver.ui.data.IStreamValueManager
;
import
org.jkiss.dbeaver.ui.data.IValueController
;
...
...
@@ -50,7 +48,11 @@ public class ImageStreamValueManager implements IStreamValueManager {
// Applies to image values
ImageDetector
imageDetector
=
new
ImageDetector
(
value
);
if
(!
DBUtils
.
isNullValue
(
value
))
{
DBeaverUI
.
runInUI
(
DBeaverUI
.
getActiveWorkbenchWindow
(),
imageDetector
);
try
{
imageDetector
.
run
(
monitor
);
}
catch
(
Throwable
e
)
{
return
MatchType
.
NONE
;
}
}
return
imageDetector
.
isImage
()
?
MatchType
.
EXCLUSIVE
:
MatchType
.
NONE
;
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/handlers/CopyUnformattedTextAction.java
浏览文件 @
3c8bc43a
...
...
@@ -26,6 +26,7 @@ import org.eclipse.jface.text.rules.IToken;
import
org.eclipse.swt.dnd.TextTransfer
;
import
org.eclipse.swt.widgets.Display
;
import
org.jkiss.dbeaver.model.sql.SQLDialect
;
import
org.jkiss.dbeaver.ui.TextUtils
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.editors.sql.SQLEditorBase
;
import
org.jkiss.dbeaver.ui.editors.sql.syntax.SQLRuleManager
;
...
...
@@ -95,7 +96,7 @@ public class CopyUnformattedTextAction extends Action {
break
;
}
}
comment
=
comment
.
replaceAll
(
"\\s+"
,
" "
);
comment
=
TextUtils
.
compactWhiteSpaces
(
comment
);
result
.
append
(
comment
);
}
else
{
lastWhitespace
=
false
;
...
...
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/oci/OCIUtils.java
浏览文件 @
3c8bc43a
...
...
@@ -23,6 +23,7 @@ import org.jkiss.code.Nullable;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.core.DBeaverCore
;
import
org.jkiss.dbeaver.ext.oracle.model.OracleConstants
;
import
org.jkiss.dbeaver.ui.TextUtils
;
import
org.jkiss.dbeaver.utils.WinRegistry
;
import
org.jkiss.utils.CommonUtils
;
import
org.jkiss.utils.IOUtils
;
...
...
@@ -349,7 +350,7 @@ public class OCIUtils
}
private
static
String
getPlainTnsDescription
(
String
line
)
{
return
line
.
trim
().
replaceAll
(
"\\s+"
,
" "
);
return
TextUtils
.
compactWhiteSpaces
(
line
.
trim
()
);
}
public
static
boolean
isInstantClient
(
String
oraHome
)
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/data/PostgreContentJSON.java
浏览文件 @
3c8bc43a
...
...
@@ -19,11 +19,13 @@ package org.jkiss.dbeaver.ext.postgresql.model.data;
import
org.jkiss.code.NotNull
;
import
org.jkiss.dbeaver.model.DBPDataSource
;
import
org.jkiss.dbeaver.model.data.DBDDisplayFormat
;
import
org.jkiss.dbeaver.model.exec.DBCException
;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCPreparedStatement
;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCSession
;
import
org.jkiss.dbeaver.model.impl.jdbc.data.JDBCContentChars
;
import
org.jkiss.dbeaver.model.struct.DBSTypedObject
;
import
org.jkiss.dbeaver.ui.TextUtils
;
import
org.jkiss.dbeaver.utils.MimeTypes
;
import
java.sql.SQLException
;
...
...
@@ -66,4 +68,8 @@ public class PostgreContentJSON extends JDBCContentChars {
}
}
@Override
public
String
getDisplayString
(
DBDDisplayFormat
format
)
{
return
TextUtils
.
compactWhiteSpaces
(
data
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录