Browse Source

Merge pull request #256 in DESIGN/design from ~HZZZ/design61:release/10.0 to release/10.0

* commit '1f335215e0d689ad4474870564fba5b1cbc03da1':
  REPORT-9974【平台二轮回归】远程设计删除文件 不能移动到回收站
master
Hzzz 7 years ago
parent
commit
7d53ab1e2a
  1. 5
      designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java

5
designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java

@ -4,7 +4,7 @@
package com.fr.design.file;
import com.fr.base.FRContext;
import com.fr.base.io.FileAssistUtils;
import com.fr.base.io.FileAssistUtilsOperator;
import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.itree.filetree.TemplateFileTree;
import com.fr.design.layout.FRGUIPaneFactory;
@ -183,7 +183,8 @@ public class TemplateTreePane extends JPanel implements FileOperations {
}
if (nodeFile.exists()) {
String path = StableUtils.pathJoin(nodeFile.getEnvPath(), nodeFile.getPath());
FileAssistUtils.moveToTrash(nodeFile.getPath());
FileAssistUtilsOperator fileAssistUtils = WorkContext.getCurrent().get(FileAssistUtilsOperator.class);
fileAssistUtils.moveToTrash(nodeFile.getPath());
deleteHistory(path.replaceAll("/", "\\\\"));
} else {
JOptionPane.showMessageDialog(this, com.fr.design.i18n.Toolkit.i18nText("Warning-Template_Do_Not_Exsit"), ProductConstants.PRODUCT_NAME,

Loading…
Cancel
Save