Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
14097727
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,发现更多精彩内容 >>
提交
14097727
编写于
10月 23, 2015
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Delete empty (with no modifications in current session) SQL scripts.
上级
b7b54212
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
44 addition
and
5 deletion
+44
-5
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
....core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
+44
-5
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
浏览文件 @
14097727
...
@@ -18,11 +18,9 @@
...
@@ -18,11 +18,9 @@
package
org.jkiss.dbeaver.ui.editors.sql
;
package
org.jkiss.dbeaver.ui.editors.sql
;
import
org.eclipse.core.resources.IFile
;
import
org.eclipse.core.resources.IFile
;
import
org.eclipse.core.resources.IFileState
;
import
org.eclipse.core.resources.IProject
;
import
org.eclipse.core.resources.IProject
;
import
org.eclipse.core.runtime.CoreException
;
import
org.eclipse.core.runtime.*
;
import
org.eclipse.core.runtime.IProgressMonitor
;
import
org.eclipse.core.runtime.IStatus
;
import
org.eclipse.core.runtime.Status
;
import
org.eclipse.core.runtime.jobs.IJobChangeEvent
;
import
org.eclipse.core.runtime.jobs.IJobChangeEvent
;
import
org.eclipse.core.runtime.jobs.Job
;
import
org.eclipse.core.runtime.jobs.Job
;
import
org.eclipse.core.runtime.jobs.JobChangeAdapter
;
import
org.eclipse.core.runtime.jobs.JobChangeAdapter
;
...
@@ -90,8 +88,11 @@ import org.jkiss.dbeaver.ui.editors.sql.log.SQLLogPanel;
...
@@ -90,8 +88,11 @@ import org.jkiss.dbeaver.ui.editors.sql.log.SQLLogPanel;
import
org.jkiss.dbeaver.ui.editors.text.ScriptPositionColumn
;
import
org.jkiss.dbeaver.ui.editors.text.ScriptPositionColumn
;
import
org.jkiss.dbeaver.ui.views.plan.ExplainPlanViewer
;
import
org.jkiss.dbeaver.ui.views.plan.ExplainPlanViewer
;
import
org.jkiss.dbeaver.utils.GeneralUtils
;
import
org.jkiss.dbeaver.utils.GeneralUtils
;
import
org.jkiss.utils.ArrayUtils
;
import
org.jkiss.utils.CommonUtils
;
import
org.jkiss.utils.CommonUtils
;
import
java.io.File
;
import
java.io.InputStream
;
import
java.lang.reflect.InvocationTargetException
;
import
java.lang.reflect.InvocationTargetException
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.Collections
;
...
@@ -862,7 +863,9 @@ public class SQLEditor extends SQLEditorBase implements
...
@@ -862,7 +863,9 @@ public class SQLEditor extends SQLEditorBase implements
@Override
@Override
public
void
dispose
()
public
void
dispose
()
{
{
// Acquire ds container
IFile
sqlFile
=
EditorUtils
.
getFileFromEditorInput
(
getEditorInput
());
// Release ds container
releaseContainer
();
releaseContainer
();
closeAllJobs
();
closeAllJobs
();
...
@@ -879,6 +882,42 @@ public class SQLEditor extends SQLEditorBase implements
...
@@ -879,6 +882,42 @@ public class SQLEditor extends SQLEditorBase implements
curQueryProcessor
=
null
;
curQueryProcessor
=
null
;
super
.
dispose
();
super
.
dispose
();
if
(
sqlFile
!=
null
)
{
deleteFileIfEmpty
(
sqlFile
);
}
}
private
void
deleteFileIfEmpty
(
IFile
sqlFile
)
{
if
(
sqlFile
==
null
||
!
sqlFile
.
exists
())
{
return
;
}
File
osFile
=
sqlFile
.
getLocation
().
toFile
();
if
(!
osFile
.
exists
()
||
osFile
.
length
()
!=
0
)
{
// Not empty
return
;
}
try
{
IProgressMonitor
monitor
=
new
NullProgressMonitor
();
IFileState
[]
fileHistory
=
sqlFile
.
getHistory
(
monitor
);
if
(!
ArrayUtils
.
isEmpty
(
fileHistory
))
{
for
(
IFileState
historyItem
:
fileHistory
)
{
try
(
InputStream
contents
=
historyItem
.
getContents
())
{
int
cValue
=
contents
.
read
();
if
(
cValue
!=
-
1
)
{
// At least once there was some content saved
return
;
}
}
}
}
// This file is empty and never (at least during this session) had any contents.
// Drop it.
log
.
debug
(
"Delete empty SQL script '"
+
sqlFile
.
getFullPath
().
toOSString
()
+
"'"
);
sqlFile
.
delete
(
true
,
monitor
);
}
catch
(
Exception
e
)
{
log
.
error
(
"Can't delete empty script file"
,
e
);
//$NON-NLS-1$
}
}
}
private
void
closeAllJobs
()
private
void
closeAllJobs
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录