Browse Source

Merge pull request #584 in DESIGN/design from ~YAOH.WU/design:feature/10.0 to feature/10.0

* commit '2af35bcb35a7c37d6e50aa1321d80708e5d7fc79':
  无任务,findbugs修复
research/10.0
yaoh.wu 6 years ago
parent
commit
4e84e8b1d1
  1. 2
      designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java
  2. 6
      designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileNodeComparator.java

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

@ -303,8 +303,6 @@ public class TemplateTreePane extends JPanel implements FileOperations {
private boolean deleteNodes(Collection<ExpandMutableTreeNode> nodes) { private boolean deleteNodes(Collection<ExpandMutableTreeNode> nodes) {
boolean isLocal = WorkContext.getCurrent().isLocal();
boolean success = true; boolean success = true;
for (ExpandMutableTreeNode treeNode : nodes) { for (ExpandMutableTreeNode treeNode : nodes) {
Object node = treeNode.getUserObject(); Object node = treeNode.getUserObject();

6
designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileNodeComparator.java

@ -3,13 +3,15 @@ package com.fr.design.gui.itree.filetree;
import com.fr.base.FRContext; import com.fr.base.FRContext;
import com.fr.file.filetree.FileNode; import com.fr.file.filetree.FileNode;
import java.io.Serializable;
import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
/** /**
* FileTreeNode compare... * FileTreeNode compare...
* Directory is in the first. and normal file the in the last. * Directory is in the first. and normal file the in the last.
*/ */
public class FileNodeComparator implements Comparator<FileNode> { public class FileNodeComparator implements Comparator<FileNode>, Serializable {
/** /**
* 正序还是倒序 * 正序还是倒序
*/ */
@ -46,7 +48,7 @@ public class FileNodeComparator implements Comparator<FileNode> {
public FileNodeComparator(boolean reverse, String[] types) { public FileNodeComparator(boolean reverse, String[] types) {
this.isReverse = reverse; this.isReverse = reverse;
this.supportTypes = types; this.supportTypes = Arrays.copyOf(types, types.length);
} }
/** /**

Loading…
Cancel
Save