Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sanbo_xyz
Gephi
提交
a39dfec6
G
Gephi
项目概览
sanbo_xyz
/
Gephi
大约 1 年 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
Gephi
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
a39dfec6
编写于
1月 16, 2023
作者:
M
Mathieu Bastian
提交者:
GitHub
1月 16, 2023
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2737 from gephi/u/totetmatt/bug_fix_empty_gephi_file_on_save
#2736 Fix issue with empty gephi file when save on close
上级
369f3561
7135a18a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
40 addition
and
25 deletion
+40
-25
modules/DesktopImport/src/main/java/org/gephi/desktop/importer/DesktopImportControllerUI.java
...org/gephi/desktop/importer/DesktopImportControllerUI.java
+13
-16
modules/DesktopProject/src/main/java/org/gephi/desktop/project/ProjectControllerUIImpl.java
...va/org/gephi/desktop/project/ProjectControllerUIImpl.java
+27
-9
未找到文件。
modules/DesktopImport/src/main/java/org/gephi/desktop/importer/DesktopImportControllerUI.java
浏览文件 @
a39dfec6
...
...
@@ -356,24 +356,21 @@ public class DesktopImportControllerUI implements ImportControllerUI {
importer
.
getClass
().
getSimpleName
()));
String
taskName
=
NbBundle
.
getMessage
(
DesktopImportControllerUI
.
class
,
"DesktopImportControllerUI.taskName"
,
containerSource
);
executor
.
execute
(
task
,
new
Runnable
()
{
@Override
public
void
run
()
{
try
{
Container
container
;
if
(
importer
instanceof
FileImporter
.
FileAware
&&
file
!=
null
)
{
container
=
controller
.
importFile
(
file
,
importer
);
}
else
{
container
=
controller
.
importFile
(
reader
,
importer
);
}
executor
.
execute
(
task
,
()
->
{
try
{
Container
container
;
if
(
importer
instanceof
FileImporter
.
FileAware
&&
file
!=
null
)
{
container
=
controller
.
importFile
(
file
,
importer
);
}
else
{
container
=
controller
.
importFile
(
reader
,
importer
);
}
if
(
container
!=
null
)
{
container
.
setSource
(
containerSource
);
results
.
add
(
container
);
}
}
catch
(
Exception
ex
)
{
throw
new
RuntimeException
(
ex
);
if
(
container
!=
null
)
{
container
.
setSource
(
containerSource
);
results
.
add
(
container
);
}
}
catch
(
Exception
ex
)
{
throw
new
RuntimeException
(
ex
);
}
},
taskName
,
errorHandler
.
createHandler
(
containerSource
));
}
...
...
modules/DesktopProject/src/main/java/org/gephi/desktop/project/ProjectControllerUIImpl.java
浏览文件 @
a39dfec6
...
...
@@ -47,6 +47,10 @@ import java.io.IOException;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.concurrent.Callable
;
import
java.util.concurrent.CompletableFuture
;
import
java.util.concurrent.ExecutionException
;
import
java.util.concurrent.Future
;
import
javax.swing.JFileChooser
;
import
javax.swing.JFrame
;
import
javax.swing.JOptionPane
;
...
...
@@ -222,22 +226,28 @@ public class ProjectControllerUIImpl implements ProjectListener {
});
}
private
void
saveProject
(
Project
project
,
File
file
)
{
longTaskExecutor
.
execute
(
null
,
()
->
{
controller
.
saveProject
(
project
,
file
);
private
Future
<
Void
>
saveProject
(
Project
project
,
File
file
)
{
return
longTaskExecutor
.
execute
(
null
,
new
Callable
<
Void
>()
{
@Override
public
Void
call
()
throws
Exception
{
controller
.
saveProject
(
project
,
file
);
return
null
;
}
});
}
public
void
saveProject
()
{
public
Future
<
Void
>
saveProject
()
{
Project
project
=
controller
.
getCurrentProject
();
if
(
project
.
hasFile
())
{
saveProject
(
project
,
project
.
getFile
());
return
saveProject
(
project
,
project
.
getFile
());
}
else
{
saveAsProject
();
return
saveAsProject
();
}
}
public
void
saveAsProject
()
{
public
Future
<
Void
>
saveAsProject
()
{
final
String
LAST_PATH
=
"SaveAsProject_Last_Path"
;
final
String
LAST_PATH_DEFAULT
=
"SaveAsProject_Last_Path_Default"
;
...
...
@@ -281,8 +291,9 @@ public class ProjectControllerUIImpl implements ProjectListener {
NbPreferences
.
forModule
(
ProjectControllerUIImpl
.
class
).
put
(
LAST_PATH
,
file
.
getAbsolutePath
());
// Save file
saveProject
(
controller
.
getCurrentProject
(),
file
);
return
saveProject
(
controller
.
getCurrentProject
(),
file
);
}
return
CompletableFuture
.
completedFuture
(
null
);
}
private
boolean
canExport
(
JFileChooser
chooser
)
{
...
...
@@ -335,7 +346,14 @@ public class ProjectControllerUIImpl implements ProjectListener {
new
Object
[]
{
saveBundle
,
doNotSaveBundle
,
cancelBundle
},
saveBundle
);
Object
result
=
DialogDisplayer
.
getDefault
().
notify
(
msg
);
if
(
result
==
saveBundle
)
{
saveProject
();
Future
<
Void
>
saveTask
=
saveProject
();
if
(
saveTask
!=
null
){
try
{
saveTask
.
get
();
}
catch
(
InterruptedException
|
ExecutionException
ex
)
{
Exceptions
.
printStackTrace
(
ex
);
}
}
}
else
if
(
result
==
cancelBundle
)
{
return
false
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录