Skip to content

Commit

Permalink
Update dependencies and change YARG version to 2.2 #116
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrey Subbotin committed Aug 16, 2019
1 parent 27d9c06 commit 5668eab
Show file tree
Hide file tree
Showing 6 changed files with 177 additions and 87 deletions.
46 changes: 24 additions & 22 deletions core/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,11 @@ configure(core) {
dependencies {
compile(api)
compile(group: 'commons-logging', name: 'commons-logging', version: '1.2')
compile(group: 'org.apache.commons', name: 'commons-lang3', version: '3.5')
compile(group: 'commons-io', name: 'commons-io', version: '2.5')
compile(group: 'org.dom4j', name: 'dom4j', version: '2.1.0')
compile(group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25')
compile(group: 'org.apache.commons', name: 'commons-lang3', version: '3.9')
compile(group: 'commons-io', name: 'commons-io', version: '2.6')
compile(group: 'org.dom4j', name: 'dom4j', version: '2.1.1')
compile(group: 'com.google.guava', name: 'guava', version: '28.0-jre')
compile(group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26')
compile(group: 'org.codehaus.groovy', name: 'groovy-all', version: '2.4.12')
compile(group: 'antlr', name: 'antlr', version: '2.7.7')
compile(group: 'org.antlr', name: 'antlr-runtime', version: '3.2')
Expand All @@ -204,8 +205,8 @@ configure(core) {
compile(group: "org.apache.xmlgraphics", name: "batik-svggen", version: "1.10")
compile(group: "org.apache.xmlgraphics", name: "batik-awt-util", version: "1.10")
compile(group: "org.apache.xmlgraphics", name: "batik-css", version: "1.10")
compile(group: "xalan", name: "xalan", version: "2.7.1")
compile(group: "xalan", name: "serializer", version: "2.7.1")
compile(group: "xalan", name: "xalan", version: "2.7.2")
compile(group: "xalan", name: "serializer", version: "2.7.2")
compile(group: "com.lowagie", name: "itext", version: "2.1.7") {
exclude(group: 'org.bouncycastle', module: 'bctsp-jdk14')
exclude(group: 'org.bouncycastle', module: 'bcprov-jdk14')
Expand All @@ -214,51 +215,52 @@ configure(core) {
exclude(group: 'bouncycastle', module: 'bcprov-jdk14')
exclude(group: 'bouncycastle', module: 'bctsp-jdk14')
}
compile(group: 'org.apache.poi', name: 'poi', version: '3.17')
compile(group: 'org.apache.poi', name: 'poi-scratchpad', version: '3.9') {
compile(group: 'org.apache.poi', name: 'poi', version: '4.1.0')
compile(group: 'org.apache.poi', name: 'poi-scratchpad', version: '4.1.0') {
exclude(group: 'org.apache.poi', module: 'poi')
}
compile(group: 'org.xhtmlrenderer', name: 'flying-saucer-core', version: '9.1.16')
compile(group: 'org.xhtmlrenderer', name: 'flying-saucer-pdf', version: '9.1.16') {
compile(group: 'org.xhtmlrenderer', name: 'flying-saucer-core', version: '9.1.18')
compile(group: 'org.xhtmlrenderer', name: 'flying-saucer-pdf', version: '9.1.18') {
exclude(group: 'org.bouncycastle', module: 'bctsp-jdk14')
exclude(group: 'org.bouncycastle', module: 'bcprov-jdk14')
exclude(group: 'org.bouncycastle', module: 'bcmail-jdk14')
exclude(group: 'bouncycastle', module: 'bcmail-jdk14')
exclude(group: 'bouncycastle', module: 'bcprov-jdk14')
exclude(group: 'bouncycastle', module: 'bctsp-jdk14')
}
compile (group: 'com.openhtmltopdf', name: 'openhtmltopdf-core', version: '0.0.1-RC19') {
compile (group: 'com.openhtmltopdf', name: 'openhtmltopdf-core', version: '1.0.0') {
exclude(group: 'junit', module: 'junit')
}
compile (group: 'com.openhtmltopdf', name: 'openhtmltopdf-rtl-support', version: '0.0.1-RC19')
compile (group: 'com.openhtmltopdf', name: 'openhtmltopdf-pdfbox', version: '0.0.1-RC19') {
compile (group: 'com.openhtmltopdf', name: 'openhtmltopdf-rtl-support', version: '1.0.0')
compile (group: 'com.openhtmltopdf', name: 'openhtmltopdf-pdfbox', version: '1.0.0') {
exclude(group: 'junit', module: 'junit')
}
compile(group: "org.docx4j", name: "docx4j", version: "6.1.0") {
compile(group: "org.docx4j", name: "docx4j-JAXB-Internal", version: "8.1.2")
compile(group: "org.docx4j", name: "docx4j-core", version: "8.1.2") {
exclude(group: 'org.apache.poi', module: 'poi')
exclude(group: 'junit', module: 'junit')
exclude(group: 'log4j', module: 'log4j')
exclude(group: 'org.slf4j', module: 'slf4j-log4j12')
exclude(group: 'com.fasterxml.jackson.core')
}
compile(group: "org.docx4j", name: "docx4j-ImportXHTML", version: "6.1.0") {
compile(group: "org.docx4j", name: "docx4j-ImportXHTML", version: "8.0.0") {
exclude(group: 'junit', module: 'junit')
exclude(group: 'org.apache.poi', module: 'poi')
exclude(group: 'log4j', module: 'log4j')
exclude(group: 'org.slf4j', module: 'slf4j-log4j12')
exclude(group: 'com.fasterxml.jackson.core')
}
compile(group: "org.docx4j", name: "docx4j-export-fo", version: "6.1.0") {
compile(group: "org.docx4j", name: "docx4j-export-fo", version: "8.1.2") {
exclude(group: 'junit', module: 'junit')
exclude(group: 'log4j', module: 'log4j')
exclude(group: 'org.slf4j', module: 'slf4j-log4j12')
exclude(group: 'com.fasterxml.jackson.core')
}
compile(group: "org.jsoup", name: "jsoup", version: "1.10.3")
compile(group: "com.jayway.jsonpath", name: "json-path", version: "2.1.0")
compile(group: "com.opencsv", name: "opencsv", version: "3.10")
compile(group: "org.jsoup", name: "jsoup", version: "1.12.1")
compile(group: "com.jayway.jsonpath", name: "json-path", version: "2.4.0")
compile(group: "com.opencsv", name: "opencsv", version: "4.6")
compile group: 'org.olap4j', name: 'olap4j', version: '1.2.0'
compile(group: "net.sf.jasperreports", name: "jasperreports", version: "6.7.0") {
compile(group: "net.sf.jasperreports", name: "jasperreports", version: "6.9.0") {
exclude(group: 'org.apache.lucene')
exclude(group: 'commons-beanutils', module: 'commons-beanutils')
exclude(group: 'com.google.zxing', module: 'core')
Expand All @@ -275,8 +277,8 @@ configure(core) {
testCompile(group: 'com.h2database', name: 'h2', version: '1.4.196')
testCompile(group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3')
testCompile(group: 'commons-dbcp', name: 'commons-dbcp', version: '1.4')
testCompile(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.2')
testCompile(group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.9.2')
testCompile(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.9.2')
testCompile(group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.9.9')
}

test {
Expand Down
25 changes: 13 additions & 12 deletions core/modules/core/src/com/haulmont/yarg/formatters/impl/XLSFormatter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import org.apache.poi.ss.formula.ptg.AreaPtg;
import org.apache.poi.ss.formula.ptg.Ptg;
import org.apache.poi.ss.formula.ptg.RefPtg;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.util.AreaReference;
import org.apache.poi.ss.util.CellRangeAddress;
Expand Down Expand Up @@ -351,7 +352,7 @@ protected void writeHorizontalBand(BandData band, HSSFSheet templateSheet, HSSFS
}

bottomRight = new CellReference(rownum + rowsAddedByHorizontalBand - 1, offset + currentColumnCount);
resultRange = new AreaReference(topLeft, bottomRight);
resultRange = new AreaReference(topLeft, bottomRight, SpreadsheetVersion.EXCEL97);

areaDependencyManager.addDependency(new Area(band.getName(), Area.AreaAlign.HORIZONTAL, templateRange),
new Area(band.getName(), Area.AreaAlign.HORIZONTAL, resultRange));
Expand Down Expand Up @@ -438,7 +439,7 @@ protected void writeVerticalBand(BandData band, HSSFSheet templateSheet, HSSFShe
colnum += crefs[crefs.length - 1].getCol() - firstColumn + 1;

AreaReference templateRange = getAreaForRange(templateWorkbook, rangeName);
AreaReference resultRange = new AreaReference(topLeft, bottomRight);
AreaReference resultRange = new AreaReference(topLeft, bottomRight, SpreadsheetVersion.EXCEL97);
areaDependencyManager.addDependency(new Area(band.getName(), Area.AreaAlign.VERTICAL, templateRange),
new Area(band.getName(), Area.AreaAlign.VERTICAL, resultRange));
bandsToResultRanges.put(band, new Range(resultSheet.getSheetName(),
Expand Down Expand Up @@ -603,16 +604,16 @@ private HSSFCell copyCellFromTemplate(HSSFCell templateCell, HSSFRow resultRow,
resultCell.setCellStyle(resultStyle);

String templateCellValue = "";
int cellType = templateCell.getCellType();
CellType cellType = templateCell.getCellType();

if (cellType != HSSFCell.CELL_TYPE_FORMULA && cellType != HSSFCell.CELL_TYPE_NUMERIC) {
if (cellType != CellType.FORMULA && cellType != CellType.NUMERIC) {
HSSFRichTextString richStringCellValue = templateCell.getRichStringCellValue();
templateCellValue = richStringCellValue != null ? richStringCellValue.getString() : "";

templateCellValue = extractStyles(templateCell, resultCell, templateCellValue, band);
}

if (cellType == HSSFCell.CELL_TYPE_STRING && containsJustOneAlias(templateCellValue)) {
if (cellType == CellType.STRING && containsJustOneAlias(templateCellValue)) {
updateValueCell(rootBand, band, templateCellValue, resultCell,
drawingPatriarchsMap.get(resultCell.getSheet()));
} else {
Expand Down Expand Up @@ -645,7 +646,7 @@ protected void updateValueCell(BandData rootBand, BandData bandData, String temp
Object value = bandData.getData().get(parameterName);

if (value == null) {
resultCell.setCellType(HSSFCell.CELL_TYPE_BLANK);
resultCell.setCellType(CellType.BLANK);
return;
}

Expand All @@ -669,13 +670,13 @@ protected void updateValueCell(BandData rootBand, BandData bandData, String temp
}
}

protected void setValueToCell(HSSFCell resultCell, String cellValue, int cellType) {
protected void setValueToCell(HSSFCell resultCell, String cellValue, CellType cellType) {
if (StringUtils.isNotEmpty(cellValue)) {
switch (cellType) {
case HSSFCell.CELL_TYPE_FORMULA:
case FORMULA:
resultCell.setCellFormula(cellValue);
break;
case HSSFCell.CELL_TYPE_STRING:
case STRING:
resultCell.setCellValue(new HSSFRichTextString(cellValue));
break;
default:
Expand All @@ -684,13 +685,13 @@ protected void setValueToCell(HSSFCell resultCell, String cellValue, int cellTyp
}

} else {
resultCell.setCellType(HSSFCell.CELL_TYPE_BLANK);
resultCell.setCellType(CellType.BLANK);
}
}

protected String inlineBandDataToCellString(HSSFCell cell, String templateCellValue, BandData band) {
String resultStr = "";
if (cell.getCellType() == HSSFCell.CELL_TYPE_STRING) {
if (cell.getCellType() == CellType.STRING) {
if (templateCellValue != null) resultStr = templateCellValue;
} else {
if (cell.toString() != null) resultStr = cell.toString();
Expand Down Expand Up @@ -722,7 +723,7 @@ protected void updateFormulas(Area templateArea, Area dependentResultArea) {
for (CellReference cell : area.getAllReferencedCells()) {
HSSFCell resultCell = getCellFromReference(cell, resultSheet);

if (resultCell.getCellType() == HSSFCell.CELL_TYPE_FORMULA) {
if (resultCell.getCellType() == CellType.FORMULA) {
Ptg[] ptgs = HSSFFormulaParser.parse(resultCell.getCellFormula(), resultWorkbook);

for (Ptg ptg : ptgs) {
Expand Down
93 changes: 46 additions & 47 deletions core/modules/core/src/com/haulmont/yarg/formatters/impl/XlsxFormatter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,67 +232,66 @@ protected void updateCharts() {
CTChart chart = entry.getValue().getChartSpace().getChart();
CTPlotArea plotArea = chart.getPlotArea();
List<Object> areaChartOrArea3DChartOrLineChart = plotArea.getAreaChartOrArea3DChartOrLineChart();
for (Object o : areaChartOrArea3DChartOrLineChart) {
if (o instanceof ListSer) {
processSeries((ListSer) o);
}
for (Object series : areaChartOrArea3DChartOrLineChart) {
processSeries(series);
}
}
}

}
}
}

private void processSeries(ListSer o) {
List<SerContent> ser = o.getSer();
for (SerContent ctBarSer : ser) {
CTAxDataSource captions = ctBarSer.getCat();
if (captions != null && captions.getStrRef() != null) {
Range temlpateCaptionsRange = Range.fromFormula(captions.getStrRef().getF());
for (Range bandRange : rangeDependencies.templates()) {
if (bandRange.contains(temlpateCaptionsRange)) {
List<Range> seriesResultRanges = rangeDependencies.resultsForTemplate(bandRange);

Range seriesFirstRange = getFirst(seriesResultRanges);
Range seriesLastRange = getLast(seriesResultRanges);

Offset offset = calculateOffset(temlpateCaptionsRange, seriesFirstRange);
Offset initialOffset = calculateOffset(temlpateCaptionsRange, bandRange);
temlpateCaptionsRange = temlpateCaptionsRange.shift(
offset.downOffset - initialOffset.downOffset,
offset.rightOffset - initialOffset.rightOffset);

Offset grow = calculateOffset(seriesFirstRange, seriesLastRange);
temlpateCaptionsRange.grow(grow.downOffset, grow.rightOffset);

captions.getStrRef().setF(temlpateCaptionsRange.toFormula());
break;
private void processSeries(Object series) {
List areas = ChartUtils.getAreas(series);
if (areas != null) {
for (Object area : areas) {
CTAxDataSource captions = ChartUtils.getAreaCat(area);
if (captions != null && captions.getStrRef() != null) {
Range temlpateCaptionsRange = Range.fromFormula(captions.getStrRef().getF());
for (Range bandRange : rangeDependencies.templates()) {
if (bandRange.contains(temlpateCaptionsRange)) {
List<Range> seriesResultRanges = rangeDependencies.resultsForTemplate(bandRange);

Range seriesFirstRange = getFirst(seriesResultRanges);
Range seriesLastRange = getLast(seriesResultRanges);

Offset offset = calculateOffset(temlpateCaptionsRange, seriesFirstRange);
Offset initialOffset = calculateOffset(temlpateCaptionsRange, bandRange);
temlpateCaptionsRange = temlpateCaptionsRange.shift(
offset.downOffset - initialOffset.downOffset,
offset.rightOffset - initialOffset.rightOffset);

Offset grow = calculateOffset(seriesFirstRange, seriesLastRange);
temlpateCaptionsRange.grow(grow.downOffset, grow.rightOffset);

captions.getStrRef().setF(temlpateCaptionsRange.toFormula());
break;
}
}
}
}

CTNumDataSource data = ctBarSer.getVal();
if (data != null && data.getNumRef() != null) {
Range templateDataRange = Range.fromFormula(data.getNumRef().getF());
for (Range bandRange : rangeDependencies.templates()) {
if (bandRange.contains(templateDataRange)) {
List<Range> seriesResultRanges = rangeDependencies.resultsForTemplate(bandRange);
CTNumDataSource data = ChartUtils.getAreaVal(area);
if (data != null && data.getNumRef() != null) {
Range templateDataRange = Range.fromFormula(data.getNumRef().getF());
for (Range bandRange : rangeDependencies.templates()) {
if (bandRange.contains(templateDataRange)) {
List<Range> seriesResultRanges = rangeDependencies.resultsForTemplate(bandRange);

Range seriesFirstRange = getFirst(seriesResultRanges);
Range seriesLastRange = getLast(seriesResultRanges);
Range seriesFirstRange = getFirst(seriesResultRanges);
Range seriesLastRange = getLast(seriesResultRanges);

Offset offset = calculateOffset(templateDataRange, seriesFirstRange);
Offset initialOffset = calculateOffset(templateDataRange, bandRange);
templateDataRange = templateDataRange.shift(
offset.downOffset - initialOffset.downOffset,
offset.rightOffset - initialOffset.rightOffset);
Offset offset = calculateOffset(templateDataRange, seriesFirstRange);
Offset initialOffset = calculateOffset(templateDataRange, bandRange);
templateDataRange = templateDataRange.shift(
offset.downOffset - initialOffset.downOffset,
offset.rightOffset - initialOffset.rightOffset);

Offset grow = calculateOffset(seriesFirstRange, seriesLastRange);
templateDataRange.grow(grow.downOffset, grow.rightOffset);
Offset grow = calculateOffset(seriesFirstRange, seriesLastRange);
templateDataRange.grow(grow.downOffset, grow.rightOffset);

data.getNumRef().setF(templateDataRange.toFormula());
break;
data.getNumRef().setF(templateDataRange.toFormula());
break;
}
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions core/modules/core/src/com/haulmont/yarg/formatters/impl/xls/Area.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package com.haulmont.yarg.formatters.impl.xls;

import org.apache.poi.ss.SpreadsheetVersion;
import org.apache.poi.ss.util.AreaReference;

public class Area {
Expand Down Expand Up @@ -74,7 +75,7 @@ public void setAlign(AreaAlign align) {
}

public AreaReference toAreaReference() {
return new AreaReference(topLeft.toCellReference(), bottomRight.toCellReference());
return new AreaReference(topLeft.toCellReference(), bottomRight.toCellReference(), SpreadsheetVersion.EXCEL97);
}

@Override
Expand All @@ -100,7 +101,7 @@ public int hashCode() {
return toString().hashCode();
}

public static enum AreaAlign {
public enum AreaAlign {
HORIZONTAL,
VERTICAL
}
Expand Down
Loading

0 comments on commit 5668eab

Please sign in to comment.