From e3ef655bbcbb416c1edc2d333767d97136f73268 Mon Sep 17 00:00:00 2001 From: juhaoyu <2335173323@qq.com> Date: Tue, 29 Nov 2016 17:32:32 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=A5=E4=B8=8B?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=20=EF=BC=9A=201=E3=80=81=E6=89=80=E6=9C=89?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=9A=84Level=E5=AE=9E=E4=BE=8B=E9=83=BD?= =?UTF-8?q?=E8=A2=AB=E4=BB=A3=E7=90=86=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BA=86?= =?UTF-8?q?isClosed=E6=96=B9=E6=B3=95=E3=80=82=E5=9C=A8=E5=8F=96=E5=87=BA?= =?UTF-8?q?=E6=97=B6=E4=BC=9A=E8=BF=9B=E8=A1=8C=E5=88=A4=E6=96=AD=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=85=B3=E9=97=AD=E5=88=99=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E5=8F=96=E5=87=BA=202=E3=80=81=E5=8F=AF=E4=BB=A5=E4=BB=8E?= =?UTF-8?q?=E6=8F=92=E4=BB=B6jar=E5=8C=85=E4=B8=AD=E5=AF=BB=E6=89=BE?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E7=9A=84=E6=8F=92=E4=BB=B6=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E5=8A=A0=E8=BD=BD=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=20=E9=97=AE=E9=A2=98=EF=BC=9A=201=E3=80=81=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E7=9A=84=E9=80=BB=E8=BE=91=EF=BC=8C=E7=8E=B0?= =?UTF-8?q?=E5=9C=A8=E5=8F=AA=E6=98=AF=E4=B8=8D=E8=83=BD=E5=86=8D=E4=BB=8E?= =?UTF-8?q?manager=E9=87=8C=E9=9D=A2=E5=8F=96=E5=87=BA=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E7=9A=84=E5=AE=9E=E4=BE=8B=EF=BC=8C=E4=BD=86=E6=98=AF=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=E5=8F=96=E5=87=BA=E5=B9=B6=E6=8F=92=E5=85=A5=E5=88=B0?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=B8=AD=E7=9A=84=E5=9C=B0=E6=96=B9=E4=BB=8D?= =?UTF-8?q?=E7=84=B6=E5=AD=98=E5=9C=A8=EF=BC=8C=E9=9C=80=E8=A6=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=BE=88=E5=A4=9A=E7=9B=91=E5=90=AC=E6=89=8D=E8=A1=8C?= =?UTF-8?q?=EF=BC=8C=E7=BB=A7=E7=BB=AD=E6=83=B3=E5=8A=9E=E6=B3=95=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E3=80=82=202=E3=80=81=E5=A6=82=E6=9E=9C=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=8D=87=E7=BA=A7=E4=BA=86=E6=80=A7=E8=83=BD=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=85=B6=E4=B8=AD=E6=B6=89=E5=8F=8A=E5=88=B0?= =?UTF-8?q?=E5=8E=9F=E6=9C=89=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3=E7=9A=84?= =?UTF-8?q?=E5=8F=98=E5=8A=A8=E7=9A=84=E8=AF=9D=EF=BC=8C=E7=94=B1=E4=BA=8E?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E9=BB=98=E8=AE=A4=E5=85=88=E4=BB=8E=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E4=B8=AD=E8=AF=BB=E5=8F=96plugin.xml=EF=BC=8C?= =?UTF-8?q?=E8=BF=99=E6=97=B6=E5=B0=B1=E4=BC=9A=E5=87=BA=E7=8E=B0=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E3=80=82=E9=9C=80=E8=A6=81=E5=9C=A8=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E4=BE=9D=E8=B5=96=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=B9=E4=BE=9D=E8=B5=96=E7=9A=84=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E7=89=88=E6=9C=AC=E7=9A=84=E6=A3=80=E6=9F=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/env/RemoteEnv.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/designer_base/src/com/fr/env/RemoteEnv.java b/designer_base/src/com/fr/env/RemoteEnv.java index 70c18fbd0d..a4fa529180 100644 --- a/designer_base/src/com/fr/env/RemoteEnv.java +++ b/designer_base/src/com/fr/env/RemoteEnv.java @@ -2063,6 +2063,17 @@ public class RemoteEnv implements Env { } + + /** + * 获取插件的配置目录 + * + * @param plugin + */ + public File getPluginFilePath(Plugin plugin) { + + return null; + } + public void readPluginLicenses() throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); HashMap para = new HashMap(); From 033898e6ba4c5281d3dd4a70eb789b755eb1b972 Mon Sep 17 00:00:00 2001 From: juhaoyu <2335173323@qq.com> Date: Thu, 1 Dec 2016 16:46:38 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E4=B8=A4?= =?UTF-8?q?=E7=A7=8D=E7=9B=91=E5=90=AC=EF=BC=9A=201=E3=80=81=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E5=8F=98=E5=8A=A8=E7=9A=84=E7=9B=91=E5=90=AC=202?= =?UTF-8?q?=E3=80=81StableFactory=E7=94=9F=E4=BA=A7=E8=80=85=E5=92=8C?= =?UTF-8?q?=E6=B6=88=E8=B4=B9=E8=80=85=E7=9A=84=E7=9B=91=E5=90=AC=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E5=9C=A8=E6=A8=A1=E5=9D=97=E5=90=AF=E5=8A=A8=E6=97=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E7=94=9F=E4=BA=A7=E8=80=85=E7=9B=91?= =?UTF-8?q?=E5=90=AC=20=E7=9B=AE=E5=89=8D=E8=BF=98=E9=9C=80=EF=BC=9A=201?= =?UTF-8?q?=E3=80=81=E6=B7=BB=E5=8A=A0FSPlate=E4=BD=9C=E4=B8=BA=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E8=80=85=202=E3=80=81JavaScript=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E6=B6=88=E8=B4=B9=E8=80=85=203=E3=80=81FSPla?= =?UTF-8?q?te=E6=AF=94=E8=BE=83=E7=89=B9=E6=AE=8A=EF=BC=8C=E5=AE=83?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E6=98=AF=E6=8F=92=E4=BB=B6=E5=8F=98=E5=8A=A8?= =?UTF-8?q?=E7=9A=84=E7=9B=91=E5=90=AC=E5=92=8CStableFactory=E7=9A=84?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=80=85=EF=BC=8C=E9=9C=80=E8=A6=81=E5=86=8D?= =?UTF-8?q?=E8=80=83=E8=99=91=E5=A6=82=E4=BD=95=E8=AE=BE=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/extra/PluginConstants.java | 15 --------------- .../src/com/fr/design/extra/PluginHelper.java | 1 + .../plugindependence/DownLoadDependenceUI.java | 2 +- 3 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 designer_base/src/com/fr/design/extra/PluginConstants.java diff --git a/designer_base/src/com/fr/design/extra/PluginConstants.java b/designer_base/src/com/fr/design/extra/PluginConstants.java deleted file mode 100644 index 4704ed129a..0000000000 --- a/designer_base/src/com/fr/design/extra/PluginConstants.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.fr.design.extra; - -/** - * @author richie - * @date 2015-03-11 - * @since 8.0 - */ -public class PluginConstants { - - - public static final int BYTES_NUM = 1024; - - - -} \ No newline at end of file diff --git a/designer_base/src/com/fr/design/extra/PluginHelper.java b/designer_base/src/com/fr/design/extra/PluginHelper.java index ecaa34ea00..3248df0b48 100644 --- a/designer_base/src/com/fr/design/extra/PluginHelper.java +++ b/designer_base/src/com/fr/design/extra/PluginHelper.java @@ -7,6 +7,7 @@ import com.fr.design.extra.plugindependence.DownLoadDependenceUI; import com.fr.general.*; import com.fr.general.http.HttpClient; import com.fr.plugin.Plugin; +import com.fr.stable.plugin.PluginConstants; import com.fr.plugin.PluginLoader; import com.fr.plugin.PluginManagerHelper; import com.fr.plugin.dependence.PluginDependence; diff --git a/designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUI.java b/designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUI.java index 958d8d160e..8fa4f6c31c 100644 --- a/designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUI.java +++ b/designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUI.java @@ -1,13 +1,13 @@ package com.fr.design.extra.plugindependence; import com.fr.base.FRContext; -import com.fr.design.extra.PluginConstants; import com.fr.design.extra.PluginHelper; import com.fr.design.mainframe.DesignerContext; import com.fr.general.IOUtils; import com.fr.general.Inter; import com.fr.general.SiteCenter; import com.fr.general.http.HttpClient; +import com.fr.stable.plugin.PluginConstants; import com.fr.plugin.dependence.PluginDependenceException; import com.fr.plugin.dependence.PluginDependenceUnit; import com.fr.stable.StableUtils; From f505360f9f46b7967e1b2d279d3a8c905cb19241 Mon Sep 17 00:00:00 2001 From: juhaoyu <2335173323@qq.com> Date: Fri, 2 Dec 2016 11:18:32 +0800 Subject: [PATCH 3/7] PMD --- .../design/extra/plugindependence/DownLoadDependenceUI.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUI.java b/designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUI.java index 8fa4f6c31c..abb52e2493 100644 --- a/designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUI.java +++ b/designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUI.java @@ -40,8 +40,9 @@ public class DownLoadDependenceUI implements ActionListener { private boolean flag = true; // 定义加载窗口大小 - private final int LOAD_WIDTH = 455; - private final int LOAD_HEIGHT = 295; + private static final int LOAD_WIDTH = 455; + + private static final int LOAD_HEIGHT = 295; //安装环境相关信息 private String currentID; From 287ad1a53e16a470861aa8bc8bef1d9a94853841 Mon Sep 17 00:00:00 2001 From: juhaoyu <2335173323@qq.com> Date: Fri, 2 Dec 2016 16:53:08 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9Env=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=8F=92=E4=BB=B6plugin.xml=E8=B7=AF=E5=BE=84=E7=9A=84?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E3=80=82=20=E4=BF=AE=E6=94=B9Plugin=E8=AF=BB?= =?UTF-8?q?=E5=8F=96=E4=BE=9D=E8=B5=96=E7=9A=84=E6=96=B9=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E4=BD=BF=E5=85=B6=E5=8F=AF=E4=BB=A5=E8=AF=BB=E5=8F=96=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E4=BE=9D=E8=B5=96=20=E7=BB=99=E6=80=A7=E8=83=BD?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=9A=84=E7=AE=A1=E7=90=86=E5=99=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=8E=AF=E5=A2=83=E5=88=87=E6=8D=A2=E7=9B=91=E5=90=AC?= =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E5=BD=93=E7=8E=AF=E5=A2=83=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E6=97=B6=E5=8F=AF=E4=BB=A5=E5=90=8C=E6=AD=A5=E7=9A=84=E5=8E=BB?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=80=A7=E8=83=BD=E6=8F=92=E4=BB=B6=E5=8C=85?= =?UTF-8?q?=E5=90=AB=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/env/RemoteEnv.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/env/RemoteEnv.java b/designer_base/src/com/fr/env/RemoteEnv.java index a4fa529180..11edf2948c 100644 --- a/designer_base/src/com/fr/env/RemoteEnv.java +++ b/designer_base/src/com/fr/env/RemoteEnv.java @@ -2069,9 +2069,9 @@ public class RemoteEnv implements Env { * * @param plugin */ - public File getPluginFilePath(Plugin plugin) { + public String getPluginFilePath(Plugin plugin) { - return null; + return StringUtils.EMPTY; } public void readPluginLicenses() throws Exception { From 6fe979c0c94a1e7f5f58262bfd3e451a59f784b1 Mon Sep 17 00:00:00 2001 From: juhaoyu <2335173323@qq.com> Date: Mon, 5 Dec 2016 17:06:14 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=95=B4=E5=90=88pdfstram=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=88=B0=E6=80=A7=E8=83=BD=E6=8F=92=E4=BB=B6=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/actions/file/export/AbstractExportAction.java | 3 +-- .../com/fr/design/actions/file/export/PDFExportAction.java | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/designer/src/com/fr/design/actions/file/export/AbstractExportAction.java b/designer/src/com/fr/design/actions/file/export/AbstractExportAction.java index 0c6f0c8ed0..a5f8fdc0fe 100644 --- a/designer/src/com/fr/design/actions/file/export/AbstractExportAction.java +++ b/designer/src/com/fr/design/actions/file/export/AbstractExportAction.java @@ -5,7 +5,6 @@ package com.fr.design.actions.file.export; import com.fr.base.FRContext; import com.fr.base.Parameter; -import com.fr.io.exporter.pdfstream.PDFStreamExporter; import com.fr.page.PageSetProvider; import com.fr.design.actions.JWorkBookAction; import com.fr.design.gui.iprogressbar.FRProgressBar; @@ -140,7 +139,7 @@ public abstract class AbstractExportAction extends JWorkBookAction { if (exporter instanceof AppExporter) { AppExporter appExporter = (AppExporter) exporter; if (exporter instanceof ExcelExporter || exporter instanceof CSVExporter - || exporter instanceof PDFExporter || exporter instanceof PDFStreamExporter || exporter instanceof WordExporter) { + || exporter instanceof PDFExporterProcessor || exporter instanceof WordExporter) { ReportHelper.clearFormulaResult(tpl);// 清空rpt中的公式计算结果 appExporter.export(fileOutputStream, tpl.execute(parameterMap, ActorFactory.getActor(ActorConstants.TYPE_PAGE) diff --git a/designer/src/com/fr/design/actions/file/export/PDFExportAction.java b/designer/src/com/fr/design/actions/file/export/PDFExportAction.java index 64cf5dabf5..6016699e64 100644 --- a/designer/src/com/fr/design/actions/file/export/PDFExportAction.java +++ b/designer/src/com/fr/design/actions/file/export/PDFExportAction.java @@ -9,8 +9,7 @@ import com.fr.design.menu.KeySetUtils; import com.fr.file.filter.ChooseFileFilter; import com.fr.general.Inter; import com.fr.io.exporter.Exporter; -import com.fr.io.exporter.PDFExporter; -import com.fr.io.exporter.pdfstream.PDFStreamExporter; +import com.fr.web.core.reserve.PDFExporterFactory; /** * Export pdf @@ -29,7 +28,8 @@ public class PDFExportAction extends AbstractExportAction { @Override protected Exporter getExporter() { - return new PDFStreamExporter(); + + return PDFExporterFactory.getPDFExporter(); } @Override From 8b227714c0d28c623007ab13c3a6624d840c450f Mon Sep 17 00:00:00 2001 From: juhaoyu <2335173323@qq.com> Date: Wed, 7 Dec 2016 10:08:38 +0800 Subject: [PATCH 6/7] PMD --- .../DownLoadDependenceUI.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUI.java b/designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUI.java index abb52e2493..29097a5eea 100644 --- a/designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUI.java +++ b/designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUI.java @@ -2,16 +2,17 @@ package com.fr.design.extra.plugindependence; import com.fr.base.FRContext; import com.fr.design.extra.PluginHelper; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.DesignerContext; import com.fr.general.IOUtils; import com.fr.general.Inter; import com.fr.general.SiteCenter; import com.fr.general.http.HttpClient; -import com.fr.stable.plugin.PluginConstants; import com.fr.plugin.dependence.PluginDependenceException; import com.fr.plugin.dependence.PluginDependenceUnit; import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; +import com.fr.stable.plugin.PluginConstants; import javax.swing.*; import java.awt.*; @@ -20,7 +21,9 @@ import java.awt.event.ActionListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.awt.image.BufferedImage; -import java.io.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.InputStream; import java.net.HttpURLConnection; import java.util.List; @@ -42,8 +45,11 @@ public class DownLoadDependenceUI implements ActionListener { // 定义加载窗口大小 private static final int LOAD_WIDTH = 455; + private static final int INCIDENT_WIDTH = 15; + private static final int LOAD_HEIGHT = 295; + //安装环境相关信息 private String currentID; private List list = null; @@ -69,8 +75,8 @@ public class DownLoadDependenceUI implements ActionListener { // 创建标签,并在标签上放置一张图片 BufferedImage image = IOUtils.readImage("/com/fr/design/extra/plugindependence/image/background.png"); ImageIcon imageIcon = new ImageIcon(image); - label = new JLabel(imageIcon); - label.setBounds(0, 0, LOAD_WIDTH, LOAD_HEIGHT - 15); + label = new UILabel(imageIcon); + label.setBounds(0, 0, LOAD_WIDTH, LOAD_HEIGHT - INCIDENT_WIDTH); progressbar = new JProgressBar(); // 显示当前进度值信息 @@ -81,7 +87,7 @@ public class DownLoadDependenceUI implements ActionListener { progressbar.setForeground(new Color(0x38aef5)); // 设置进度条的背景色 progressbar.setBackground(new Color(188, 190, 194)); - progressbar.setBounds(0, LOAD_HEIGHT - 15, LOAD_WIDTH, 15); + progressbar.setBounds(0, LOAD_HEIGHT - INCIDENT_WIDTH, LOAD_WIDTH, INCIDENT_WIDTH); progressbar.setMinimum(0); progressbar.setMaximum(totalSize); progressbar.setValue(0); @@ -250,7 +256,8 @@ public class DownLoadDependenceUI implements ActionListener { } public void installOnline()throws PluginDependenceException { - int choose = JOptionPane.showConfirmDialog(null, Inter.getLocText("FR-Designer-Plugin_Plugin") + Inter.getLocText("FR-Designer-Need") + Inter.getLocText("FR-Designer-Dependence") + Inter.getLocText("FR-Designer-Support") + "," + Inter.getLocText("FR-Designer-Dependence_Need_Install") + "(" + showFileLength() + " m)?", "install tooltip", JOptionPane.YES_NO_OPTION); + + int choose = JOptionPane.showConfirmDialog(null, Inter.getLocText("FR-Designer-Plugin_DownLoadMessage", showFileLength()), "install tooltip", JOptionPane.YES_NO_OPTION); if (choose == 0) {//下载安装 if (!connectToServer()) { throw new PluginDependenceException(Inter.getLocText("FR-Designer-Dependence_Connect_Server_Error")); From 15e063aa96f9247c0be2832076d74e133eb724f4 Mon Sep 17 00:00:00 2001 From: juhaoyu <2335173323@qq.com> Date: Wed, 7 Dec 2016 11:39:08 +0800 Subject: [PATCH 7/7] PDM --- .../actions/file/export/AbstractExportAction.java | 10 +++++----- .../fr/design/actions/file/export/PDFExportAction.java | 2 +- .../actions/EmbeddedFormExportExportAction.java | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/designer/src/com/fr/design/actions/file/export/AbstractExportAction.java b/designer/src/com/fr/design/actions/file/export/AbstractExportAction.java index a5f8fdc0fe..e80e75fb9b 100644 --- a/designer/src/com/fr/design/actions/file/export/AbstractExportAction.java +++ b/designer/src/com/fr/design/actions/file/export/AbstractExportAction.java @@ -93,10 +93,10 @@ public abstract class AbstractExportAction extends JWorkBookAction { FRLogger.getLogger().error("Error In Make New File"); } fileChooserPane = null; - FRContext.getLogger().info("\"" + file.getName() + "\"" + Inter.getLocText("Prepare_Export") + "!"); + FRContext.getLogger().info("\"" + file.getName() + "\"" + Inter.getLocText("FR-Designer_Prepare_Export") + "!"); (progressbar = new FRProgressBar(createExportWork(file, tpl, parameterMap), designerFrame, - Inter.getLocText("Exporting"), "", 0, 100)).start(); + Inter.getLocText("FR-Designer_Exporting"), "", 0, 100)).start(); } } @@ -116,13 +116,13 @@ public abstract class AbstractExportAction extends JWorkBookAction { fileOutputStream.close(); this.setProgress(100); - FRContext.getLogger().info("\"" + fileGetName + "\"" + Inter.getLocText("Finish_Export") + "!"); + FRContext.getLogger().info("\"" + fileGetName + "\"" + Inter.getLocText("FR-Designer_Finish_Export") + "!"); JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), - Inter.getLocText("Exported_successfully") + "\n" + filePath); + Inter.getLocText("FR-Designer_Exported_successfully") + "\n" + filePath); } catch (Exception exp) { this.setProgress(100); FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp); - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("Export_failed") + "\n" + filePath); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer_Export_failed") + "\n" + filePath); } return null; } diff --git a/designer/src/com/fr/design/actions/file/export/PDFExportAction.java b/designer/src/com/fr/design/actions/file/export/PDFExportAction.java index 6016699e64..15082031b8 100644 --- a/designer/src/com/fr/design/actions/file/export/PDFExportAction.java +++ b/designer/src/com/fr/design/actions/file/export/PDFExportAction.java @@ -34,7 +34,7 @@ public class PDFExportAction extends AbstractExportAction { @Override protected ChooseFileFilter getChooseFileFilter() { - return new ChooseFileFilter(new String[]{"pdf"}, Inter.getLocText("Export-PDF")); + return new ChooseFileFilter(new String[]{"pdf"}, Inter.getLocText("FR-Designer_Export-PDF")); } @Override diff --git a/designer_form/src/com/fr/design/mainframe/actions/EmbeddedFormExportExportAction.java b/designer_form/src/com/fr/design/mainframe/actions/EmbeddedFormExportExportAction.java index 4d4a3b7e40..20c44f65dd 100644 --- a/designer_form/src/com/fr/design/mainframe/actions/EmbeddedFormExportExportAction.java +++ b/designer_form/src/com/fr/design/mainframe/actions/EmbeddedFormExportExportAction.java @@ -87,10 +87,10 @@ public class EmbeddedFormExportExportAction extends JTemplateAction{ FRLogger.getLogger().error("Error In Make New File"); } fileChooserPane = null; - FRContext.getLogger().info("\"" + file.getName() + "\"" + Inter.getLocText("Prepare_Export") + "!"); + FRContext.getLogger().info("\"" + file.getName() + "\"" + Inter.getLocText("FR-Designer_Prepare_Export") + "!"); (progressbar = new FRProgressBar(createExportWork(file, tpl, parameterMap), designerFrame, - Inter.getLocText("Exporting"), "", 0, 100)).start(); + Inter.getLocText("FR-Designer_Exporting"), "", 0, 100)).start(); } private boolean isOk(int saveValue){ @@ -136,13 +136,13 @@ public class EmbeddedFormExportExportAction extends JTemplateAction{ fileOutputStream.close(); this.setProgress(100); - FRContext.getLogger().info("\"" + fileGetName + "\"" + Inter.getLocText("Finish_Export") + "!"); + FRContext.getLogger().info("\"" + fileGetName + "\"" + Inter.getLocText("FR-Designer_Finish_Export") + "!"); JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), - Inter.getLocText("Exported_successfully") + "\n" + filePath); + Inter.getLocText("FR-Designer_Exported_successfully") + "\n" + filePath); } catch (Exception exp) { this.setProgress(100); FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp); - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("Export_failed") + "\n" + filePath); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer_Export_failed") + "\n" + filePath); } return null; }