Merge pull request #1398 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit '6615f4c6ab01f0624afc28558efe84565072fc03':
  REPORT-26091 && REPORT-26181

designer-base/src/main/java/com/fr/design/dialog/FineJOptionPane.java

@@ -158,8 +158,9 @@ public class FineJOptionPane extends JOptionPane {
     public static int showConfirmDialog(Component parentComponent, Object message,
                                         String title, int optionType, int messageType, Icon icon)
             throws HeadlessException {
+        String[] options = OPTION_MAP.get(optionType);
         return showConfirmDialog(parentComponent, message, title, optionType,
-                messageType, icon, OPTION_MAP.get(optionType), null);
+                messageType, icon, options, options[0]);
     }
 
     /**

designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java

@@ -1,6 +1,7 @@
 package com.fr.design.webattr;
 
 import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.frpane.EditingStringListPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIRadioButton;
@@ -199,9 +200,12 @@ public class WebJsPane extends BasicPane {
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
 			}
 			if (in == null) {
-				JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
+				FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+												  com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
+												  com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Failed"),
+												  JOptionPane.ERROR_MESSAGE);
 			} else {
-				JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Connection_Successfully"));
+				FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Connection_Successfully"));
 				try {
 					in.close();
 				} catch (IOException e) {