Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
a9d900a2
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,发现更多精彩内容 >>
提交
a9d900a2
编写于
5月 21, 2016
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
External file editors props
Former-commit-id:
887eb923
上级
4ad4f059
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
25 deletion
+16
-25
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverInstanceServer.java
...ore/src/org/jkiss/dbeaver/core/DBeaverInstanceServer.java
+3
-20
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
....core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
+13
-5
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverInstanceServer.java
浏览文件 @
a9d900a2
...
...
@@ -18,18 +18,12 @@
package
org.jkiss.dbeaver.core
;
import
org.eclipse.core.filesystem.EFS
;
import
org.eclipse.core.filesystem.IFileStore
;
import
org.eclipse.core.runtime.CoreException
;
import
org.eclipse.swt.widgets.Shell
;
import
org.eclipse.ui.IEditorDescriptor
;
import
org.eclipse.ui.IEditorInput
;
import
org.eclipse.ui.IWorkbenchWindow
;
import
org.eclipse.ui.ide.FileStoreEditorInput
;
import
org.eclipse.ui.ide.IDE
;
import
org.jkiss.dbeaver.Log
;
import
org.jkiss.dbeaver.IInstanceController
;
import
org.jkiss.dbeaver.Log
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.editors.EditorUtils
;
import
org.jkiss.dbeaver.utils.GeneralUtils
;
import
org.jkiss.utils.IOUtils
;
...
...
@@ -66,20 +60,9 @@ public class DBeaverInstanceServer implements IInstanceController {
for
(
String
filePath
:
fileNames
)
{
File
file
=
new
File
(
filePath
);
if
(
file
.
exists
())
{
try
{
IEditorDescriptor
desc
=
window
.
getWorkbench
().
getEditorRegistry
().
getDefaultEditor
(
file
.
getName
());
IFileStore
fileStore
=
EFS
.
getStore
(
file
.
toURI
());
IEditorInput
input
=
new
FileStoreEditorInput
(
fileStore
);
IDE
.
openEditor
(
window
.
getActivePage
(),
input
,
desc
.
getId
());
}
catch
(
CoreException
e
)
{
log
.
error
(
"Can't open editor from file '"
+
file
.
getAbsolutePath
(),
e
);
}
EditorUtils
.
openExternalFileEditor
(
file
,
window
);
}
}
// if (!shell.getMinimized())
// {
// shell.setMinimized(true);
// }
shell
.
setMinimized
(
false
);
shell
.
forceActive
();
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
浏览文件 @
a9d900a2
...
...
@@ -89,6 +89,7 @@ import org.jkiss.utils.CommonUtils;
import
java.io.File
;
import
java.io.InputStream
;
import
java.lang.reflect.InvocationTargetException
;
import
java.net.URI
;
import
java.util.*
;
import
java.util.List
;
import
java.util.concurrent.atomic.AtomicInteger
;
...
...
@@ -636,7 +637,12 @@ public class SQLEditor extends SQLEditorBase implements
}
else
if
(
editorInput
instanceof
IPathEditorInput
)
{
scriptPath
=
((
IPathEditorInput
)
editorInput
).
getPath
().
toString
();
}
else
if
(
editorInput
instanceof
IURIEditorInput
)
{
scriptPath
=
((
IURIEditorInput
)
editorInput
).
getURI
().
toString
();
final
URI
uri
=
((
IURIEditorInput
)
editorInput
).
getURI
();
if
(
"file"
.
equals
(
uri
.
getScheme
()))
{
scriptPath
=
new
File
(
uri
).
getAbsolutePath
();
}
else
{
scriptPath
=
uri
.
toString
();
}
}
else
{
scriptPath
=
"<not a file>"
;
}
...
...
@@ -649,14 +655,16 @@ public class SQLEditor extends SQLEditorBase implements
private
String
getEditorName
()
{
final
IFile
file
=
EditorUtils
.
getFileFromInput
(
getEditorInput
());
File
localFile
=
file
==
null
?
EditorUtils
.
getLocalFileFromInput
(
getEditorInput
())
:
null
;
String
scriptName
;
if
(
file
!=
null
)
{
scriptName
=
file
.
getFullPath
().
removeFileExtension
().
lastSegment
();
}
else
if
(
localFile
!=
null
)
{
scriptName
=
localFile
.
getName
();
}
else
{
scriptName
=
"<object>"
;
File
localFile
=
EditorUtils
.
getLocalFileFromInput
(
getEditorInput
());
if
(
localFile
!=
null
)
{
return
localFile
.
getName
();
}
else
{
scriptName
=
"<object>"
;
}
}
DBPDataSourceContainer
dataSourceContainer
=
getDataSourceContainer
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录