From 32fdc712f3bbe7eb991c8a9b0bb8b9d2bf1a44f2 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Mon, 8 Jan 2024 15:38:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-111337=20=E3=80=90=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E6=80=A7=E8=83=BD=E3=80=91=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E5=8D=A1=E9=A1=BF=E4=BC=98=E5=8C=96=20=E6=89=93=E5=BC=80?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=8A=A8=E7=94=BB=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../check/{CheckLockWorker.java => BaseCheckLockWorker.java} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename designer-base/src/main/java/com/fr/design/worker/check/{CheckLockWorker.java => BaseCheckLockWorker.java} (90%) diff --git a/designer-base/src/main/java/com/fr/design/worker/check/CheckLockWorker.java b/designer-base/src/main/java/com/fr/design/worker/check/BaseCheckLockWorker.java similarity index 90% rename from designer-base/src/main/java/com/fr/design/worker/check/CheckLockWorker.java rename to designer-base/src/main/java/com/fr/design/worker/check/BaseCheckLockWorker.java index ed8f625df7..bf9870a909 100644 --- a/designer-base/src/main/java/com/fr/design/worker/check/CheckLockWorker.java +++ b/designer-base/src/main/java/com/fr/design/worker/check/BaseCheckLockWorker.java @@ -14,14 +14,14 @@ import java.util.concurrent.TimeoutException; * @since 11.0 * Created on 2024/1/8 */ -public abstract class CheckLockWorker extends SwingWorker { +public abstract class BaseCheckLockWorker extends SwingWorker { private static final int TIME_OUT = 50; private boolean slowly = false; private final Callable doInBackground; private CheckLockResult result; - public CheckLockWorker(Callable doInBackground) { + public BaseCheckLockWorker(Callable doInBackground) { this.doInBackground = doInBackground; } @Override From 8987fa09c1f16211148be8ee37838173612068cf Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Mon, 8 Jan 2024 15:39:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-111337=20=E3=80=90=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E6=80=A7=E8=83=BD=E3=80=91=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E5=8D=A1=E9=A1=BF=E4=BC=98=E5=8C=96=20=E6=89=93=E5=BC=80?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=8A=A8=E7=94=BB=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/file/TemplateTreePane.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java b/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java index 9d68860569..3d4e94a120 100644 --- a/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java +++ b/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java @@ -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) {