Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0

designer-base/src/main/java/com/fr/design/extra/PluginUtils.java

@@ -177,7 +177,7 @@ public class PluginUtils {
     
     private static String getInterKeyByErrorCode(PluginErrorCode errorCode) {
         
-        return ERROR_CODE_I18N_PREFIX + errorCode.getDescription();
+        return  errorCode.getDescription();
     }
     
     public static PluginMarker getInstalledPluginMarkerByID(String pluginID) {

designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java

@@ -6,7 +6,6 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.TemplatePane;
 import com.fr.design.mainframe.loghandler.DesignerLogHandler;
 import com.fr.event.EventDispatcher;
-
 import com.fr.log.FineLoggerFactory;
 import com.fr.serialization.SerializerHelper;
 import com.fr.stable.ArrayUtils;
@@ -21,7 +20,9 @@ import io.socket.client.IO;
 import io.socket.client.Socket;
 import io.socket.emitter.Emitter;
 
-import javax.swing.*;
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URL;
@@ -80,9 +81,17 @@ public class DesignerSocketIO {
                 @Override
                 public void call(Object... objects) {
                     if (status != Status.Disconnecting) {
-                        JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Disconnected"),
-                                null, 0, UIManager.getIcon("OptionPane.errorIcon"));
-                        TemplatePane.getInstance().editItems();
+                        try {
+                            SwingUtilities.invokeAndWait(new Runnable() {
+                                public void run() {
+                                    JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Disconnected"),
+                                            null, 0, UIManager.getIcon("OptionPane.errorIcon"));
+                                    TemplatePane.getInstance().editItems();
+                                }
+                            });
+                        } catch (Exception e) {
+                            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                        }
                     }
                     status = Status.Disconnected;
                 }