From 0e318971e0bbea8f167ed6927993e5ad083737ca Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Fri, 28 Jul 2023 12:21:44 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-101608=20=E3=80=90=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=89=E6=9C=9F=E3=80=91=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=AD=E5=BF=83=E5=85=A5=E5=8F=A3=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=E7=89=88=E6=9C=AC=E8=AF=A6=E6=83=85=EF=BC=8C=E6=9C=AA?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=9A=84=E6=A8=A1=E6=9D=BF=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E8=BF=98=E5=8E=9F=EF=BC=8C=E9=80=89=E6=8B=A9=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E8=BF=98=E5=8E=9F=E4=BC=9A=E5=A4=B1=E8=B4=A5=20=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/mainframe/vcs/common/VcsCloseTemplateHelper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsCloseTemplateHelper.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsCloseTemplateHelper.java index a2f43d2130..5877795589 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsCloseTemplateHelper.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsCloseTemplateHelper.java @@ -36,10 +36,10 @@ public class VcsCloseTemplateHelper { * * @param path 对应模板路径 * @param isCurrentEditing 是否是正在编辑的模板 - * @param dialog 生成的新版本管理的详情面板的父面板 + * @param parent 生成的新版本管理的详情面板的父面板 */ - public static void checkTemplateSavedAndShowVcsNewPane(String path, boolean isCurrentEditing, BasicDialog dialog, VcsNewPane pane) { - VcsNewPaneWrapper wrapper = new VcsNewPaneWrapper(path, dialog, pane); + public static void checkTemplateSavedAndShowVcsNewPane(String path, boolean isCurrentEditing, BasicDialog parent, VcsNewPane pane) { + VcsNewPaneWrapper wrapper = new VcsNewPaneWrapper(path, parent, pane); for (JTemplate jTemplate : HistoryTemplateListCache.getInstance().getHistoryList()) { if (ComparatorUtils.equals(jTemplate.getEditingFILE().getPath(), path)) { if (!jTemplate.isALLSaved()) {