增加国际化

build.9.0.gradle

@@ -0,0 +1,75 @@
+apply plugin: "java"
+tasks.withType(JavaCompile){
+	options.encoding = "UTF-8"
+}
+
+def basicDir="../"
+def libDir="${basicDir}/lib"
+
+task appletJar<<{
+	ant{
+		mkdir(dir:"./tmp")
+		mkdir(dir:"build/classes/main")
+		copy(todir:"build/classes/"){
+			fileset(dir:"${basicDir}/core/build/classes/main")
+			fileset(dir:"${basicDir}/chart/build/classes/main")			
+			fileset(dir:"${basicDir}/report/build/classes/main")		
+			fileset(dir:"${basicDir}/platform/build/classes/main")		
+		}
+		unjar(src:"${libDir}/3rd.jar",dest:"./tmp")
+		unjar(src:"${libDir}/servlet-api.jar",dest:"./tmp")
+		jar(jarfile:"build/libs/fr-applet-8.0.jar"){
+			fileset(dir:"build/classes"){
+				exclude(name:"*.*")
+				exclude(name:"bin/*.*")
+				exclude(name:"classes/**")
+				exclude(name:"com/fr/schedule/**")
+				exclude(name:"com/fr/cell/**")
+				exclude(name:"com/fr/dialog/**")
+				exclude(name:"com/fr/view/**")
+				exclude(name:"com/fr/web/**")
+				exclude(name:"com/fr/fs/**")
+				exclude(name:"com/fr/design/**")
+				exclude(name:"com/fr/start/**")
+				exclude(name:"com/fr/process/**")
+			}
+			fileset(dir:"./tmp"){
+				include(name:"javax/mail/**")
+				include(name:"javax/servlet/**")
+				include(name:"org/freehep/**")
+				include(name:"com/fr/third/JAI/**")
+				include(name:"com/fr/third/antlr/**")
+				include(name:"com/fr/third/javax/**")
+				include(name:"com/sun/xml/**")
+				include(name:"javax/xml/**")
+
+			}
+			fileset(dir:"build/classes"){
+				include(name:"com/fr/web/*.class")
+				include(name:"com/fr/web/attr/*.class")
+			}
+		}
+		delete(dir:"./tmp")
+		def jdk6home=	"D:/FineReport/develop/java/jdk1.6u35"
+		def keystore="frapplet.store"
+		def keycert="fr.cert"
+		def keypassword="123456"
+		def keyalias="fr"
+		
+		exec(executable:"${jdk6home}/bin/keytool"){
+			arg(line:"-genkey -dname &quot;CN=FineReport L=NanJing C=China&quot; -keystore ${keystore} -alias ${keyalias} -validity 3650 -storepass ${keypassword}")
+		}
+		exec(executable:"${jdk6home}/bin/keytool"){
+			arg(line:"-export -keystore ${keystore} -alias ${keyalias} -file ${keycert} -storepass ${keypassword}")
+		}
+
+		exec(executable:"${jdk6home}/bin/jarsigner"){
+			arg(line:"-keystore ${keystore} -storepass ${keypassword} 'build/libs/fr-applet-8.0.jar' ${keyalias}")
+		}
+		delete(file:"${keystore}")
+		delete(file:"${keycert}")
+		delete(dir:"build/classes")
+	
+	}
+
+}

designer_base/build.9.0.gradle

@@ -0,0 +1,69 @@
+
+apply plugin: 'java'
+tasks.withType(JavaCompile){
+	options.encoding = 'UTF-8'
+}
+//指定构建的jdk版本
+sourceCompatibility=1.7
+//指定生成jar包版本
+version='8.0'
+//生成jar包重命名
+jar{
+	baseName='fr-designer-core'
+}
+
+
+def srcDir="."
+def baseDir=".."
+
+//指定源码路径
+sourceSets{
+	main{
+		java{
+			srcDirs=["${srcDir}/src"]
+		}
+	}
+}
+//获取什么分支名
+FileTree files =fileTree(dir:'./',include:'build.*.gradle')
+def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))
+buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\'))
+def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
+
+//声明外部依赖
+dependencies{
+	compile fileTree(dir:"../${baseDir}/lib",include:'**/*.jar')
+	compile fileTree(dir:"../${baseDir}",include:"**/build/libs/*.jar",exclude:"bi/**/*.jar")
+ 	testCompile 'junit:junit:4.12'
+}
+//复制非.java文件到classes文件夹下参与打包
+task copyFile(type:Copy,dependsOn:compileJava){
+	copy{
+		from ("${srcDir}/src"){
+			exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
+		}
+		into 'build/classes/main'
+	}
+
+}
+
+
+//压缩项目中的js文件
+task compressJS{
+	ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
+		classpath {
+			fileset(dir:"../${baseDir}/lib4build",includes:'**/*.jar')
+		}
+	}
+	ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){
+		fileset (dir:"${srcDir}/src"){
+			include (name:'**/*.js')
+			include (name:'**/*.css')
+		}
+
+	}
+}
+jar.dependsOn compressJS
+
+
+

designer_base/src/com/fr/design/locale/designer.properties

@@ -585,3 +585,7 @@ FR-Designer-Move_Tab_First=move to first
 FR-Designer-Move_Tab_End=move to end
 FR-Designer-Move_Tab_Next=move to next
 FR-Designer-Move_Tab_Prev=move to previous
+FR-Designer_AxisReversed=Axis Reversed
+FR-Designer_Logarithmic=Logarithmic
+FR-Designer_Chart_Log_Base=Log Base
+FR-Designer_Chart_F_Radar_Axis=Chart_F_Radar_Axis

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -586,3 +586,7 @@ FR-Designer-Move_Tab_First=move to first
 FR-Designer-Move_Tab_End=move to end
 FR-Designer-Move_Tab_Next=move to next
 FR-Designer-Move_Tab_Prev=move to previous
+FR-Designer_AxisReversed=Axis in reverse order
+FR-Designer_Logarithmic=Log scale
+FR-Designer_Chart_Log_Base=Log Base
+FR-Designer_Chart_F_Radar_Axis=Value Axis

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -556,3 +556,7 @@ FR-Designer-Move_Tab_First=
 FR-Designer-Move_Tab_End=
 FR-Designer-Move_Tab_Next=
 FR-Designer-Move_Tab_Prev=
+FR-Designer_AxisReversed=\u8EF8\u9006\u914D\u5217
+FR-Designer_Logarithmic=\u5BFE\u6570\u76EE\u76DB\u308A
+FR-Designer_Chart_Log_Base=\u5E95\u6570
+FR-Designer_Chart_F_Radar_Axis=\u5782\u76F4\u8EF8

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -553,3 +553,7 @@ FR-Designer-Move_Tab_First=
 FR-Designer-Move_Tab_End=
 FR-Designer-Move_Tab_Next=
 FR-Designer-Move_Tab_Prev=
+FR-Designer_AxisReversed=\uCD95\uC5ED\uC21C
+FR-Designer_Logarithmic=\uB85C\uADF8\uB208\uAE08
+FR-Designer_Chart_Log_Base=\uAE30\uC218
+FR-Designer_Chart_F_Radar_Axis=\uAC12\uCD95

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -590,3 +590,7 @@ FR-Designer-Move_Tab_First=\u79FB\u52A8\u5230\u9996\u4F4D
 FR-Designer-Move_Tab_End=\u79FB\u52A8\u5230\u672B\u5C3E
 FR-Designer-Move_Tab_Next=\u5F80\u540E\u79FB\u52A8
 FR-Designer-Move_Tab_Prev=\u5F80\u524D\u79FB\u52A8
+FR-Designer_AxisReversed=\u8F74\u9006\u5E8F
+FR-Designer_Logarithmic=\u5BF9\u6570\u523B\u5EA6
+FR-Designer_Chart_Log_Base=\u5E95\u6570
+FR-Designer_Chart_F_Radar_Axis=\u503C\u8F74

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -578,3 +578,7 @@ FR-Designer-Move_Tab_First=\u79FB\u52D5\u5230\u9996\u4F4D
 FR-Designer-Move_Tab_End=\u79FB\u52D5\u5230\u672B\u5C3E
 FR-Designer-Move_Tab_Next=\u5F80\u5F8C\u79FB\u52D5
 FR-Designer-Move_Tab_Prev=\u5F80\u524D\u79FB\u52D5
+FR-Designer_AxisReversed=\u8EF8\u9006\u5E8F
+FR-Designer_Logarithmic=\u5C0D\u6578\u523B\u5EA6
+FR-Designer_Chart_Log_Base=\u5E95\u6578
+FR-Designer_Chart_F_Radar_Axis=\u503C\u8EF8

designer_chart/src/com/fr/design/chart/axis/MinMaxValuePane.java

@@ -30,10 +30,6 @@ public class MinMaxValuePane extends JPanel {
     protected UICheckBox isCustomSecUnitBox;
     protected UITextField secUnitField;
 
-    protected double p = TableLayout.PREFERRED;
-    protected double f = TableLayout.FILL;
-    protected double[] columnSize = {p, f};
-    protected double[] rowSize = {p, p, p, p};
 
     public MinMaxValuePane() {
         minCheckBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "Min_Value"}));
@@ -45,14 +41,19 @@ public class MinMaxValuePane extends JPanel {
         isCustomSecUnitBox = new UICheckBox(Inter.getLocText("FR-Chart_SecondGraduationUnit"));
         secUnitField = new UITextField(6);
 
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double[] columnSize = {p, f};
+
         Component[][] components = getPanelComponents();
-        JPanel panel = TableLayoutHelper.createTableLayoutPane(components, getRowSize(), columnSize);
+        JPanel panel = TableLayoutHelper.createTableLayoutPane(components, getRowSize(p), columnSize);
         this.setLayout(new BorderLayout());
         this.add(panel, BorderLayout.CENTER);
         addComponentListener(components);
     }
 
-    public double[] getRowSize() {
+    public double[] getRowSize(double p) {
+        double[] rowSize = {p, p, p, p};
         return rowSize;
     }
 

designer_chart/src/com/fr/design/chart/fun/CustomIndepentChartUIProvider.java

@@ -0,0 +1,87 @@
+package com.fr.design.chart.fun;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.condition.ConditionAttributesPane;
+import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.mainframe.chart.AbstractChartAttrPane;
+import com.fr.design.mainframe.chart.gui.ChartDataPane;
+import com.fr.design.mainframe.chart.gui.ChartStylePane;
+import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
+import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
+import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+
+/**
+ * Created by mengao on 2017/3/29.
+ */
+public interface CustomIndepentChartUIProvider {
+
+    String XML_TAG = "CustomIndepentChartUIProvider";
+
+    int CURRENT_API_LEVEL = 3;
+
+    /**
+     * 图表的类型定义界面类型，就是属性表的第一个界面
+     *
+     * @return 图表的类型定义界面类型
+     */
+    AbstractChartTypePane getPlotTypePane();
+
+    /**
+     * 数据集数据源的界面
+     *
+     * @return 数据集数据源的界面
+     */
+    AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent);
+
+
+    /**
+     * 单元格数据源的界面
+     *
+     * @return 单元格数据源的界面
+     */
+    AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent);
+
+    /**
+     * 条件属性界面
+     *
+     * @return 条件属性界面
+     */
+    ConditionAttributesPane getPlotConditionPane(Plot plot);
+
+    /**
+     * 系列界面
+     *
+     * @return 系列界面
+     */
+    BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot);
+
+
+    /**
+     * 图表的属性界面数组
+     *
+     * @return 属性界面
+     */
+    AbstractChartAttrPane[] getAttrPaneArray(AttributeChangeListener listener);
+
+    ChartDataPane getChartDataPane(AttributeChangeListener listener);
+
+    /**
+     * 是否使用默认的界面，为了避免界面来回切换
+     *
+     * @return 是否使用默认的界面
+     */
+    boolean isUseDefaultPane();
+
+    /**
+     * 图标路径
+     *
+     * @return 图标路径
+     */
+    String getIconPath();
+
+    /**
+     * plot面板的标题
+     */
+    String getPlotTypeTitle4PopupWindow();
+}

designer_form/build.9.0.gradle

@@ -0,0 +1,70 @@
+
+apply plugin: 'java'
+tasks.withType(JavaCompile){
+	options.encoding = 'UTF-8'
+}
+//指定构建的jdk版本
+sourceCompatibility=1.7
+//指定生成jar包版本
+version='8.0'
+//生成jar包重命名
+jar{
+	baseName='fr-designer-report'
+}
+
+
+def srcDir="."
+def baseDir=".."
+
+//指定源码路径
+sourceSets{
+	main{
+		java{
+			srcDirs=["${srcDir}/src",
+				"${srcDir}/../designer/src"]
+		}
+	}
+}
+//获取什么分支名
+FileTree files =fileTree(dir:'./',include:'build.*.gradle')
+def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))
+buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\'))
+def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
+
+//声明外部依赖
+dependencies{
+	compile fileTree(dir:"../${baseDir}/lib",include:'**/*.jar')
+	compile fileTree(dir:"../${baseDir}",include:"**/build/libs/*.jar",exclude:"bi/**/*.jar")
+ 	testCompile 'junit:junit:4.12'
+}
+//复制非.java文件到classes文件夹下参与打包
+task copyFile(type:Copy,dependsOn:compileJava){
+	copy{
+		from ("${srcDir}/src"){
+			exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
+		}
+		into 'build/classes/main'
+	}
+
+}
+
+
+//压缩项目中的js文件
+task compressJS{
+	ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
+		classpath {
+			fileset(dir:"../${baseDir}/lib4build",includes:'**/*.jar')
+		}
+	}
+	ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){
+		fileset (dir:"${srcDir}/src"){
+			include (name:'**/*.js')
+			include (name:'**/*.css')
+		}
+
+	}
+}
+jar.dependsOn compressJS
+
+
+

designer_form/src/com/fr/design/mainframe/ElementCaseThumbnail.java

@@ -0,0 +1,17 @@
+package com.fr.design.mainframe;
+
+//import com.fr.form.stable.fun.AbstractECThumbnailProcessor;
+/**
+ * 报表块缩略图处理
+ * 从xml中读取缩略图
+ * Created by zhouping on 2017/2/22.
+ */
+//public class ElementCaseThumbnail extends AbstractECThumbnailProcessor {
+//    public ElementCaseThumbnail(){
+//    }
+//
+//    @Override
+//    public Image readThumbnail(XMLableReader reader) {
+//        return GeneralXMLTools.readImage(reader);
+//    }
+//}