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

designer-base/src/com/fr/design/ExtraDesignClassManager.java

@@ -46,8 +46,8 @@ public class ExtraDesignClassManager extends AbstractExtraClassManager implement
     private static ExtraDesignClassManager classManager = new ExtraDesignClassManager();
 
     private Set<ShortCut> shortCuts = new CloseableContainedSet<>(HashSet.class);
-
+    
-    public synchronized static ExtraDesignClassManager getInstance() {
+    public static ExtraDesignClassManager getInstance() {
         return classManager;
     }
 

designer-base/src/com/fr/design/javascript/beautify/JavaScriptFormatHelper.java

@@ -40,7 +40,7 @@ public class JavaScriptFormatHelper {
             Reader reader = new InputStreamReader(resourceAsStream);
             scriptEngine.eval(reader);
             Invocable invocable = (Invocable) scriptEngine;
-            result = (String) invocable.invokeFunction("js_beautify", jsCode, option.toFormatArgument());
+            result = (String) invocable.invokeFunction("js_beautify_global", jsCode, option.toFormatArgument());
         } catch (ScriptException | NoSuchMethodException e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }

designer-base/src/com/fr/design/style/background/impl/ImageBackgroundPane.java

@@ -2,6 +2,7 @@ package com.fr.design.style.background.impl;
 
 import com.fr.base.Style;
 import com.fr.base.background.ImageBackground;
+import com.fr.base.background.ImageFileBackground;
 import com.fr.design.gui.frpane.ImgChooseWrapper;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIRadioButton;
@@ -192,7 +193,7 @@ public class ImageBackgroundPane extends BackgroundDetailPane {
 
     @Override
     public Background update() throws Exception {
-        ImageBackground imageBackground = new ImageBackground(previewPane.getImageWithSuffix());
+        ImageBackground imageBackground = new ImageFileBackground(previewPane.getImageWithSuffix());
         setImageStyle();
         imageBackground.setLayout(imageStyle.getImageLayout());
         return imageBackground;

designer-base/src/com/fr/design/style/background/impl/ImageButtonBackgroundPane.java

@@ -2,6 +2,7 @@ package com.fr.design.style.background.impl;
 
 import com.fr.base.Style;
 import com.fr.base.background.ImageBackground;
+import com.fr.base.background.ImageFileBackground;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.general.Background;
 import com.fr.general.Inter;
@@ -81,6 +82,6 @@ public class ImageButtonBackgroundPane extends ImageBackgroundPane {
         if (previewPane.getImage() == null) {
             return null;
         }
-        return new ImageBackground(previewPane.getImageWithSuffix());
+        return new ImageFileBackground(previewPane.getImageWithSuffix());
     }
 }