From ff529f14a88ae5817125d3c38210519997c81440 Mon Sep 17 00:00:00 2001 From: zhouping Date: Thu, 2 Jan 2020 15:54:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?KERNEL-1298=20=E7=BC=96=E8=AF=91=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fine-imageJ/src/main/java/ij/IJ.java | 41 ++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/fine-imageJ/src/main/java/ij/IJ.java b/fine-imageJ/src/main/java/ij/IJ.java index 8ec685c5e..ee4146d29 100644 --- a/fine-imageJ/src/main/java/ij/IJ.java +++ b/fine-imageJ/src/main/java/ij/IJ.java @@ -14,6 +14,7 @@ import ij.measure.Calibration; import ij.measure.ResultsTable; import ij.measure.Measurements; import java.awt.event.*; +import java.awt.geom.GeneralPath; import java.text.*; import java.util.*; import java.awt.*; @@ -1559,6 +1560,46 @@ public class IJ { } return w.npoints; } + + // function is copied from old third-base.jar + public static GeneralPath doWand4Path(ImagePlus img, int selectX, int selectY) { + String mode = "Legacy"; + double tolerance = 0.0D; + GeneralPath path = new GeneralPath(); + ImageProcessor ip = img.getProcessor(); + if (img.getType() == 2 && Double.isNaN((double) ip.getPixelValue(selectX, selectY))) { + return new GeneralPath(); + } else { + int imode = 1; + if (mode != null) { + if (mode.startsWith("4")) { + imode = 4; + } else if (mode.startsWith("8")) { + imode = 8; + } + } + + Wand w = new Wand(ip); + double t1 = ip.getMinThreshold(); + if (t1 != -808080.0D && (ip.getLutUpdateMode() != 2 || tolerance <= 0.0D)) { + w.autoOutline(selectX, selectY, t1, ip.getMaxThreshold(), imode); + } else { + w.autoOutline(selectX, selectY, tolerance, imode); + } + + if (w.npoints > 0) { + for (int i = 0; i < w.npoints; ++i) { + if (i == 0) { + path.moveTo((float) w.xpoints[i], (float) w.ypoints[i]); + } else { + path.lineTo((float) w.xpoints[i], (float) w.ypoints[i]); + } + } + } + + return path; + } + } /** Sets the transfer mode used by the Edit/Paste command, where mode is "Copy", "Blend", "Average", "Difference", "Transparent", "Transparent2", "AND", "OR", "XOR", "Add", "Subtract", "Multiply", or "Divide". */ From 5b79897c2fd1a6faa5d4a319d554389a2e671d61 Mon Sep 17 00:00:00 2001 From: zhouping Date: Thu, 2 Jan 2020 17:04:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?KERNEL-1298=20FineThird=E6=94=AF=E6=8C=81JD?= =?UTF-8?q?K11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.third_step1-jdk11.gradle | 3 +- build.third_step1.gradle | 1 + build.third_step2-jdk11.gradle | 2 +- build.third_step3-jdk11.gradle | 2 +- build.third_step4-jdk11.gradle | 2 +- build.third_step5-jdk11.gradle | 2 +- build.third_step6-jdk11.gradle | 2 +- build.third_step7-jdk11.gradle | 2 +- build.third_step8-jdk11.gradle | 2 +- fine-third-default/fine-slf4j-api/README.md | 3 +- .../fine-slf4j-api/lib/fine-slf4j-impl.jar | Bin 0 -> 2424 bytes .../org/slf4j/impl/StaticLoggerBinder.java | 73 ---------------- .../java/org/slf4j/impl/StaticMDCBinder.java | 67 --------------- .../org/slf4j/impl/StaticMarkerBinder.java | 80 ------------------ .../src/main/java/org/slf4j/impl/package.html | 17 ---- 15 files changed, 12 insertions(+), 246 deletions(-) create mode 100644 fine-third-default/fine-slf4j-api/lib/fine-slf4j-impl.jar delete mode 100644 fine-third-default/fine-slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java delete mode 100644 fine-third-default/fine-slf4j-api/src/main/java/org/slf4j/impl/StaticMDCBinder.java delete mode 100644 fine-third-default/fine-slf4j-api/src/main/java/org/slf4j/impl/StaticMarkerBinder.java delete mode 100644 fine-third-default/fine-slf4j-api/src/main/java/org/slf4j/impl/package.html diff --git a/build.third_step1-jdk11.gradle b/build.third_step1-jdk11.gradle index d6bb1cc6e..7960c9573 100644 --- a/build.third_step1-jdk11.gradle +++ b/build.third_step1-jdk11.gradle @@ -94,7 +94,7 @@ sourceSets{ } -sourceSets.main.output.classesDir = file('build/classes/1') +sourceSets.main.java.outputDir = file('build/classes/1') repositories{ mavenCentral() maven { url "http://mvn.finedevelop.com/repository/maven-public/" } @@ -117,6 +117,7 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-jgit/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-org-dom4j/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-sense4/lib",include:'**/*.jar') + compile fileTree(dir:"${srcDir}/fine-third-default/fine-slf4j-api/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar") compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" diff --git a/build.third_step1.gradle b/build.third_step1.gradle index 3d4103f0f..12768c744 100644 --- a/build.third_step1.gradle +++ b/build.third_step1.gradle @@ -112,6 +112,7 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-jgit/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-org-dom4j/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-sense4/lib",include:'**/*.jar') + compile fileTree(dir:"${srcDir}/fine-third-default/fine-slf4j-api/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar") compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" diff --git a/build.third_step2-jdk11.gradle b/build.third_step2-jdk11.gradle index 102341f25..d0b846c30 100644 --- a/build.third_step2-jdk11.gradle +++ b/build.third_step2-jdk11.gradle @@ -53,7 +53,7 @@ sourceSets{ } -sourceSets.main.output.classesDir = file('build/classes/2') +sourceSets.main.java.outputDir = file('build/classes/2') repositories{ mavenCentral() maven { url "http://mvn.finedevelop.com/repository/maven-public/" } diff --git a/build.third_step3-jdk11.gradle b/build.third_step3-jdk11.gradle index 30d126db7..b064ee985 100644 --- a/build.third_step3-jdk11.gradle +++ b/build.third_step3-jdk11.gradle @@ -33,7 +33,7 @@ sourceSets{ } } -sourceSets.main.output.classesDir = file('build/classes/3') +sourceSets.main.java.outputDir = file('build/classes/3') repositories{ mavenCentral() diff --git a/build.third_step4-jdk11.gradle b/build.third_step4-jdk11.gradle index 2d9d49492..abb6acf4c 100644 --- a/build.third_step4-jdk11.gradle +++ b/build.third_step4-jdk11.gradle @@ -33,7 +33,7 @@ sourceSets{ } -sourceSets.main.output.classesDir = file('build/classes/4') +sourceSets.main.java.outputDir = file('build/classes/4') repositories{ mavenCentral() diff --git a/build.third_step5-jdk11.gradle b/build.third_step5-jdk11.gradle index 5c558aedd..c67d666c2 100644 --- a/build.third_step5-jdk11.gradle +++ b/build.third_step5-jdk11.gradle @@ -33,7 +33,7 @@ sourceSets{ } -sourceSets.main.output.classesDir = file('build/classes/5') +sourceSets.main.java.outputDir = file('build/classes/5') repositories{ mavenCentral() diff --git a/build.third_step6-jdk11.gradle b/build.third_step6-jdk11.gradle index df430101d..06b14308f 100644 --- a/build.third_step6-jdk11.gradle +++ b/build.third_step6-jdk11.gradle @@ -31,7 +31,7 @@ sourceSets{ } } -sourceSets.main.output.classesDir = file('build/classes/6') +sourceSets.main.java.outputDir = file('build/classes/6') repositories{ mavenCentral() diff --git a/build.third_step7-jdk11.gradle b/build.third_step7-jdk11.gradle index f0c4bdf26..f6a9d3a4d 100644 --- a/build.third_step7-jdk11.gradle +++ b/build.third_step7-jdk11.gradle @@ -31,7 +31,7 @@ sourceSets{ } } -sourceSets.main.output.classesDir = file('build/classes/7') +sourceSets.main.java.outputDir = file('build/classes/7') repositories{ mavenCentral() diff --git a/build.third_step8-jdk11.gradle b/build.third_step8-jdk11.gradle index 9cd14bc4d..290a2341a 100644 --- a/build.third_step8-jdk11.gradle +++ b/build.third_step8-jdk11.gradle @@ -31,7 +31,7 @@ sourceSets{ } } -sourceSets.main.output.classesDir = file('build/classes/8') +sourceSets.main.java.outputDir = file('build/classes/8') repositories{ mavenCentral() diff --git a/fine-third-default/fine-slf4j-api/README.md b/fine-third-default/fine-slf4j-api/README.md index 2fab9fc4c..9e54e4f3b 100644 --- a/fine-third-default/fine-slf4j-api/README.md +++ b/fine-third-default/fine-slf4j-api/README.md @@ -1,2 +1,3 @@ 源码地址:https://github.com/qos-ch/slf4j
-版本:1.7.29 \ No newline at end of file +版本:1.7.29
+注:impl部分因为用不到，所以被移动到了lib中用于打包依赖 \ No newline at end of file diff --git a/fine-third-default/fine-slf4j-api/lib/fine-slf4j-impl.jar b/fine-third-default/fine-slf4j-api/lib/fine-slf4j-impl.jar new file mode 100644 index 0000000000000000000000000000000000000000..5a122d61056a69412eaaec4a804a938a18cfcdab GIT binary patch literal 2424 zcmb7_2{e>@AIBe!oqHLEx+PxQ9bGP^v1N%FgA6tAkY;QdGWKm0N|dF^(%4g!Wyp49 zxlUxchGdI3GjkDXB-^!SxG7=OJCnNSs-yG1-{+iX|9qe4f6n*!`=L=FUSR+b6a)(G z6wm-id$>D}cmW6yK=jby0mQd&aQ0uGfdKTbobYEZ*p~qF{=aFl9kiEUpzr@=G0t?o z&*A}qbPxbQzqPPAk3a9_W{oHMxD(-C{^#6@>TbUH;9&0BxCmEVoGUWMDL}#mVhHLT zl75j;QIQY=Cg;cdJP0Td(;k3PmVva@AgtNG#zlX^b+eB*<;0Y<8KGA)R+eh)z3vQO zUq2R1Ygo%==Cx2G1eW)RSxp5&uM=fMt?va^T~!MqR$Cnts+tPSqtFdKTl}=bbF>k) z)8(lL8(E>yy1V?9ql1p9nUr!j%1es?l>rpV7jX&GLa-Q`kKlKs$qAEcGgnQ+wGRpo zPJ(WwV0uIAU(8sVv3OytSdwT*D&1+0>_~}79>-Ti77Z+zIv8&<8Ptt#v~z*1+Lnad zrhyx68b3UkfRDK?8QJD{D_pUsq*T^*>Oj&Rm}kgV7O|arIoAt;Jk(IqwRM{ht7wyLLp?Cr3xZL4;!8?~$R zpwceX6fE4vJ?%HdXS}vcY^u68IJG1~Dk_|4nk=wWrRqhztvhe8A?u|ae=n*CZd$$6ofD$gpK?kyUPAsxo)pCoOc5+-&jk zaMxZ8tckUsZQQM@cB-kzB24rMGXW1qiQYMLxy!DKrCYbKLKqxZH}NZf&v=z&wJ*fy zoQ0OBl6RHg+SB5ZX9AA3@2@s_pDC$Xw#8qpn?Ddjg9+?e%T!=hjovh|$o)!|2q3FJ4qhyufg=)e8@L3BbX-&)&rqT zY5A8M?mp_KX?GZ$mfc_{M}l?+aq^gE${433VL07MY1f8kiuk&lao^{P%W_4=^!oQ3 zLk!bHnRIi(WMdV79L!7k_x$^U7Rr!VNE#A;PaXO$#VWA#Sr}#oXCR$g${TJZ9P}Cs zvE=h5EXm}B_Zd#EzuS7V7Z9uVp~N~Mnd%h0e2l(3q}r+7DKVtYkM!3ocNTIjY?yUq zc+~jR-R>*Fy1`Qht2t5QW{p+37jiA9g|^}-^i0casOWQoPkYJ&Z?4Pmtflg$#C7bf zyxeB2ZBtb57I;Y0sKlku%Do+(C3rN&dqPA~g)~Z77^5QRDR01tNu5g&OK7K|Y<6te zugaBIlW2vWE-(anguu?wH##G!NrwRpl;6-PNnDHz#c9Q{v+$Yvjlkne6)rzWk(z^Z zhJLY+#pjckHz@Q0iPFi?O2NtKaTkjyzgtV)NyU%a)_j#uUaOm7S5z1MR-_r_SKO8x zbTE-+izancZ>?>*3>(N%j^_#up_l*6TenwSr01zK++0e#Mr^0&6=mq?!?<2bSN#hBu|N?Y{s!S+m9@1D9s}5 zs|qqT#cWP3NVG_OT+wj0n@56!wpyf;)c>tA-brJwr8%~a{3HxTL5|CR9B-pr+Xwty z^HvUx;@JZM?KZ%-BLHxQ+-no=Id`0YkKp)xmN>9wqWhWH9^~KS#J*shFKwBG?BG6) z@UP*W@{kD^TZMw4#|7n`Qw~MLu W&Z - - - - - - - - - - -

Implementations of core logging interfaces defined in the {@link - org.slf4j} package.

- -
- - From 9a570dded3994c608346e643c9619081589310f6 Mon Sep 17 00:00:00 2001 From: zhouping Date: Fri, 3 Jan 2020 10:48:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?KERNEL-1298=20FineThird=E6=94=AF=E6=8C=81JD?= =?UTF-8?q?K11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.third_step2-jdk11.gradle | 7 +++++++ build.third_step3-jdk11.gradle | 6 ++++++ build.third_step4-jdk11.gradle | 7 +++++++ 3 files changed, 20 insertions(+) diff --git a/build.third_step2-jdk11.gradle b/build.third_step2-jdk11.gradle index d0b846c30..11e68a307 100644 --- a/build.third_step2-jdk11.gradle +++ b/build.third_step2-jdk11.gradle @@ -17,6 +17,13 @@ jar{ baseName="fine-third_2-10.0" } +compileJava { + configure(options) { + options.compilerArgs << '--add-exports=java.base/sun.security.action=ALL-UNNAMED' + options.compilerArgs << '--add-exports=java.base/sun.nio.ch=ALL-UNNAMED' + } +} + def srcDir="." //设置源码路径 diff --git a/build.third_step3-jdk11.gradle b/build.third_step3-jdk11.gradle index b064ee985..52dbef22a 100644 --- a/build.third_step3-jdk11.gradle +++ b/build.third_step3-jdk11.gradle @@ -17,6 +17,12 @@ jar{ baseName="fine-third_3-10.0" } +compileJava { + configure(options) { + options.compilerArgs << '--add-exports=java.desktop/sun.font=ALL-UNNAMED' + } +} + def srcDir="." //设置源码路径 diff --git a/build.third_step4-jdk11.gradle b/build.third_step4-jdk11.gradle index abb6acf4c..e1fd70c63 100644 --- a/build.third_step4-jdk11.gradle +++ b/build.third_step4-jdk11.gradle @@ -17,6 +17,13 @@ jar{ baseName="fine-third_4-10.0" } +compileJava { + configure(options) { + options.compilerArgs << '--add-exports=java.desktop/sun.font=ALL-UNNAMED' + options.compilerArgs << '--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED' + } +} + def srcDir="." //设置源码路径