From 6181f58a03cb0bb0d5810078aa1c12ecd864d8d0 Mon Sep 17 00:00:00 2001 From: levy Date: Thu, 29 Sep 2022 10:18:27 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-80251=20=E8=8B=B1=E6=96=87=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=99=A8=E5=9B=BD=E9=99=85=E5=8C=96=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E3=80=90=E9=97=AE=E9=A2=98=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E3=80=911=E3=80=81=E9=83=A8=E5=88=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=A8=A1=E5=9D=97=E7=9A=84label=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=96=87=E5=AD=97=E6=9C=AA=E5=81=9A=E8=87=AA=E5=8A=A8=E6=8D=A2?= =?UTF-8?q?=E8=A1=8C=E8=AE=BE=E7=BD=AE=E3=80=822=E3=80=81=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E7=95=8C=E9=9D=A2=E5=8F=B3=E9=94=AE=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E6=A1=86=E5=AE=BD=E5=BA=A6=E8=A2=AB=E5=9B=BA=E5=AE=9A=EF=BC=8C?= =?UTF-8?q?=E6=9C=AA=E8=80=83=E8=99=91=E4=B8=8D=E5=90=8C=E8=AF=AD=E8=A8=80?= =?UTF-8?q?=E7=9A=84=E9=80=82=E9=85=8D=E9=97=AE=E9=A2=98=E3=80=82=20?= =?UTF-8?q?=E3=80=90=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=911?= =?UTF-8?q?=E3=80=81=E6=9B=B4=E6=94=B9label=E4=B8=BA=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E3=80=822=E3=80=81=E5=B1=80=E9=83=A8?= =?UTF-8?q?=E5=BE=AE=E8=B0=83UI=EF=BC=88=E6=A8=AA=E6=8E=92=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=8F=98=E7=AB=96=E6=8E=92=EF=BC=8C=E5=B7=B2=E4=B8=8E?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=B2=9F=E9=80=9A=E6=97=A0=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=89=E3=80=823=E3=80=81=E6=A0=B9=E6=8D=AE=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E8=AF=AD=E8=A8=80=E7=8E=AF=E5=A2=83=E7=A1=AE=E5=AE=9A?= =?UTF-8?q?=E5=8F=B3=E9=94=AE=E5=BC=B9=E5=87=BA=E6=A1=86=E5=AE=BD=E5=BA=A6?= =?UTF-8?q?=E3=80=82=20=E3=80=90Review=E5=BB=BA=E8=AE=AE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/carton/FeedbackToolboxDialog.java | 6 +++--- .../java/com/fr/design/file/MutilTempalteTabPane.java | 10 +++++----- .../com/fr/design/i18n/dimension_en.properties | 2 +- .../com/fr/design/i18n/dimension_ja_JP.properties | 2 +- .../com/fr/design/i18n/dimension_ko_KR.properties | 2 +- .../com/fr/design/i18n/dimension_zh.properties | 2 +- .../com/fr/design/i18n/dimension_zh_TW.properties | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/carton/FeedbackToolboxDialog.java b/designer-base/src/main/java/com/fr/design/carton/FeedbackToolboxDialog.java index 877f6993c0..83d6e24ac8 100644 --- a/designer-base/src/main/java/com/fr/design/carton/FeedbackToolboxDialog.java +++ b/designer-base/src/main/java/com/fr/design/carton/FeedbackToolboxDialog.java @@ -94,7 +94,7 @@ public class FeedbackToolboxDialog extends JDialog { private JPanel createInfoPane() { JPanel northPane = FRGUIPaneFactory.createNColumnGridInnerContainer_Pane(2, 10, 10); UILabel title = new UILabel(); - title.setText(Toolkit.i18nText("Fine-Design_Basic_Carton_Record_Lag_Time") + ": "); + title.setText(" " + Toolkit.i18nText("Fine-Design_Basic_Carton_Record_Lag_Time") + ": "); //判断一下当天是否有卡顿日志记录，如果有将日期设置为当天，如果没有设置为空 boolean cartonExists = SwitchForSwingChecker.isCartonExists(); if (cartonExists) { @@ -343,8 +343,8 @@ public class FeedbackToolboxDialog extends JDialog { /** * 导出卡顿日志到本地或远程服务器WEB-INF下 * - * @param sourceFile 导出的卡顿日志所在文件夹 - * @param path 文件需要导出到的路径 + * @param sourceFile 导出的卡顿日志所在文件夹 + * @param path 文件需要导出到的路径 * @param sourceFilePath 导出的卡顿日志所在文件夹的路径 */ private void exportCartonLog(File sourceFile, String path, String sourceFilePath) { diff --git a/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java b/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java index aa352b4bcb..3589d9812e 100644 --- a/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java +++ b/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java @@ -201,8 +201,8 @@ public class MutilTempalteTabPane extends JComponent { } } //根据当前i18n语言环境，动态调整popupMenu的宽度 - menu.setPreferredSize(new Dimension((int)DesignSizeI18nManager.getInstance(). - i18nDimension("com.fr.design.file.MultiTemplateTabPane.popUpMenu").getWidth(),height)); + menu.setPreferredSize(new Dimension((int) DesignSizeI18nManager.getInstance(). + i18nDimension("com.fr.design.file.MultiTemplateTabPane.popUpMenu").getWidth(), height)); GUICoreUtils.showPopupMenu(menu, MutilTempalteTabPane.getInstance(), e.getX(), MutilTempalteTabPane.getInstance().getY() - 1 + MutilTempalteTabPane.getInstance().getHeight()); } } @@ -339,7 +339,7 @@ public class MutilTempalteTabPane extends JComponent { } } - private void closeTemplate(JTemplate[] templates, JTemplate currentTemplate) { + private void closeTemplate(JTemplate[] templates, JTemplate currentTemplate) { for (int i = 0; i < templates.length; i++) { if (option.shouldClose(tplIndex, i)) { JTemplate jTemplate = templates[i]; @@ -940,7 +940,7 @@ public class MutilTempalteTabPane extends JComponent { /** * 后台关闭当前编辑模板 */ - public void closeCurrentTpl(){ + public void closeCurrentTpl() { JTemplate jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); this.setIsCloseCurrent(true); this.closeFormat(jTemplate); @@ -1164,7 +1164,7 @@ public class MutilTempalteTabPane extends JComponent { boolean completed = WorkerManager.getInstance().isCompleted(template.getTarget().getTemplateID()); if (!completed) { FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), - Toolkit.i18nText("Fine-Design_Close_Template_Tip", template.getEditingFILE().getName())); + Toolkit.i18nText("Fine-Design_Close_Template_Tip", template.getEditingFILE().getName())); return; } } diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties index f26123e3d6..0205e6ea2b 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties @@ -22,4 +22,4 @@ com.fr.design.sort.expand.header.pane=95*10 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 com.fr.design.report.WatermarkSettingPane=720*600 -com.fr.design.file.MultiTemplateTabPane.popUpMenu=350*65 \ No newline at end of file +com.fr.design.file.MultiTemplateTabPane.popUpMenu=350*65 diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties index 9c9105b416..9b143294f3 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties @@ -21,4 +21,4 @@ com.fr.design.sort.expand.header.pane=95*10 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 com.fr.design.report.WatermarkSettingPane=720*600 -com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65 \ No newline at end of file +com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65 diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties index f05f8a3925..e0f0130224 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties @@ -21,4 +21,4 @@ com.fr.design.sort.expand.header.pane=95*10 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 com.fr.design.report.WatermarkSettingPane=720*600 -com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65 \ No newline at end of file +com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65 diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties index d8b31cf103..d1e84b4618 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties @@ -23,4 +23,4 @@ com.fr.design.sort.expand.header.pane=108*10 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 com.fr.design.report.WatermarkSettingPane=720*600 -com.fr.design.file.MultiTemplateTabPane.popUpMenu=170*65 \ No newline at end of file +com.fr.design.file.MultiTemplateTabPane.popUpMenu=170*65 diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties index dc92be1a0c..c00c2b8a9a 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties @@ -21,4 +21,4 @@ com.fr.design.sort.expand.header.pane=108*10 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 com.fr.design.report.WatermarkSettingPane=720*600 -com.fr.design.file.MultiTemplateTabPane.popUpMenu=170*65 \ No newline at end of file +com.fr.design.file.MultiTemplateTabPane.popUpMenu=170*65