From d9e6f25a07e21fafcf55a26a3726634b7f230d9f Mon Sep 17 00:00:00 2001 From: MoMeak Date: Thu, 16 Nov 2017 11:35:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?REPORT-5097=209.0,=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E5=88=B0=E6=9C=AC=E5=9C=B0=E5=85=B6=E4=BB=96=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E5=B8=AE=E5=8A=A9-=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E6=BC=94=E7=A4=BA=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=9B=AE=E5=BD=95=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/start/StartServer.java | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/designer_base/src/com/fr/start/StartServer.java b/designer_base/src/com/fr/start/StartServer.java index 17e3c58d7..06340fedc 100644 --- a/designer_base/src/com/fr/start/StartServer.java +++ b/designer_base/src/com/fr/start/StartServer.java @@ -2,6 +2,7 @@ package com.fr.start; import com.fr.base.ConfigManager; import com.fr.base.FRContext; +import com.fr.dav.LocalEnv; import com.fr.design.DesignModelAdapter; import com.fr.design.DesignerEnvManager; import com.fr.design.data.datapane.TableDataTreePane; @@ -58,26 +59,7 @@ public class StartServer { + "?op=fs"); return; } - DesignerEnvManager envManager = DesignerEnvManager.getEnvManager(); - if (!envManager.isCurrentEnvDefault()) { - InformationPane inf = new InformationPane(envManager.getDefaultEnvName()); - inf.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() { - @Override - public void doOk() { - try { - SignIn.signIn(DesignerEnvManager.getEnvManager().getDefaultEnv()); - TemplateTreePane.getInstance().refreshDockingView(); - TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()); - } catch (Exception e) { - FRContext.getLogger().errorWithServerLevel(e.getMessage()); - } - initDemoServerAndBrowser(); - } - - }).setVisible(true); - } else { - initDemoServerAndBrowser(); - } + initDemoServerAndBrowser(); } private static void initDemoServerAndBrowser() { From 02955f3ef77ac5396af10e38804222d27d12c706 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Thu, 16 Nov 2017 11:47:07 +0800 Subject: [PATCH 2/4] pmd --- designer_base/src/com/fr/start/StartServer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer_base/src/com/fr/start/StartServer.java b/designer_base/src/com/fr/start/StartServer.java index 06340fedc..e7512380c 100644 --- a/designer_base/src/com/fr/start/StartServer.java +++ b/designer_base/src/com/fr/start/StartServer.java @@ -2,7 +2,6 @@ package com.fr.start; import com.fr.base.ConfigManager; import com.fr.base.FRContext; -import com.fr.dav.LocalEnv; import com.fr.design.DesignModelAdapter; import com.fr.design.DesignerEnvManager; import com.fr.design.data.datapane.TableDataTreePane; From 54b470d6e8128444d404637744fbadb0e703e69a Mon Sep 17 00:00:00 2001 From: MoMeak Date: Thu, 16 Nov 2017 12:35:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?REPORT-5097=209.0,=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E5=88=B0=E6=9C=AC=E5=9C=B0=E5=85=B6=E4=BB=96=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E5=B8=AE=E5=8A=A9-=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E6=BC=94=E7=A4=BA=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=9B=AE=E5=BD=95=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=20=E6=9A=82=E6=97=B6=E5=85=88=E4=B8=8D=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/start/StartServer.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/start/StartServer.java b/designer_base/src/com/fr/start/StartServer.java index e7512380c..17e3c58d7 100644 --- a/designer_base/src/com/fr/start/StartServer.java +++ b/designer_base/src/com/fr/start/StartServer.java @@ -58,7 +58,26 @@ public class StartServer { + "?op=fs"); return; } - initDemoServerAndBrowser(); + DesignerEnvManager envManager = DesignerEnvManager.getEnvManager(); + if (!envManager.isCurrentEnvDefault()) { + InformationPane inf = new InformationPane(envManager.getDefaultEnvName()); + inf.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() { + @Override + public void doOk() { + try { + SignIn.signIn(DesignerEnvManager.getEnvManager().getDefaultEnv()); + TemplateTreePane.getInstance().refreshDockingView(); + TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()); + } catch (Exception e) { + FRContext.getLogger().errorWithServerLevel(e.getMessage()); + } + initDemoServerAndBrowser(); + } + + }).setVisible(true); + } else { + initDemoServerAndBrowser(); + } } private static void initDemoServerAndBrowser() { From 61b773e55dddbec617dad205a45970124ef735bf Mon Sep 17 00:00:00 2001 From: MoMeak Date: Thu, 16 Nov 2017 14:53:39 +0800 Subject: [PATCH 4/4] =?UTF-8?q?REPORT-5134=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=E9=87=8C=E6=8F=92=E5=85=A5=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=E5=90=8E=EF=BC=8C=E5=A4=8D=E5=88=B6=E7=B2=98=E8=B4=B4?= =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BAnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/cell/clipboard/CellElementsClip.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/designer/src/com/fr/design/cell/clipboard/CellElementsClip.java b/designer/src/com/fr/design/cell/clipboard/CellElementsClip.java index 64d649d3d..191f14959 100644 --- a/designer/src/com/fr/design/cell/clipboard/CellElementsClip.java +++ b/designer/src/com/fr/design/cell/clipboard/CellElementsClip.java @@ -12,6 +12,7 @@ import com.fr.report.cell.CellElement; import com.fr.report.cell.CellElementComparator; import com.fr.report.cell.TemplateCellElement; import com.fr.report.elementcase.TemplateElementCase; +import com.fr.stable.StringUtils; import com.fr.stable.unit.FU; /** @@ -62,8 +63,12 @@ public class CellElementsClip implements Cloneable, java.io.Serializable { if (sbuf.length() > 0 && sbuf.charAt(sbuf.length() - 1) != '\n') { sbuf.append('\t'); } - - sbuf.append(cellElement.getValue()); + //REPORT-5134:会复制出null + if (cellElement.getValue() == null) { + sbuf.append(StringUtils.EMPTY); + } else { + sbuf.append(cellElement.getValue()); + } } return sbuf.toString();