opensource
/
fine-third
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #405 in CORE/base-third from ~ZHOUPING/base-third:feature/10.0 to feature/10.0 

* commit 'a193f8a4cfa4173931b97d7d4d3e6bd745d57e23':
  rt 尝试把jdk11的内容打到jdk8中
  KERNEL-3436 base-third代码工程maven目录化
  REPORT-28245 HTML解析，图片和文字在同一行时压线
  REPORT-28589 html解析最后一行不应该全是空格
research/11.0
zhouping 5 years ago
parent
7779091c37 a193f8a4cf
commit
7d0885cd3b
25 changed files with 311 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      base-third-project/base-third-step1/pom.xml
  2. 2
      base-third-project/pom.xml
  3. 14
      build.third_step1.gradle
  4. 0
      fine-commons-codec/src/main/java/org/apache/commons/codec/digest/DigestUtils.java
  5. 5
      fine-druid/pom.xml
  6. 5
      fine-hibernate/pom.xml
  7. 5
      fine-hsqldb/pom.xml
  8. 15
      fine-itext/src/main/java/com/fr/third/v2/lowagie/text/html/simpleparser/HTMLWorker.java
  9. 10
      fine-itext/src/main/java/com/fr/third/v2/lowagie/text/pdf/PdfChunk.java
  10. 8
      fine-itext/src/main/java/com/fr/third/v2/lowagie/text/pdf/PdfLine.java
  11. 8
      fine-jai/pom.xml
  12. 5
      fine-kryo/pom.xml
  13. 5
      fine-log4j/pom.xml
  14. 5
      fine-poi/pom.xml
  15. 30
      fine-spring/pom.xml
  16. 8
      fine-third-default/fine-mail/pom.xml
  17. 17
      fine-third-jdk11/fine-activation/pom.xml
  18. 17
      fine-third-jdk11/fine-javax-annotation/pom.xml
  19. 17
      fine-third-jdk11/fine-javax-jws/pom.xml
  20. 23
      fine-third-jdk11/fine-javax-xml-soap/pom.xml
  21. 23
      fine-third-jdk11/fine-jaxb/pom.xml
  22. 33
      fine-third-jdk11/fine-jaxws/pom.xml
  23. 25
      fine-third-jdk11/pom.xml
  24. 20
      fine-third-jdk8/pom.xml
  25. 17
      fine-third-jdk8/xml-apis/pom.xml

2
base-third-project/base-third-step1/pom.xml
Unescape View File

@ -52,6 +52,8 @@
<module>../../fine-roaringbitmap</module>
<module>../../fine-sense4</module>
<module>../../fine-third-default</module>
<module>../../fine-third-jdk8</module>
<module>../../fine-third-jdk11</module>
</modules>
<build>

2
base-third-project/pom.xml
Unescape View File

@ -11,7 +11,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<classes-path>G:\Code\10.0\feature-third-maven\base-third\base-third-project\</classes-path>
<revision>10.0-FEATURE-SNAPSHOT</revision>
<language-level>1.7</language-level>
<language-level>1.8</language-level>
</properties>
<modules>

14
build.third_step1.gradle
Unescape View File

@ -81,7 +81,13 @@ sourceSets{
"${srcDir}/fine-third-default/fine-sjsxp/src/main/java",
"${srcDir}/fine-third-default/fine-stax/src/main/java",
"${srcDir}/fine-third-default/fine-sun-jpeg/src/main/java",
"${srcDir}/fine-third-jdk8/xml-apis/src/main/java"
"${srcDir}/fine-third-jdk8/xml-apis/src/main/java",
"${srcDir}/fine-third-jdk11/fine-activation/src/main/java",
"${srcDir}/fine-third-jdk11/fine-javax-annotation/src/main/java",
"${srcDir}/fine-third-jdk11/fine-javax-jws/src/main/java",
"${srcDir}/fine-third-jdk11/fine-javax-xml-soap/src/main/java",
"${srcDir}/fine-third-jdk11/fine-jaxb/src/main/java",
"${srcDir}/fine-third-jdk11/fine-jaxws/src/main/java"
]
}
}
@ -219,6 +225,12 @@ task copyFiles(type:Copy,dependsOn:'compileJava'){
with dataContent.call("${srcDir}/fine-third-default/fine-stax/src/main/java")
with dataContent.call("${srcDir}/fine-third-default/fine-sun-jpeg/src/main/java")
with dataContent.call("${srcDir}/fine-third-jdk8/xml-apis/src/main/java")
with dataContent.call("${srcDir}/fine-third-jdk11/fine-activation/src/main/java")
with dataContent.call("${srcDir}/fine-third-jdk11/fine-javax-annotation/src/main/java")
with dataContent.call("${srcDir}/fine-third-jdk11/fine-javax-jws/src/main/java")
with dataContent.call("${srcDir}/fine-third-jdk11/fine-javax-xml-soap/src/main/java")
with dataContent.call("${srcDir}/fine-third-jdk11/fine-jaxb/src/main/java")
with dataContent.call("${srcDir}/fine-third-jdk11/fine-jaxws/src/main/java")
into "${classesDir}"
}
}

0
fine-commons-codec/src/org/apache/commons/codec/digest/DigestUtils.java → fine-commons-codec/src/main/java/org/apache/commons/codec/digest/DigestUtils.java
Unescape View File

5
fine-druid/pom.xml
Unescape View File

@ -25,6 +25,11 @@
<artifactId>fine-hibernate</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fr.third</groupId>
<artifactId>fine-javax-annotation</artifactId>
<version>${revision}</version>
</dependency>
<!-->以下是lib的本地jar包依赖<-->
<dependency>
<groupId>com.fr.third</groupId>

5
fine-hibernate/pom.xml
Unescape View File

@ -45,6 +45,11 @@
<artifactId>fine-javassist</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fr.third</groupId>
<artifactId>fine-jaxb</artifactId>
<version>${revision}</version>
</dependency>
<!-->以下是lib的本地jar包依赖<-->
<dependency>
<groupId>com.fr.third</groupId>

5
fine-hsqldb/pom.xml
Unescape View File

@ -15,6 +15,11 @@
<version>${revision}</version>
<dependencies>
<dependency>
<groupId>com.fr.third</groupId>
<artifactId>fine-jaxb</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fr.third.server</groupId>
<artifactId>servlet-api</artifactId>

15
fine-itext/src/main/java/com/fr/third/v2/lowagie/text/html/simpleparser/HTMLWorker.java
Unescape View File

@ -171,6 +171,7 @@ public class HTMLWorker implements SimpleXMLDocHandler, DocListener {
worker.setInterfaceProps(interfaceProps);
worker.objectList = new ArrayList();
worker.parse(reader);
return worker.objectList;
}
@ -178,7 +179,7 @@ public class HTMLWorker implements SimpleXMLDocHandler, DocListener {
try {
for (int k = 0; k < stack.size(); ++k)
document.add((Element) stack.elementAt(k));
if (currentParagraph != null)
if (needAddLastParagraph())
document.add(currentParagraph);
currentParagraph = null;
} catch (Exception e) {
@ -186,6 +187,18 @@ public class HTMLWorker implements SimpleXMLDocHandler, DocListener {
}
}
private boolean needAddLastParagraph() {
if (currentParagraph == null) {
return false;
}
ArrayList list = currentParagraph.getChunks();
if (!(list.size() == 1 && list.get(0) instanceof Chunk)) {
return true;
}
Chunk c = (Chunk) list.get(0);
return c.getImage() != null || c.getContent().trim().length() != 0;
}
public void startDocument() {
HashMap h = new HashMap();
style.applyStyle("body", h);

10
fine-itext/src/main/java/com/fr/third/v2/lowagie/text/pdf/PdfChunk.java
Unescape View File

@ -103,6 +103,10 @@ public class PdfChunk {
return height;
}
public float getTextDescent() {
return textDescent;
}
public void setHeight(float height) {
this.height = height;
}
@ -112,6 +116,8 @@ public class PdfChunk {
private float height = 0;
private float textDescent = 0;
private IndentAttribute indent = new IndentAttribute();
public Map<String, String> background ;
@ -228,6 +234,7 @@ public class PdfChunk {
if (splitCharacter == null)
splitCharacter = DefaultSplitCharacter.DEFAULT;
this.height = other.getHeight();
this.textDescent = other.getTextDescent();
}
/**
@ -240,6 +247,7 @@ public class PdfChunk {
public PdfChunk(Chunk chunk, PdfAction action) {
thisChunk[0] = this;
value = chunk.getContent();
updateBreakTag();
Font f = chunk.getFont();
float size = f.getSize();
@ -278,7 +286,9 @@ public class PdfChunk {
int fontSize = (int) (f.getSize() * FONT_SCALE * (getTextRise() != 0 ? SUB_PERCENT : 1));
FontMetrics metrics = FontDesignMetrics.getMetrics(new java.awt.Font(f.getFontName(), f.getStyle(), fontSize));
font = new PdfFont(f, f.getSize());
height = metrics.getHeight() / FONT_SCALE + indent.getTop() + indent.getBottom();
textDescent = metrics.getDescent() / FONT_SCALE;
if (f.isUnderlined()) {
Object obj[] = {null, new float[]{0, 1f / 15, 0, -1f / 3, 0}};
Object unders[][] = Utilities.addToArray((Object[][])attributes.get(Chunk.UNDERLINE), obj);

8
fine-itext/src/main/java/com/fr/third/v2/lowagie/text/pdf/PdfLine.java
Unescape View File

@ -81,6 +81,8 @@ public class PdfLine {
protected float maxTextHeight;
protected float maxTextDescent;
/** The left indentation of the line. */
protected float left;
@ -108,9 +110,8 @@ public class PdfLine {
protected boolean isRTL = false;
public float getHeight() {
return height;
return height + (maxImgHeight != 0 ? maxTextDescent : 0);
}
public void setHeight(float height) {
@ -239,7 +240,7 @@ public class PdfLine {
if (textRise > 0) {
maxTextRise = Math.max(maxTextRise, textRise);
} else {
maxTextDrop = -Math.min(maxTextDrop, textRise);
maxTextDrop = Math.max(maxTextDrop, -textRise);
}
} else {
//一行中只有上下标时，不需要浮动
@ -250,6 +251,7 @@ public class PdfLine {
maxImgHeight = Math.max(maxImgHeight, chunk.getImage().getScaledHeight());
} else {
maxTextHeight = Math.max(maxTextHeight, chunk.getHeight() + maxTextRise + maxTextDrop);
maxTextDescent = Math.max(maxTextDescent, chunk.getTextDescent());
}
this.height = Math.max(this.height, chunk.getHeight() + (neddRiseOrDrop() && !imgBigThanText() ? maxTextRise + maxTextDrop : 0));
}

8
fine-jai/pom.xml
Unescape View File

@ -14,5 +14,11 @@
<artifactId>fine-jai</artifactId>
<version>${revision}</version>
<dependencies>
<dependency>
<groupId>com.fr.third</groupId>
<artifactId>fine-sun-jpeg</artifactId>
<version>${revision}</version>
</dependency>
</dependencies>
</project>

5
fine-kryo/pom.xml
Unescape View File

@ -20,5 +20,10 @@
<artifactId>fine-asm</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fr.third</groupId>
<artifactId>fine-sun-misc</artifactId>
<version>${revision}</version>
</dependency>
</dependencies>
</project>

5
fine-log4j/pom.xml
Unescape View File

@ -20,5 +20,10 @@
<artifactId>fine-javax-jms</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fr.third</groupId>
<artifactId>fine-mail</artifactId>
<version>${revision}</version>
</dependency>
</dependencies>
</project>

5
fine-poi/pom.xml
Unescape View File

@ -25,6 +25,11 @@
<artifactId>fine-commons-logging</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fr.third</groupId>
<artifactId>fine-jaxb</artifactId>
<version>${revision}</version>
</dependency>
<!-->以下是lib的本地jar包依赖<-->
<dependency>

30
fine-spring/pom.xml
Unescape View File

@ -35,6 +35,36 @@
<artifactId>fine-commons-fileupload</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fr.third</groupId>
<artifactId>fine-jaxb</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fr.third</groupId>
<artifactId>fine-javax-jws</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fr.third</groupId>
<artifactId>fine-jaxws</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fr.third</groupId>
<artifactId>fine-javax-xml-soap</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fr.third</groupId>
<artifactId>fine-activation</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fr.third</groupId>
<artifactId>fine-javax-annotation</artifactId>
<version>${revision}</version>
</dependency>
<!-->以下是lib的本地jar包依赖<-->
<dependency>
<groupId>com.fr.third</groupId>

8
fine-third-default/fine-mail/pom.xml
Unescape View File

@ -13,5 +13,11 @@
<artifactId>fine-mail</artifactId>
<version>${revision}</version>
<dependencies>
<dependency>
<groupId>com.fr.third</groupId>
<artifactId>fine-activation</artifactId>
<version>${revision}</version>
</dependency>
</dependencies>
</project>

17
fine-third-jdk11/fine-activation/pom.xml
Unescape View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.fr.third</groupId>
<artifactId>fine-third-jdk11</artifactId>
<version>${revision}</version>
</parent>
<artifactId>fine-activation</artifactId>
<version>${revision}</version>
</project>

17
fine-third-jdk11/fine-javax-annotation/pom.xml
Unescape View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.fr.third</groupId>
<artifactId>fine-third-jdk11</artifactId>
<version>${revision}</version>
</parent>
<artifactId>fine-javax-annotation</artifactId>
<version>${revision}</version>
</project>

17
fine-third-jdk11/fine-javax-jws/pom.xml
Unescape View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.fr.third</groupId>
<artifactId>fine-third-jdk11</artifactId>
<version>${revision}</version>
</parent>
<artifactId>fine-javax-jws</artifactId>
<version>${revision}</version>
</project>

23
fine-third-jdk11/fine-javax-xml-soap/pom.xml
Unescape View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.fr.third</groupId>
<artifactId>fine-third-jdk11</artifactId>
<version>${revision}</version>
</parent>
<artifactId>fine-javax-xml-soap</artifactId>
<version>${revision}</version>
<dependencies>
<dependency>
<groupId>com.fr.third</groupId>
<artifactId>fine-activation</artifactId>
<version>${revision}</version>
</dependency>
</dependencies>
</project>

23
fine-third-jdk11/fine-jaxb/pom.xml
Unescape View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.fr.third</groupId>
<artifactId>fine-third-jdk11</artifactId>
<version>${revision}</version>
</parent>
<artifactId>fine-jaxb</artifactId>
<version>${revision}</version>
<dependencies>
<dependency>
<groupId>com.fr.third</groupId>
<artifactId>fine-activation</artifactId>
<version>${revision}</version>
</dependency>
</dependencies>
</project>

33
fine-third-jdk11/fine-jaxws/pom.xml
Unescape View File

@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.fr.third</groupId>
<artifactId>fine-third-jdk11</artifactId>
<version>${revision}</version>
</parent>
<artifactId>fine-jaxws</artifactId>
<version>${revision}</version>
<dependencies>
<dependency>
<groupId>com.fr.third</groupId>
<artifactId>fine-jaxb</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fr.third</groupId>
<artifactId>fine-javax-annotation</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fr.third</groupId>
<artifactId>fine-javax-xml-soap</artifactId>
<version>${revision}</version>
</dependency>
</dependencies>
</project>

25
fine-third-jdk11/pom.xml
Unescape View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.fr.third</groupId>
<artifactId>step1</artifactId>
<version>${revision}</version>
<relativePath>../base-third-project/base-third-step1</relativePath>
</parent>
<artifactId>fine-third-jdk11</artifactId>
<version>${revision}</version>
<modules>
<module>fine-activation</module>
<module>fine-javax-annotation</module>
<module>fine-javax-jws</module>
<module>fine-javax-xml-soap</module>
<module>fine-jaxb</module>
<module>fine-jaxws</module>
</modules>
</project>

20
fine-third-jdk8/pom.xml
Unescape View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.fr.third</groupId>
<artifactId>step1</artifactId>
<version>${revision}</version>
<relativePath>../base-third-project/base-third-step1</relativePath>
</parent>
<artifactId>fine-third-jdk8</artifactId>
<version>${revision}</version>
<modules>
<module>xml-apis</module>
</modules>
</project>

17
fine-third-jdk8/xml-apis/pom.xml
Unescape View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.fr.third</groupId>
<artifactId>fine-third-jdk8</artifactId>
<version>${revision}</version>
</parent>
<artifactId>xml-apis</artifactId>
<version>${revision}</version>
</project>
Write Preview
Loading…
Cancel
Save