From dd11cb5befe33add21f612382161b66d5c81a45d Mon Sep 17 00:00:00 2001
From: "Mata.Li" <Mata.Li@fanruan.com>
Date: Mon, 3 Sep 2018 14:19:23 +0800
Subject: [PATCH] REPORT-10935 & REPORT-10921

---
 .../datapane/connect/DatabaseConnectionPane.java  |   2 +-
 .../images/poly/toolbar/Poly-Report_Block.png     | Bin 0 -> 206 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Poly-Report_Block.png

diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
index 95ce1967e..aed07afb0 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
@@ -105,7 +105,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
                             message.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Connection_Successfully"));
                         }else{
                             uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon"));
-                            message.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
+                            message.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Failed"));
                         }
                     } catch (Exception exp) {
                         FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Poly-Report_Block.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Poly-Report_Block.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b8f0ff2f6e691642c6bd52210d17279546d2e55
GIT binary patch
literal 206
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1SGw${mubWoCO|{#S9GG!XV7ZFl&wkP*AeO
zHKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNkDP*Jp}i(^Q|t)w1{m**WM6OtB4
z@bD=|EQ(+H#O|tk^#7EX-8{3+^Z)g89Wvkd#{Ta^d$t2wd{^vpnkI9(8897AHgR)H
yPPuW6L&M@?%e+6&o+SO!KJusAqp*R2nPKvk^B)gqGj9c2!{F)a=d#Wzp$Pz$2S&vJ

literal 0
HcmV?d00001