Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~zheng/C-design into release/10.0

designer-base/pom.xml

@@ -6,8 +6,11 @@
     <parent>
         <groupId>com.fr.report</groupId>
         <artifactId>design</artifactId>
-        <version>10.0-RELEASE-SNAPSHOT</version>
+        <version>10.0</version>
     </parent>
+    <groupId>com.fr.report</groupId>
+    <artifactId>designer-base</artifactId>
+    <version>${branch}-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>io.socket</groupId>
@@ -15,7 +18,5 @@
             <version>0.7.0</version>
         </dependency>
     </dependencies>
-    <groupId>com.fr.report</groupId>
+
-    <artifactId>designer-base</artifactId>
-    <version>10.0-RELEASE-SNAPSHOT</version>
 </project>

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

@@ -53,7 +53,6 @@ public class PluginWebBridge {
     private static final String PLUGIN_INFO = "pluginInfo";
     private static final int COREPOOLSIZE = 3;
     private static final int MAXPOOLSIZE = 5;
-    private static final String I18N_PREFIX = "FR-";
 
     private static PluginWebBridge helper;
 
@@ -571,13 +570,6 @@ public class PluginWebBridge {
         //todo  初始化设计器其他部分
     }
 
-    /**
-     * 国际化
-     */
-    public String parseI18(final String key) {
-        return com.fr.design.i18n.Toolkit.i18nText(I18N_PREFIX + key);
-    }
-
     /**
      * 是否是在设计器中操作
      */

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

@@ -1,6 +1,7 @@
 package com.fr.design.extra;
 
 import com.fr.base.TemplateUtils;
+import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StableUtils;
@@ -30,6 +31,7 @@ import java.util.Map;
  */
 public class PluginWebPane extends JFXPanel {
     private static final String RESOURCE_URL = "resourceURL";
+    private static final String LANGUAGE = "language";
     private WebEngine webEngine;
 
     public PluginWebPane(final String installHome, final String mainJs) {
@@ -75,6 +77,7 @@ public class PluginWebPane extends JFXPanel {
         Map<String, Object> map4Tpl = new HashMap<String, Object>();
 
         map4Tpl.put(RESOURCE_URL, "file:///" + URLEncoder.encode(installHome, "UTF-8"));
+        map4Tpl.put(LANGUAGE, GeneralContext.getLocale().toString());
         while ((line = read.readLine()) != null) {
             if (sb.length() > 0) {
                 sb.append('\n');

designer-chart/pom.xml

@@ -6,16 +6,16 @@
     <parent>
         <groupId>com.fr.report</groupId>
         <artifactId>design</artifactId>
-        <version>10.0-RELEASE-SNAPSHOT</version>
+        <version>10.0</version>
     </parent>
     <groupId>com.fr.report</groupId>
     <artifactId>designer-chart</artifactId>
-    <version>10.0-RELEASE-SNAPSHOT</version>
+    <version>${branch}-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>com.fr.report</groupId>
             <artifactId>designer-base</artifactId>
-            <version>10.0-RELEASE-SNAPSHOT</version>
+            <version>${branch}-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

designer-form/pom.xml

@@ -6,16 +6,16 @@
     <parent>
         <groupId>com.fr.report</groupId>
         <artifactId>design</artifactId>
-        <version>10.0-RELEASE-SNAPSHOT</version>
+        <version>10.0</version>
     </parent>
     <groupId>com.fr.report</groupId>
     <artifactId>designer-form</artifactId>
-    <version>10.0-RELEASE-SNAPSHOT</version>
+    <version>${branch}-SNAPSHOT</version>
      <dependencies>
         <dependency>
             <groupId>com.fr.report</groupId>
             <artifactId>designer-base</artifactId>
-            <version>10.0-RELEASE-SNAPSHOT</version>
+            <version>${branch}-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

designer-realize/pom.xml

@@ -6,21 +6,21 @@
     <parent>
         <groupId>com.fr.report</groupId>
         <artifactId>design</artifactId>
-        <version>10.0-RELEASE-SNAPSHOT</version>
+        <version>10.0</version>
     </parent>
     <groupId>com.fr.report</groupId>
     <artifactId>designer-realize</artifactId>
-    <version>10.0-RELEASE-SNAPSHOT</version>
+    <version>${branch}-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>com.fr.report</groupId>
             <artifactId>designer-form</artifactId>
-            <version>10.0-RELEASE-SNAPSHOT</version>
+            <version>${branch}-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.fr.report</groupId>
             <artifactId>designer-chart</artifactId>
-            <version>10.0-RELEASE-SNAPSHOT</version>
+            <version>${branch}-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.fr.report</groupId>
         <artifactId>fine-report-designer</artifactId>
-        <version>10.0-RELEASE-SNAPSHOT</version>
+        <version>10.0</version>
         <relativePath>../design-settings/fine-report-designer</relativePath>
     </parent>
 
@@ -19,7 +19,7 @@
     </modules>
     <groupId>com.fr.report</groupId>
     <artifactId>design</artifactId>
-    <version>10.0-RELEASE-SNAPSHOT</version>
+    <version>10.0</version>
     <packaging>pom</packaging>
     <build>
         <plugins>