Merge remote-tracking branch 'design/master'

designer_base/src/com/fr/design/gui/icontainer/UIResizableContainer.java

@@ -3,7 +3,6 @@ package com.fr.design.gui.icontainer;
 import com.fr.base.BaseUtils;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.mainframe.EastRegionContainerPane;
 import com.fr.stable.Constants;
 import com.fr.design.utils.gui.GUICoreUtils;
 
@@ -217,8 +216,8 @@ public class UIResizableContainer extends JPanel {
                 }
             } else if (direction == Constants.LEFT) {
                 if(isDownPaneVisible){
-                    if (toolPaneY > getHeight() - toolPaneHeight) {
+                    if (toolPaneY > getHeight() - toolPaneHeight - getParameterPaneHeight()) {
-                        toolPaneY = getHeight() - toolPaneHeight;
+                        toolPaneY = getHeight() - toolPaneHeight - getParameterPaneHeight();
                     }
                     parameterPane.setBounds(20, 0, 230, getParameterPaneHeight());
                     upPane.setBounds(toolPaneHeight, getParameterPaneHeight(), containerWidth - toolPaneHeight, toolPaneY);

designer_chart/build.dev.gradle

@@ -4,83 +4,60 @@ tasks.withType(JavaCompile){
 	options.encoding = 'UTF-8'
 }
 //指定构建的jdk版本
-sourceCompatibility=1.8
+sourceCompatibility=1.7
-//指定生成的jar包版本
+//指定生成jar包的版本
 version='8.0'
 
 def srcDir="."
 
+//对生成的jar包进行重命名
 
-//指明生成jar包的名字
 jar{
-	baseName='fr-designer-report'
+	baseName='fr-designer-chart'
 }
-//源码所在位置
+
 sourceSets{
 		main{
 			java{
-				srcDirs=["${srcDir}/src",
+				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)
 
-//显示依赖jar包
+//指定外部依赖
-FileTree f=fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar")
-f.each{File file->
-	println "----${file.path}"
-}
-
-//声明外部依赖
 dependencies{
-	compile fileTree(dir:"../../../finereport-lib-stable/${branchName}",include:'**/*.jar')
+compile fileTree(dir:"../../../finereport-lib-stable/${branchName}",include:'**/*.jar')
-	compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar")
+compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar")
- 	testCompile 'junit:junit:4.12'
-}
 
-//指明无法编译文件所在路径
+ 	testCompile 'junit:junit:4.12'
-def dataContent ={def dir ->
-		copySpec{
-			from ("${dir}"){
-				exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
-			}
-		}
 }
-
+//将非.java 文件复制到classes文件夹下参与打包
-//将非.java文件复制到classes文件夹下 参与打包
 task copyFile(type:Copy,dependsOn:compileJava){
 	copy{
-		with dataContent.call("${srcDir}/src") 
+		from ("${srcDir}/src"){
-		with dataContent.call("${srcDir}/../designer/src") 
+				exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
-		into ('build/classes/main')
+
+		}
+		into 'build/classes/main'
 	}
 
 }
 
-
 //压缩项目中的js文件
 task compressJS{
 	ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
 		classpath {
-
 			fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar')
 		}
 	}
-	ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){
+	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')
-
-		}
-		fileset (dir:"${srcDir}/../designer/src"){
-			include (name:'**/*.js')
-			include (name:'**/*.css')
 		}
 
 	}

designer_chart/build.master.gradle

@@ -5,60 +5,48 @@ tasks.withType(JavaCompile){
 }
 //指定构建的jdk版本
 sourceCompatibility=1.7
-//指定生成的jar包版本
+//指定生成jar包的版本
 version='8.0'
 
 def srcDir="."
 
+//对生成的jar包进行重命名
 
-//指明生成jar包的名字
 jar{
-	baseName='fr-designer-report'
+	baseName='fr-designer-chart'
 }
-//源码所在位置
+
 sourceSets{
 		main{
 			java{
-				srcDirs=["${srcDir}/src",
+				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:"../../../finereport-lib-stable/${branchName}",include:'**/*.jar')
 compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar")
 
  	testCompile 'junit:junit:4.12'
 }
-
+//将非.java 文件复制到classes文件夹下参与打包
-//指明无法编译文件所在路径
-def dataContent ={def dir ->
-		copySpec{
-			from ("${dir}"){
-				exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
-			}
-		}
-}
-
-//将非.java文件复制到classes文件夹下 参与打包
 task copyFile(type:Copy,dependsOn:compileJava){
 	copy{
-		with dataContent.call("${srcDir}/src") 
+		from ("${srcDir}/src"){
-		with dataContent.call("${srcDir}/../designer/src") 
+				exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
-		into ('build/classes/main')
+
+		}
+		into 'build/classes/main'
 	}
 
 }
 
-
 //压缩项目中的js文件
 task compressJS{
 	ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
@@ -66,15 +54,10 @@ task compressJS{
 			fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar')
 		}
 	}
-	ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){
+	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')
-
-		}
-		fileset (dir:"${srcDir}/../designer/src"){
-			include (name:'**/*.js')
-			include (name:'**/*.css')
 		}
 
 	}

designer_chart/build.release.gradle

@@ -5,76 +5,59 @@ tasks.withType(JavaCompile){
 }
 //指定构建的jdk版本
 sourceCompatibility=1.8
-//指定生成的jar包版本
+//指定生成jar包的版本
 version='8.0'
 
 def srcDir="."
 
+//对生成的jar包进行重命名
 
-//指明生成jar包的名字
 jar{
-	baseName='fr-designer-report'
+	baseName='fr-designer-chart'
 }
-//源码所在位置
+
 sourceSets{
 		main{
 			java{
-				srcDirs=["${srcDir}/src",
+				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:'../../../finereport-lib-stable/master',include:'**/*.jar')
 compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar")
 
  	testCompile 'junit:junit:4.12'
 }
-
+//将非.java 文件复制到classes文件夹下参与打包
-//指明无法编译文件所在路径
-def dataContent ={def dir ->
-		copySpec{
-			from ("${dir}"){
-				exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
-			}
-		}
-}
-
-//将非.java文件复制到classes文件夹下 参与打包
 task copyFile(type:Copy,dependsOn:compileJava){
 	copy{
-		with dataContent.call("${srcDir}/src") 
+		from ("${srcDir}/src"){
-		with dataContent.call("${srcDir}/../designer/src") 
+				exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
-		into ('build/classes/main')
+
+		}
+		into 'build/classes/main'
 	}
 
 }
 
-
 //压缩项目中的js文件
 task compressJS{
 	ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
 		classpath {
-
 			fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar')
 		}
 	}
-	ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){
+	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')
-
-		}
-		fileset (dir:"${srcDir}/../designer/src"){
-			include (name:'**/*.js')
-			include (name:'**/*.css')
 		}
 
 	}

designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java

@@ -163,7 +163,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
                 Map.Entry entry = (Map.Entry) iterator.next();
                 String priority = (String) entry.getKey();
                 String imagePath = getIconPath(priority, plotID);
-                if (!StringUtils.isEmpty(imagePath)) {
+                if (StringUtils.isNotEmpty(imagePath)) {
                     return imagePath;
                 }
             }
@@ -273,10 +273,20 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
      */
     public String getTitle4PopupWindow(String priority, String plotID){
         if (chartTypeInterfaces != null && chartTypeInterfaces.containsKey(priority) && chartTypeInterfaces.get(priority).containsKey(plotID)){
-            HashMap<String, IndependentChartUIProvider> chartUIList = chartTypeInterfaces.get(priority);
             IndependentChartUIProvider provider = chartTypeInterfaces.get(priority).get(plotID);
-            return   provider.getPlotTypePane().title4PopupWindow();
+            return provider.getPlotTypePane().title4PopupWindow();
+        }
 
+        //兼容老的插件
+        if (chartTypeInterfaces != null) {
+            Iterator iterator = chartTypeInterfaces.entrySet().iterator();
+            while (iterator.hasNext()) {
+                Map.Entry entry = (Map.Entry) iterator.next();
+                String defaultPriority = (String) entry.getKey();
+                if (chartTypeInterfaces.get(defaultPriority).containsKey(plotID)) {
+                    return chartTypeInterfaces.get(defaultPriority).get(plotID).getPlotTypePane().title4PopupWindow();
+                }
+            }
         }
         return new String();
     }