|
|
|
@ -20,7 +20,7 @@ import com.fr.design.mainframe.manager.search.TemplateTreeSearchManager;
|
|
|
|
|
import com.fr.design.mainframe.manager.search.searcher.control.pane.TemplateSearchRemindPane; |
|
|
|
|
import com.fr.design.mainframe.vcs.common.VcsHelper; |
|
|
|
|
import com.fr.design.worker.check.CheckLockResult; |
|
|
|
|
import com.fr.design.worker.check.CheckLockWorker; |
|
|
|
|
import com.fr.design.worker.check.BaseCheckLockWorker; |
|
|
|
|
import com.fr.file.FILE; |
|
|
|
|
import com.fr.file.FileNodeFILE; |
|
|
|
|
import com.fr.file.filetree.FileNode; |
|
|
|
@ -242,16 +242,16 @@ public class TemplateTreePane extends JPanel implements FileOperations {
|
|
|
|
|
|
|
|
|
|
String reportPath = reportletsTree.getSelectedTemplatePath(); |
|
|
|
|
final String selectedFilePath = StableUtils.pathJoin(ProjectConstants.REPORTLETS_NAME, reportPath); |
|
|
|
|
CheckLockWorker checkLockWorker = getCheckLockWorker(node, selectedFilePath); |
|
|
|
|
BaseCheckLockWorker checkLockWorker = getCheckLockWorker(node, selectedFilePath); |
|
|
|
|
checkLockWorker.execute(); |
|
|
|
|
CheckLockResult checkLockResult = checkLockWorker.getResult(); |
|
|
|
|
processLockResult(checkLockResult, node ,selectedFilePath); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@NotNull |
|
|
|
|
private CheckLockWorker getCheckLockWorker(FileNode node, String selectedFilePath) { |
|
|
|
|
private BaseCheckLockWorker getCheckLockWorker(FileNode node, String selectedFilePath) { |
|
|
|
|
String lock = node.getLock(); |
|
|
|
|
CheckLockWorker checkLockWorker = new CheckLockWorker(() -> { |
|
|
|
|
BaseCheckLockWorker checkLockWorker = new BaseCheckLockWorker(() -> { |
|
|
|
|
boolean showLockInfo = needShowLockInfo(lock, selectedFilePath, node); |
|
|
|
|
UserInfo userInfo = null; |
|
|
|
|
if (showLockInfo) { |
|
|
|
|