From f1136842ad579fe1b3d62373a57defa0da5b80fc Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Tue, 9 Aug 2016 17:36:46 +0800 Subject: [PATCH 01/15] update --- .../src/com/fr/design/ChartTypeInterfaceManager.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java index 500ece8b45..420986ce3f 100644 --- a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java @@ -38,6 +38,8 @@ import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLableReader; import javax.swing.*; +import java.io.File; +import java.lang.reflect.Constructor; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; @@ -48,6 +50,9 @@ import java.util.Map; */ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraChartDesignClassManagerProvider { + + + private static ClassLoader loader = Thread.currentThread().getContextClassLoader(); private static ChartTypeInterfaceManager classManager = null; From 77f45d7acc1c78c9561e77eefd74f98fe4e2eb40 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Tue, 9 Aug 2016 17:38:55 +0800 Subject: [PATCH 02/15] update --- designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java index 269371fbf1..1d5cd101a8 100644 --- a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java @@ -38,8 +38,6 @@ import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLableReader; import javax.swing.*; -import java.io.File; -import java.lang.reflect.Constructor; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; From 242c290cd2437a34a47245235545269f6006800b Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Tue, 9 Aug 2016 17:43:37 +0800 Subject: [PATCH 03/15] update --- .../src/com/fr/design/mainframe/chart/ChartEditPane.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java b/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java index 1de9921585..8495eedf34 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java @@ -125,6 +125,8 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4 } fire(); + + collection.getSelectedChart().getPlot().setAttrChange(true); } } }; From 1bcd90f3fe0d792ae0d9c28e67b0211211f5056f Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Tue, 9 Aug 2016 19:05:51 +0800 Subject: [PATCH 04/15] =?UTF-8?q?build.gradle=E6=9B=B4=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=A4=9A=E5=88=86=E6=94=AF=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 85 +++++++++++++++++++++++++++++++++++++ designer_base/build.gradle | 37 ++++++++++------ designer_chart/build.gradle | 35 +++++++++------ designer_form/build.gradle | 54 +++++++++++++++-------- 4 files changed, 166 insertions(+), 45 deletions(-) create mode 100644 build.gradle diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000000..11222785bc --- /dev/null +++ b/build.gradle @@ -0,0 +1,85 @@ +apply plugin: 'java' +tasks.withType(JavaCompile){ + options.encoding = 'UTF-8' +} +def libDir='${libDir}' +def basicDir='../../' +//获取什么分支名 +FileTree files =fileTree(dir:'./',include:'build.gradle') +def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\')) +def branchName=buildDir.substring(build.DirlastIndexOf ('\\')+1) + +task appletJar<<{ + + ant{ + mkdir(dir:'${libDir}/tmp') + mkdir(dir:'build/classes/') + copy(todir:'build/classes/'){ + fileset(dir:'${basicDir}/finereport-core-stable/${branchName}/build/classes/main') + + fileset(dir:'${basicDir}/finereport-chart-stable/${branchName}/build/classes/main') + + fileset(dir:'${basicDir}/finereport-report-stable/${branchName}/build/classes/main') + + fileset(dir:'${basicDir}/finereport-platform-stable/${branchName}/build/classes/main') + + fileset(dir:'${basicDir}/finereport-performance-stable/${branchName}/build/classes/main') + + } + unjar(src:"${libDir}/3rd.jar',dest:'${libDir}/tmp') + unjar(src:'${libDir}/servlet-api.jar',dest:'${libDir}/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:'${libDir}/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:'${libDir}/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 "CN=FineReport L=NanJing C=China" -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') + + } + +} \ No newline at end of file diff --git a/designer_base/build.gradle b/designer_base/build.gradle index 319cc17f29..731deebe3f 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -3,36 +3,45 @@ apply plugin: 'java' tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } +//指定构建的jdk版本 +sourceCompatibility=1.8 +//指定生成jar包版本 version='8.0' - +//生成jar包重命名 jar{ baseName='fr-designer-core' } -def srcDir="${System.getenv()['JENKINS_HOME']}/workspace/design" -def libDir="${System.getenv()['JENKINS_HOME']}/workspace/lib" +def srcDir="." +//指定源码路径 sourceSets{ main{ java{ - srcDirs=["${srcDir}/designer_base/src"] + 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:'../../',include:'**/*.jar') -compile fileTree(dir:libDir,include:'*.jar') -compile fileTree(dir:"${libDir}/jetty",include:'*.jar') + +compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') +compile fileTree(dir:'../../../',include:'finereport-*-stable/**/*.jar') + testCompile 'junit:junit:4.12' } - +//复制非.java文件到classes文件夹下参与打包 task copyFile(type:Copy,dependsOn:compileJava){ copy{ - from ("${srcDir}/designer_base/src"){ - exclude '**/*.java' + from ("${srcDir}/src"){ + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' } into 'build/classes/main' } @@ -44,13 +53,13 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../lib',includes:'*.jar') + fileset(dir:'../../../finereport-build-stable',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}/designer_base/src"){ + fileset (dir:"${srcDir}/src"){ include (name:'**/*.js') - + include (name:'**/*.css') } } diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 2a667bf827..92e221f194 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -3,12 +3,14 @@ apply plugin: 'java' tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } - +//指定构建的jdk版本 +sourceCompatibility=1.8 +//指定生成jar包的版本 version='8.0' -def srcDir="${System.getenv()['JENKINS_HOME']}/workspace/design" -def libDir="${System.getenv()['JENKINS_HOME']}/workspace/lib" +def srcDir="." +//对生成的jar包进行重命名 jar{ baseName='fr-designer-chart' @@ -17,21 +19,28 @@ jar{ sourceSets{ main{ java{ - srcDirs=["${srcDir}/designer_chart/src"] + 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:'../../',include:'**/*.jar') -compile fileTree(dir:libDir,include:'*.jar') -compile fileTree(dir:"${libDir}/jetty",include:'*.jar') +compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') +compile fileTree(dir:'../../../',include:'finereport-*-stable/${branchName}/**/*.jar') + testCompile 'junit:junit:4.12' } - +//将非.java 文件复制到classes文件夹下参与打包 task copyFile(type:Copy,dependsOn:compileJava){ copy{ - from ("${srcDir}/designer_chart/src"){ - exclude '**/*.java' + from ("${srcDir}/src"){ + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' + } into 'build/classes/main' } @@ -42,13 +51,13 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../lib',includes:'*.jar') + fileset(dir:'../../../finereport-build-stable',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}/designer_chart/src"){ + fileset (dir:"${srcDir}/src"){ include (name:'**/*.js') - + include (name:'**/*.css') } } diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 1a87cbf95b..118215fc8a 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -3,39 +3,56 @@ apply plugin: 'java' tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } - +//指定构建的jdk版本 +sourceCompatibility=1.8 +//指定生成的jar包版本 version='8.0' -def srcDir="${System.getenv()['JENKINS_HOME']}/workspace/design" -def libDir="${System.getenv()['JENKINS_HOME']}/workspace/lib" +def srcDir="." +//指明生成jar包的名字 jar{ baseName='fr-designer-report' } - +//源码所在位置 sourceSets{ main{ java{ - srcDirs=["${srcDir}/designer/src", -"${srcDir}/designer_form/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:'../../',include:'**/*.jar') -compile fileTree(dir:libDir,include:'*.jar') -compile fileTree(dir:"${libDir}/jetty",include:'*.jar') +compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') +compile fileTree(dir:'../../../',include:'finereport-*-stable/**/*.jar') + testCompile 'junit:junit:4.12' } +//指明无法编译文件所在路径 +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{ - from ("${srcDir}/designer/src"){ - exclude '**/*.java' - } - from ("${srcDir}/designer_form/src") + with dataContent.call("${srcDir}/src") + with dataContent.call("${srcDir}/../designer/src") into ('build/classes/main') } @@ -46,17 +63,18 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../lib',includes:'*.jar') + fileset(dir:'../../../finereport-build-stable',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}/designer/src"){ + 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_form/src"){ + fileset (dir:"${srcDir}/../designer/src"){ include (name:'**/*.js') - + include (name:'**/*.css') } } From a0562610756995a4475f374212c3daaca8290a54 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Tue, 9 Aug 2016 20:02:37 +0800 Subject: [PATCH 05/15] =?UTF-8?q?build.gradle=E5=A4=9A=E5=88=86=E6=94=AF?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=B5=8B=E8=AF=95--01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 11222785bc..3ab04c1e27 100644 --- a/build.gradle +++ b/build.gradle @@ -2,8 +2,9 @@ apply plugin: 'java' tasks.withType(JavaCompile){ options.encoding = 'UTF-8' } -def libDir='${libDir}' + def basicDir='../../' +def libDir='${basicDir}/finereport-lib-stable' //获取什么分支名 FileTree files =fileTree(dir:'./',include:'build.gradle') def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\')) From 3dc93670c37ecb31a9d0e8a61e14a41647cafedd Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Wed, 10 Aug 2016 09:44:46 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E5=A4=9A=E5=88=86=E6=94=AF=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E6=B5=8B=E8=AF=95--01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 100 ++++++++++++++++++------------------ designer_base/build.gradle | 2 +- designer_chart/build.gradle | 2 +- designer_form/build.gradle | 2 +- 4 files changed, 53 insertions(+), 53 deletions(-) diff --git a/build.gradle b/build.gradle index 3ab04c1e27..4cfb0fc7a3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,71 +1,71 @@ -apply plugin: 'java' +apply plugin: "java" tasks.withType(JavaCompile){ - options.encoding = 'UTF-8' + options.encoding = "UTF-8" } -def basicDir='../../' -def libDir='${basicDir}/finereport-lib-stable' +def basicDir="../../" +def libDir="${basicDir}/finereport-lib-stable" //获取什么分支名 -FileTree files =fileTree(dir:'./',include:'build.gradle') -def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\')) -def branchName=buildDir.substring(build.DirlastIndexOf ('\\')+1) +FileTree files =fileTree(dir:"./",include:"build.gradle") +def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\")) +def branchName=buildDir.substring(build.DirlastIndexOf ("\\")+1) task appletJar<<{ ant{ - mkdir(dir:'${libDir}/tmp') - mkdir(dir:'build/classes/') - copy(todir:'build/classes/'){ - fileset(dir:'${basicDir}/finereport-core-stable/${branchName}/build/classes/main') + mkdir(dir:"${libDir}/tmp") + mkdir(dir:"build/classes/") + copy(todir:"build/classes/"){ + fileset(dir:"${basicDir}/finereport-core-stable/${branchName}/build/classes/main") - fileset(dir:'${basicDir}/finereport-chart-stable/${branchName}/build/classes/main') + fileset(dir:"${basicDir}/finereport-chart-stable/${branchName}/build/classes/main") - fileset(dir:'${basicDir}/finereport-report-stable/${branchName}/build/classes/main') + fileset(dir:"${basicDir}/finereport-report-stable/${branchName}/build/classes/main") - fileset(dir:'${basicDir}/finereport-platform-stable/${branchName}/build/classes/main') + fileset(dir:"${basicDir}/finereport-platform-stable/${branchName}/build/classes/main") - fileset(dir:'${basicDir}/finereport-performance-stable/${branchName}/build/classes/main') + fileset(dir:"${basicDir}/finereport-performance-stable/${branchName}/build/classes/main") } - unjar(src:"${libDir}/3rd.jar',dest:'${libDir}/tmp') - unjar(src:'${libDir}/servlet-api.jar',dest:'${libDir}/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/**') + unjar(src:"${libDir}/3rd.jar",dest:"${libDir}/tmp") + unjar(src:"${libDir}/servlet-api.jar",dest:"${libDir}/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:'${libDir}/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:"${libDir}/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') + fileset(dir:"build/classes"){ + include(name:"com/fr/web/*.class") + include(name:"com/fr/web/attr/*.class") } } - delete(dir:'${libDir}/tmp') - def jdk6home= 'D:/FineReport/develop/java/jdk1.6u35' - def keystore='frapplet.store' - def keycert='fr.cert' - def keypassword='123456' - def keyalias='fr' + delete(dir:"${libDir}/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 "CN=FineReport L=NanJing C=China" -keystore ${keystore} -alias ${keyalias} -validity 3650 -storepass ${keypassword}") @@ -79,7 +79,7 @@ task appletJar<<{ } delete(file:"${keystore}") delete(file:"${keycert}") - delete(dir:'build/classes') + delete(dir:"build/classes") } diff --git a/designer_base/build.gradle b/designer_base/build.gradle index 731deebe3f..b57b6f5695 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -33,7 +33,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) dependencies{ compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') -compile fileTree(dir:'../../../',include:'finereport-*-stable/**/*.jar') +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar") testCompile 'junit:junit:4.12' } diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 92e221f194..2c836c3514 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -31,7 +31,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) //指定外部依赖 dependencies{ compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') -compile fileTree(dir:'../../../',include:'finereport-*-stable/${branchName}/**/*.jar') +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar") testCompile 'junit:junit:4.12' } diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 118215fc8a..ade1e3efc5 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -34,7 +34,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) //声明外部依赖 dependencies{ compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') -compile fileTree(dir:'../../../',include:'finereport-*-stable/**/*.jar') +compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar") testCompile 'junit:junit:4.12' } From a2eccf5c2c661744a2b90ccfc62c849bdd86e7f8 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Wed, 10 Aug 2016 09:52:42 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E5=A4=9A=E5=88=86=E6=94=AF=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E6=B5=8B=E8=AF=95--02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4cfb0fc7a3..0dc1b07b16 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ def libDir="${basicDir}/finereport-lib-stable" //获取什么分支名 FileTree files =fileTree(dir:"./",include:"build.gradle") def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\")) -def branchName=buildDir.substring(build.DirlastIndexOf ("\\")+1) +def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1) task appletJar<<{ From da624db69ef66395d56d2a5598b7e1b4366edbe7 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Wed, 10 Aug 2016 10:01:12 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E5=A4=9A=E5=88=86=E6=94=AF=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E6=B5=8B=E8=AF=95--03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/build.gradle | 2 +- designer_chart/build.gradle | 2 +- designer_form/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/designer_base/build.gradle b/designer_base/build.gradle index b57b6f5695..926e87e430 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -26,7 +26,7 @@ sourceSets{ //获取什么分支名 FileTree files =fileTree(dir:'./',include:'build.gradle') def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\')) -buildDir=buildDir.substring(0，buildDir.lastIndexOf ('\\')) +buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\')) def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) //声明外部依赖 diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 2c836c3514..46717d4acb 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -25,7 +25,7 @@ sourceSets{ } FileTree files =fileTree(dir:'./',include:'build.gradle') def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\')) -buildDir=buildDir.substring(0，buildDir.lastIndexOf ('\\')) +buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\')) def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) //指定外部依赖 diff --git a/designer_form/build.gradle b/designer_form/build.gradle index ade1e3efc5..4409495b9b 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -28,7 +28,7 @@ sourceSets{ //获取什么分支名 FileTree files =fileTree(dir:'./',include:'build.gradle') def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\')) -buildDir=buildDir.substring(0，buildDir.lastIndexOf ('\\')) +buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\')) def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) //声明外部依赖 From 715485799e3637c99227a54d362ac6071bc7e76f Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Wed, 10 Aug 2016 10:07:59 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E5=A4=9A=E5=88=86=E6=94=AF=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E6=B5=8B=E8=AF=95--04?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 0dc1b07b16..b808d2fd56 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1) task appletJar<<{ ant{ - mkdir(dir:"${libDir}/tmp") + mkdir(dir:"${libDir}/tmp-${branchName}") mkdir(dir:"build/classes/") copy(todir:"build/classes/"){ fileset(dir:"${basicDir}/finereport-core-stable/${branchName}/build/classes/main") @@ -44,7 +44,7 @@ task appletJar<<{ exclude(name:"com/fr/start/**") exclude(name:"com/fr/process/**") } - fileset(dir:"${libDir}/tmp"){ + fileset(dir:"${libDir}/tmp-${branchName}"){ include(name:"javax/mail/**") include(name:"javax/servlet/**") include(name:"org/freehep/**") @@ -60,7 +60,7 @@ task appletJar<<{ include(name:"com/fr/web/attr/*.class") } } - delete(dir:"${libDir}/tmp") + delete(dir:"${libDir}/tmp-${branchName}") def jdk6home= "D:/FineReport/develop/java/jdk1.6u35" def keystore="frapplet.store" def keycert="fr.cert" From e9e960a2b103bae3a98c4d3020f00c2fbc6f6be6 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Wed, 10 Aug 2016 10:08:54 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E5=A4=9A=E5=88=86=E6=94=AF=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E6=B5=8B=E8=AF=95--05?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index b808d2fd56..633739a745 100644 --- a/build.gradle +++ b/build.gradle @@ -27,8 +27,8 @@ task appletJar<<{ fileset(dir:"${basicDir}/finereport-performance-stable/${branchName}/build/classes/main") } - unjar(src:"${libDir}/3rd.jar",dest:"${libDir}/tmp") - unjar(src:"${libDir}/servlet-api.jar",dest:"${libDir}/tmp") + unjar(src:"${libDir}/3rd.jar",dest:"${libDir}/tmp-${branchName}") + unjar(src:"${libDir}/servlet-api.jar",dest:"${libDir}/tmp-${branchName}") jar(jarfile:"build/libs/fr-applet-8.0.jar"){ fileset(dir:"build/classes"){ exclude(name:"*.*") From 92ea24eab39d5e664a0f217855e5a3a3d7aeb3d2 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Wed, 10 Aug 2016 11:35:49 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E6=94=B9=E5=8F=98=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_chart/src/com/fr/design/image/ImageListener.java | 7 +++++++ .../src/com/fr/design/mainframe/chart/ChartEditPane.java | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 designer_chart/src/com/fr/design/image/ImageListener.java diff --git a/designer_chart/src/com/fr/design/image/ImageListener.java b/designer_chart/src/com/fr/design/image/ImageListener.java new file mode 100644 index 0000000000..b24bc5f941 --- /dev/null +++ b/designer_chart/src/com/fr/design/image/ImageListener.java @@ -0,0 +1,7 @@ +package com.fr.design.image; + +/** + * Created by hufan on 2016/8/10. + */ +public interface ImageListener { +} diff --git a/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java b/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java index 8495eedf34..c39aca7bd8 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java @@ -115,6 +115,11 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4 AbstractChartAttrPane selectedPane = paneList.get(tabsHeaderIconPane.getSelectedIndex()); selectedPane.update(collection); if (!ComparatorUtils.equals(collection, lastCollection)) { + + //姝ゅ鐢诲浘 + Chart chart = collection.getSelectedChart(); + chart.demoImgEvent(true); + try { lastCollection = (ChartCollection) collection.clone(); } catch (CloneNotSupportedException e) { @@ -125,8 +130,6 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4 } fire(); - - collection.getSelectedChart().getPlot().setAttrChange(true); } } }; From 488c074690d6f6c517dd49dd66501135b557e84a Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Wed, 10 Aug 2016 11:47:07 +0800 Subject: [PATCH 12/15] update --- designer_chart/src/com/fr/design/image/ImageListener.java | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 designer_chart/src/com/fr/design/image/ImageListener.java diff --git a/designer_chart/src/com/fr/design/image/ImageListener.java b/designer_chart/src/com/fr/design/image/ImageListener.java deleted file mode 100644 index b24bc5f941..0000000000 --- a/designer_chart/src/com/fr/design/image/ImageListener.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.fr.design.image; - -/** - * Created by hufan on 2016/8/10. - */ -public interface ImageListener { -} From 518254d0065249829b0dace101933751b8515978 Mon Sep 17 00:00:00 2001 From: zhouping Date: Wed, 10 Aug 2016 14:24:56 +0800 Subject: [PATCH 13/15] =?UTF-8?q?bug88297:=E4=BD=BF=E7=94=A8=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E6=9B=B4=E6=96=B0=E6=8F=92=E4=BB=B6=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=EF=BC=8C=E6=9C=89=E7=9A=84jar=E5=8C=85=E6=A6=82?= =?UTF-8?q?=E7=8E=87=E6=80=A7=E5=88=A0=E9=99=A4=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/RestartHelper.java | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/designer_base/src/com/fr/design/RestartHelper.java b/designer_base/src/com/fr/design/RestartHelper.java index 4dff98615c..53aa5e56b0 100644 --- a/designer_base/src/com/fr/design/RestartHelper.java +++ b/designer_base/src/com/fr/design/RestartHelper.java @@ -4,15 +4,11 @@ import com.fr.design.mainframe.DesignerContext; import com.fr.general.ComparatorUtils; import com.fr.general.FRLogger; import com.fr.general.GeneralUtils; -import com.fr.stable.ArrayUtils; -import com.fr.stable.OperatingSystem; -import com.fr.stable.StableUtils; -import com.fr.stable.StringUtils; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; +import com.fr.stable.*; + +import java.io.*; +import java.nio.channels.FileChannel; +import java.nio.channels.FileLock; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -153,6 +149,18 @@ public class RestartHelper { } try { + try { + File restartLockFile = new File(StableUtils.pathJoin(StableUtils.getInstallHome(), "restart.lock")); + StableUtils.makesureFileExist(restartLockFile); + RandomAccessFile randomAccessFile = new RandomAccessFile(restartLockFile,"rw"); + FileChannel restartLockFC = randomAccessFile.getChannel(); + FileLock restartLock = restartLockFC.tryLock(); + if(restartLock == null) { + FRLogger.getLogger().error("restart lock null!"); + } + }catch (Exception e){ + FRLogger.getLogger().error(e.getMessage()); + } if (OperatingSystem.isMacOS()) { restartInMacOS(installHome, filesToBeDelete); } else { From bf93c680efda465079e7ef56dd994842fde90904 Mon Sep 17 00:00:00 2001 From: zhouping Date: Wed, 10 Aug 2016 17:20:31 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E5=B0=81=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E7=BB=9D=E5=AF=B9=E5=B8=83=E5=B1=80=E4=BB=8E=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E6=A0=8F=E4=BD=8D=E7=BD=AE=E5=B1=8F=E8=94=BD=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_form/src/com/fr/design/gui/core/FormWidgetOption.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java b/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java index 76287c30fe..e99888c726 100644 --- a/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java +++ b/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java @@ -1 +1 @@ -package com.fr.design.gui.core; import javax.swing.Icon; import com.fr.base.BaseUtils; import com.fr.form.ui.ElementCaseEditor; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WAbsoluteLayout; import com.fr.form.ui.container.WBorderLayout; import com.fr.form.ui.container.WCardLayout; import com.fr.form.ui.container.WFitLayout; import com.fr.form.ui.container.WHorizontalBoxLayout; import com.fr.form.ui.container.WParameterLayout; import com.fr.form.ui.container.WVerticalBoxLayout; import com.fr.general.Inter; /** * Author : Shockway * Date: 13-6-17 * Time: 涓婂崍10:40 */ public class FormWidgetOption extends WidgetOption { /** * 杩斿洖鍚嶅瓧 * @return 鍚嶅瓧 */ @Override public String optionName() { return null; } /** * 杩斿洖鍥炬爣 * @return 鍥炬爣 */ @Override public Icon optionIcon() { return null; } /** * 缁勪欢绫 * @return 绫 */ @Override public Class widgetClass() { return null; } /** * 杩斿洖缁勪欢 * @return 鎺т欢 */ @Override public Widget createWidget() { return null; } /* * 琛ㄥ崟瀹瑰櫒 */ public static WidgetOption[] getFormContainerInstance() { return new WidgetOption[] { ABSOLUTELAYOUTCONTAINER, BORDERLAYOUTCONTAINER, HORIZONTALBOXLAYOUTCONTAINER, VERTICALBOXLAYOUTCONTAINER, CARDLAYOUTCONTAINER, FITLAYOUTCONTAINER }; } /** * 琛ㄥ崟宸ュ叿鏍忎笂鐨勫竷灞 * @return 鎺т欢 */ public static WidgetOption[] getFormLayoutInstance() { return new WidgetOption[] {CARDLAYOUTCONTAINER, ABSOLUTELAYOUTCONTAINER}; } public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_AbsoluteLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_absolute.png"), WAbsoluteLayout.class); public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_BorderLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"), WBorderLayout.class); public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_CardLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/card_layout_16.png"), WCardLayout.class); public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Layout-HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"), WHorizontalBoxLayout.class); public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WVerticalBoxLayout.class); public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer-Layout_Adaptive_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WFitLayout.class); public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Para-Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"), WParameterLayout.class); public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Form-Report"), BaseUtils.readIcon("/com/fr/web/images/form/resources/report_16.png"), ElementCaseEditor.class); } \ No newline at end of file +package com.fr.design.gui.core; import javax.swing.Icon; import com.fr.base.BaseUtils; import com.fr.form.ui.ElementCaseEditor; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WAbsoluteLayout; import com.fr.form.ui.container.WBorderLayout; import com.fr.form.ui.container.WCardLayout; import com.fr.form.ui.container.WFitLayout; import com.fr.form.ui.container.WHorizontalBoxLayout; import com.fr.form.ui.container.WParameterLayout; import com.fr.form.ui.container.WVerticalBoxLayout; import com.fr.general.Inter; /** * Author : Shockway * Date: 13-6-17 * Time: 涓婂崍10:40 */ public class FormWidgetOption extends WidgetOption { /** * 杩斿洖鍚嶅瓧 * @return 鍚嶅瓧 */ @Override public String optionName() { return null; } /** * 杩斿洖鍥炬爣 * @return 鍥炬爣 */ @Override public Icon optionIcon() { return null; } /** * 缁勪欢绫 * @return 绫 */ @Override public Class widgetClass() { return null; } /** * 杩斿洖缁勪欢 * @return 鎺т欢 */ @Override public Widget createWidget() { return null; } /* * 琛ㄥ崟瀹瑰櫒 */ public static WidgetOption[] getFormContainerInstance() { return new WidgetOption[] { ABSOLUTELAYOUTCONTAINER, BORDERLAYOUTCONTAINER, HORIZONTALBOXLAYOUTCONTAINER, VERTICALBOXLAYOUTCONTAINER, CARDLAYOUTCONTAINER, FITLAYOUTCONTAINER }; } /** * 琛ㄥ崟宸ュ叿鏍忎笂鐨勫竷灞 * @return 鎺т欢 */ public static WidgetOption[] getFormLayoutInstance() { return new WidgetOption[] {CARDLAYOUTCONTAINER/*, ABSOLUTELAYOUTCONTAINER*/}; } public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_AbsoluteLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_absolute.png"), WAbsoluteLayout.class); public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_BorderLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"), WBorderLayout.class); public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_CardLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/card_layout_16.png"), WCardLayout.class); public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Layout-HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"), WHorizontalBoxLayout.class); public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WVerticalBoxLayout.class); public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer-Layout_Adaptive_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WFitLayout.class); public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Para-Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"), WParameterLayout.class); public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Form-Report"), BaseUtils.readIcon("/com/fr/web/images/form/resources/report_16.png"), ElementCaseEditor.class); } \ No newline at end of file From c2187ec556df112cd55eb79bf4ef5ab2f68fb152 Mon Sep 17 00:00:00 2001 From: zhouping Date: Wed, 10 Aug 2016 19:02:28 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E5=B0=81=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E7=BB=9D=E5=AF=B9=E5=B8=83=E5=B1=80=E7=9A=84=E7=AD=89=E8=B7=9D?= =?UTF-8?q?=E7=BA=BF=E5=B1=8F=E8=94=BD=E6=8E=89=E5=8F=82=E6=95=B0=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/beans/location/MoveUtils.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/designer_base/src/com/fr/design/beans/location/MoveUtils.java b/designer_base/src/com/fr/design/beans/location/MoveUtils.java index 18c282cdc7..fe80b463ac 100644 --- a/designer_base/src/com/fr/design/beans/location/MoveUtils.java +++ b/designer_base/src/com/fr/design/beans/location/MoveUtils.java @@ -300,11 +300,13 @@ public class MoveUtils { findX(px, bounds, left, right, width); findY(py, bounds, top, bottom, height); - if(isIntersects && !isParameterLayout){ - isWidgetsIntersects = true; - } - else{ - findEquidistantLine(bounds, left, top, height, width); + if(!isParameterLayout){ + if(isIntersects) { + isWidgetsIntersects = true; + } + else{ + findEquidistantLine(bounds, left, top, height, width); + } } } showForbiddenWindow(designer, x, y, isWidgetsIntersects);