Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[github-334] Add SHRINK_TO_FIT and QUOTE_PREFIXED to CellUtil. Thanks to funakawa718. This closes #334 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1901609 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2022-06-04 08:29:04 +00:00
parent 1981ad478e
commit d074e8b4eb
2 changed files with 130 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
poi/src/main/java/org/apache/poi/ss/util/CellUtil.java
View File

@ -64,6 +64,8 @@ public final class CellUtil {
public static final String ROTATION = "rotation";
public static final String VERTICAL_ALIGNMENT = "verticalAlignment";
public static final String WRAP_TEXT = "wrapText";
public static final String SHRINK_TO_FIT = "shrinkToFit";
public static final String QUOTE_PREFIXED = "quotePrefixed";
private static final Set<String> shortValues = Collections.unmodifiableSet(
new HashSet<>(Arrays.asList(
@ -85,7 +87,9 @@ public final class CellUtil {
new HashSet<>(Arrays.asList(
LOCKED,
HIDDEN,
WRAP_TEXT
WRAP_TEXT,
SHRINK_TO_FIT,
QUOTE_PREFIXED
)));
private static final Set<String> borderTypeValues = Collections.unmodifiableSet(
new HashSet<>(Arrays.asList(
@ -454,6 +458,8 @@ public final class CellUtil {
put(properties, ROTATION, style.getRotation());
put(properties, TOP_BORDER_COLOR, style.getTopBorderColor());
put(properties, WRAP_TEXT, style.getWrapText());
put(properties, SHRINK_TO_FIT, style.getShrinkToFit());
put(properties, QUOTE_PREFIXED, style.getQuotePrefixed());
return properties;
}
@ -516,6 +522,8 @@ public final class CellUtil {
style.setRotation(getShort(properties, ROTATION));
style.setTopBorderColor(getShort(properties, TOP_BORDER_COLOR));
style.setWrapText(getBoolean(properties, WRAP_TEXT));
style.setShrinkToFit(getBoolean(properties, SHRINK_TO_FIT));
style.setQuotePrefixed(getBoolean(properties, QUOTE_PREFIXED));
}
/**

121
poi/src/test/java/org/apache/poi/ss/util/BaseTestCellUtil.java
View File

@ -23,6 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertFalse;
import java.io.IOException;
import java.util.HashMap;
@ -104,6 +105,126 @@ public abstract class BaseTestCellUtil {
}
}
@Test()
void setCellStylePropertyWithShrinkToFit() throws IOException {
try (Workbook wb = _testDataProvider.createWorkbook()) {
Sheet s = wb.createSheet();
Row r = s.createRow(0);
Cell c = r.createCell(0);
// Assert that the default shrinkToFit is false
assertFalse(c.getCellStyle().getShrinkToFit());
// Set shrinkToFit to true
CellUtil.setCellStyleProperty(c, CellUtil.SHRINK_TO_FIT, true);
assertTrue(c.getCellStyle().getShrinkToFit());
}
}
@Test()
void setCellStylePropertyWithQuotePrefixed() throws IOException {
try (Workbook wb = _testDataProvider.createWorkbook()) {
Sheet s = wb.createSheet();
Row r = s.createRow(0);
Cell c = r.createCell(0);
// Assert that the default quotePrefixed is false
assertFalse(c.getCellStyle().getQuotePrefixed());
// Set quotePrefixed to true
CellUtil.setCellStyleProperty(c, CellUtil.QUOTE_PREFIXED, true);
assertFalse(c.getCellStyle().getShrinkToFit());
}
}
@Test()
void setCellStylePropertyWithExistingStyles() throws IOException {
try (Workbook wb = _testDataProvider.createWorkbook()) {
Sheet s = wb.createSheet();
Row r = s.createRow(0);
Cell c = r.createCell(0);
Font f = wb.createFont();
f.setBold(true);
// Assert that the default cell style is not the same as the one being changed
assertNotEquals(HorizontalAlignment.CENTER, c.getCellStyle().getAlignment());
assertNotEquals(BorderStyle.THIN, c.getCellStyle().getBorderBottom());
assertNotEquals(BorderStyle.THIN, c.getCellStyle().getBorderLeft());
assertNotEquals(BorderStyle.THIN, c.getCellStyle().getBorderRight());
assertNotEquals(BorderStyle.THIN, c.getCellStyle().getBorderTop());
assertNotEquals(IndexedColors.RED.index, c.getCellStyle().getBottomBorderColor());
assertNotEquals(IndexedColors.RED.index, c.getCellStyle().getLeftBorderColor());
assertNotEquals(IndexedColors.RED.index, c.getCellStyle().getRightBorderColor());
assertNotEquals(IndexedColors.RED.index, c.getCellStyle().getTopBorderColor());
assertNotEquals(wb.createDataFormat().getFormat("#,##0"), c.getCellStyle().getDataFormat());
assertNotEquals(IndexedColors.BLUE.index, c.getCellStyle().getFillForegroundColor());
assertNotEquals(IndexedColors.BLUE.index, c.getCellStyle().getFillBackgroundColor());
assertNotEquals(FillPatternType.DIAMONDS, c.getCellStyle().getFillPattern());
assertNotEquals(f.getIndex(), c.getCellStyle().getFontIndex());
assertFalse(c.getCellStyle().getHidden());
assertNotEquals((short) 3, c.getCellStyle().getIndention());
assertTrue(c.getCellStyle().getLocked());
assertNotEquals((short) 45, c.getCellStyle().getRotation());
assertNotEquals(VerticalAlignment.CENTER, c.getCellStyle().getVerticalAlignment());
assertFalse(c.getCellStyle().getWrapText());
assertFalse(c.getCellStyle().getShrinkToFit());
assertFalse(c.getCellStyle().getQuotePrefixed());
// Set all styles
CellStyle cs = wb.createCellStyle();
cs.setAlignment(HorizontalAlignment.CENTER);
cs.setBorderBottom(BorderStyle.THIN);
cs.setBorderLeft(BorderStyle.THIN);
cs.setBorderRight(BorderStyle.THIN);
cs.setBorderTop(BorderStyle.THIN);
cs.setBottomBorderColor(IndexedColors.RED.index);
cs.setLeftBorderColor(IndexedColors.RED.index);
cs.setRightBorderColor(IndexedColors.RED.index);
cs.setTopBorderColor(IndexedColors.RED.index);
cs.setDataFormat(wb.createDataFormat().getFormat("#,##0"));
cs.setFillForegroundColor(IndexedColors.BLUE.index);
cs.setFillBackgroundColor(IndexedColors.BLUE.index);
cs.setFillPattern(FillPatternType.DIAMONDS);
cs.setFont(f);
cs.setHidden(true);
cs.setIndention((short) 3);
cs.setLocked(false);
cs.setRotation((short) 45);
cs.setVerticalAlignment(VerticalAlignment.CENTER);
cs.setWrapText(true);
cs.setShrinkToFit(true);
cs.setQuotePrefixed(true);
c.setCellStyle(cs);
// Set BorderBottom from THIN to DOUBLE with setCellStyleProperty()
CellUtil.setCellStyleProperty(c, CellUtil.BORDER_BOTTOM, BorderStyle.DOUBLE);
// Assert that only BorderBottom has been changed and no others.
assertEquals(BorderStyle.DOUBLE, c.getCellStyle().getBorderBottom());
assertEquals(HorizontalAlignment.CENTER, c.getCellStyle().getAlignment());
assertEquals(BorderStyle.THIN, c.getCellStyle().getBorderLeft());
assertEquals(BorderStyle.THIN, c.getCellStyle().getBorderRight());
assertEquals(BorderStyle.THIN, c.getCellStyle().getBorderTop());
assertEquals(IndexedColors.RED.index, c.getCellStyle().getBottomBorderColor());
assertEquals(IndexedColors.RED.index, c.getCellStyle().getLeftBorderColor());
assertEquals(IndexedColors.RED.index, c.getCellStyle().getRightBorderColor());
assertEquals(IndexedColors.RED.index, c.getCellStyle().getTopBorderColor());
assertEquals(wb.createDataFormat().getFormat("#,##0"), c.getCellStyle().getDataFormat());
assertEquals(IndexedColors.BLUE.index, c.getCellStyle().getFillForegroundColor());
assertEquals(IndexedColors.BLUE.index, c.getCellStyle().getFillBackgroundColor());
assertEquals(FillPatternType.DIAMONDS, c.getCellStyle().getFillPattern());
assertEquals(f.getIndex(), c.getCellStyle().getFontIndex());
assertTrue(c.getCellStyle().getHidden());
assertEquals((short) 3, c.getCellStyle().getIndention());
assertFalse(c.getCellStyle().getLocked());
assertEquals((short) 45, c.getCellStyle().getRotation());
assertEquals(VerticalAlignment.CENTER, c.getCellStyle().getVerticalAlignment());
assertTrue(c.getCellStyle().getWrapText());
assertTrue(c.getCellStyle().getShrinkToFit());
assertTrue(c.getCellStyle().getQuotePrefixed());
}
}
@Test
void setCellStyleProperties() throws IOException {
try (Workbook wb = _testDataProvider.createWorkbook()) {