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..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="."
//设置源码路径
@@ -53,7 +60,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..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="."
//设置源码路径
@@ -33,7 +39,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..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="."
//设置源码路径
@@ -33,7 +40,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-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". */
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 000000000..5a122d610
Binary files /dev/null and b/fine-third-default/fine-slf4j-api/lib/fine-slf4j-impl.jar differ
diff --git a/fine-third-default/fine-slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/fine-third-default/fine-slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
deleted file mode 100644
index 2eda15c77..000000000
--- a/fine-third-default/fine-slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * Copyright (c) 2004-2011 QOS.ch
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-package org.slf4j.impl;
-
-import org.slf4j.ILoggerFactory;
-
-/**
- * The binding of {@link org.slf4j.LoggerFactory} class with an actual instance of
- * {@link ILoggerFactory} is performed using information returned by this class.
- *
- * This class is meant to provide a dummy StaticLoggerBinder to the slf4j-api module.
- * Real implementations are found in each SLF4J binding project, e.g. slf4j-nop,
- * slf4j-log4j12 etc.
- *
- * @author Ceki Gülcü
- */
-public class StaticLoggerBinder {
-
- /**
- * The unique instance of this class.
- */
- private static final StaticLoggerBinder SINGLETON = new StaticLoggerBinder();
-
- /**
- * Return the singleton of this class.
- *
- * @return the StaticLoggerBinder singleton
- */
- public static final StaticLoggerBinder getSingleton() {
- return SINGLETON;
- }
-
- /**
- * Declare the version of the SLF4J API this implementation is compiled against.
- * The value of this field is modified with each major release.
- */
- // to avoid constant folding by the compiler, this field must *not* be final
- public static String REQUESTED_API_VERSION = "1.6.99"; // !final
-
- private StaticLoggerBinder() {
- throw new UnsupportedOperationException("This code should have never made it into slf4j-api.jar");
- }
-
- public ILoggerFactory getLoggerFactory() {
- throw new UnsupportedOperationException("This code should never make it into slf4j-api.jar");
- }
-
- public String getLoggerFactoryClassStr() {
- throw new UnsupportedOperationException("This code should never make it into slf4j-api.jar");
- }
-}
diff --git a/fine-third-default/fine-slf4j-api/src/main/java/org/slf4j/impl/StaticMDCBinder.java b/fine-third-default/fine-slf4j-api/src/main/java/org/slf4j/impl/StaticMDCBinder.java
deleted file mode 100644
index b9560d41c..000000000
--- a/fine-third-default/fine-slf4j-api/src/main/java/org/slf4j/impl/StaticMDCBinder.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Copyright (c) 2004-2011 QOS.ch
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-package org.slf4j.impl;
-
-import org.slf4j.spi.MDCAdapter;
-
-/**
- * This class is only a stub. Real implementations are found in
- * each SLF4J binding project, e.g. slf4j-nop, slf4j-log4j12 etc.
- *
- * @author Ceki Gülcü
- */
-public class StaticMDCBinder {
-
- /**
- * The unique instance of this class.
- */
- public static final StaticMDCBinder SINGLETON = new StaticMDCBinder();
-
- private StaticMDCBinder() {
- throw new UnsupportedOperationException("This code should never make it into the jar");
- }
-
- /**
- * Return the singleton of this class.
- *
- * @return the StaticMDCBinder singleton
- * @since 1.7.14
- */
- public static final StaticMDCBinder getSingleton() {
- return SINGLETON;
- }
-
- /**
- * Currently this method always returns an instance of
- * {@link StaticMDCBinder}.
- */
- public MDCAdapter getMDCA() {
- throw new UnsupportedOperationException("This code should never make it into the jar");
- }
-
- public String getMDCAdapterClassStr() {
- throw new UnsupportedOperationException("This code should never make it into the jar");
- }
-}
diff --git a/fine-third-default/fine-slf4j-api/src/main/java/org/slf4j/impl/StaticMarkerBinder.java b/fine-third-default/fine-slf4j-api/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
deleted file mode 100644
index 6669770f0..000000000
--- a/fine-third-default/fine-slf4j-api/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Copyright (c) 2004-2011 QOS.ch
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-package org.slf4j.impl;
-
-import org.slf4j.IMarkerFactory;
-import org.slf4j.MarkerFactory;
-import org.slf4j.helpers.BasicMarkerFactory;
-import org.slf4j.spi.MarkerFactoryBinder;
-
-/**
- *
- * The binding of {@link MarkerFactory} class with an actual instance of
- * {@link IMarkerFactory} is performed using information returned by this class.
- *
- * This class is meant to provide a *dummy* StaticMarkerBinder to the slf4j-api module.
- * Real implementations are found in each SLF4J binding project, e.g. slf4j-nop,
- * slf4j-simple, slf4j-log4j12 etc.
- *
- * @author Ceki Gülcü
- */
-public class StaticMarkerBinder implements MarkerFactoryBinder {
-
- /**
- * The unique instance of this class.
- */
- public static final StaticMarkerBinder SINGLETON = new StaticMarkerBinder();
-
- private StaticMarkerBinder() {
- throw new UnsupportedOperationException("This code should never make it into the jar");
- }
-
- /**
- * Return the singleton of this class.
- *
- * @return the StaticMarkerBinder singleton
- * @since 1.7.14
- */
- public static StaticMarkerBinder getSingleton() {
- return SINGLETON;
- }
-
- /**
- * Currently this method always returns an instance of
- * {@link BasicMarkerFactory}.
- */
- public IMarkerFactory getMarkerFactory() {
- throw new UnsupportedOperationException("This code should never make it into the jar");
- }
-
- /**
- * Currently, this method returns the class name of
- * {@link BasicMarkerFactory}.
- */
- public String getMarkerFactoryClassStr() {
- throw new UnsupportedOperationException("This code should never make it into the jar");
- }
-
-}
diff --git a/fine-third-default/fine-slf4j-api/src/main/java/org/slf4j/impl/package.html b/fine-third-default/fine-slf4j-api/src/main/java/org/slf4j/impl/package.html
deleted file mode 100644
index 6b84bada6..000000000
--- a/fine-third-default/fine-slf4j-api/src/main/java/org/slf4j/impl/package.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- Implementations of core logging interfaces defined in the {@link
- org.slf4j} package.
-
-
-
-