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

* commit '91c9b0535d35dbdb087e44c7052e9b450659412f':
  fix import
  REPORT-27106 && REPORT-27144

designer-base/src/main/java/com/fr/design/DesignerEnvManager.java

@@ -8,18 +8,21 @@ import com.fr.base.Utils;
 import com.fr.design.actions.help.alphafine.AlphaFineConfigManager;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.data.DesignTableDataManager;
+import com.fr.design.dialog.ErrorDialog;
 import com.fr.design.env.DesignerWorkspaceGenerator;
 import com.fr.design.env.DesignerWorkspaceInfo;
 import com.fr.design.env.DesignerWorkspaceType;
 import com.fr.design.env.LocalDesignerWorkspaceInfo;
 import com.fr.design.env.RemoteDesignerWorkspaceInfo;
 import com.fr.design.file.HistoryTemplateListPane;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.locale.impl.ProductImproveMark;
 import com.fr.design.mainframe.vcs.VcsConfigManager;
 import com.fr.design.update.push.DesignerPushUpdateConfigManager;
 import com.fr.design.style.color.ColorSelectConfigManager;
 import com.fr.design.utils.DesignUtils;
 import com.fr.design.utils.DesignerPort;
+import com.fr.exit.DesignerExiter;
 import com.fr.file.FILEFactory;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogFormatter;
@@ -345,6 +348,23 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
 
         } catch (IOException e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            ErrorDialog dialog = new ErrorDialog(null,
+                                                 Toolkit.i18nText("Fine-Design_Error_Start_Apology_Message"),
+                                                 Toolkit.i18nText("Fine-Design_Error_Start_Report"),
+                                                 e.getMessage()) {
+                @Override
+                protected void okEvent() {
+                    dispose();
+                    DesignerExiter.getInstance().execute();
+                }
+
+                @Override
+                protected void restartEvent() {
+                    dispose();
+                    RestartHelper.restart();
+                }
+            };
+            dialog.setVisible(true);
         } finally {
             if (null != fileWriter) {
                 try {

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

@@ -39,7 +39,12 @@ public abstract class TipDialog extends JDialog implements ActionListener {
         northPane.add(iconPane, BorderLayout.WEST);
         northPane.add(tipPane, BorderLayout.CENTER);
 
-        JTextArea area = new JTextArea(type);
+        JTextPane area = new JTextPane();
+        UILabel typeLabel = new UILabel(type);
+        area.insertComponent(typeLabel);
+        UILabel logoIconLabel = new UILabel();
+        logoIconLabel.setIcon(IOUtils.readIcon("com/fr/base/images/oem/logo.png"));
+        area.insertComponent(logoIconLabel);
         area.setPreferredSize(new Dimension(400, 100));
         area.setEnabled(true);
         area.setEditable(false);