Skip to content

Update jar dependencies for 26.4 #7480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-tchad merged 2 commits into from
Mar 10, 2026
Merged

Update jar dependencies for 26.4 #7480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b29ae2
Update jar dependencies for 26.4
labkey-tchad Mar 7, 2026
7ddd343
Update JxlCellStyle for POI 5.5
labkey-tchad Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 53 additions & 18 deletions api/src/org/labkey/api/reader/jxl/JxlCellStyle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,18 @@
import jxl.format.Alignment;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.BorderStyle;
import org.apache.poi.ss.usermodel.CellPropertyType;
import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.Color;
import org.apache.poi.ss.usermodel.FillPatternType;
import org.apache.poi.ss.usermodel.Font;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.usermodel.VerticalAlignment;

import java.util.EnumMap;
import java.util.HashMap;
import java.util.Map;

/**
* User: klum
* Date: May 20, 2011
* Time: 1:45:20 PM
*/
public class JxlCellStyle implements CellStyle
{
private static final String DEFAULT_FORMAT = "General";
Expand Down Expand Up @@ -109,19 +106,14 @@ public boolean getLocked()
return _format != null && _format.isLocked();
}

private static final Map<Alignment, HorizontalAlignment> HORIZONTAL_ALIGNMENT_MAP = new HashMap<>();

static
{
HORIZONTAL_ALIGNMENT_MAP.put(Alignment.GENERAL, HorizontalAlignment.GENERAL);
HORIZONTAL_ALIGNMENT_MAP.put(Alignment.LEFT, HorizontalAlignment.LEFT);
HORIZONTAL_ALIGNMENT_MAP.put(Alignment.CENTRE, HorizontalAlignment.CENTER);
HORIZONTAL_ALIGNMENT_MAP.put(Alignment.RIGHT, HorizontalAlignment.RIGHT);
HORIZONTAL_ALIGNMENT_MAP.put(Alignment.FILL, HorizontalAlignment.FILL);
HORIZONTAL_ALIGNMENT_MAP.put(Alignment.JUSTIFY, HorizontalAlignment.JUSTIFY);

private static final Map<Alignment, HorizontalAlignment> HORIZONTAL_ALIGNMENT_MAP = Map.of(
Alignment.GENERAL, HorizontalAlignment.GENERAL,
Alignment.LEFT, HorizontalAlignment.LEFT,
Alignment.CENTRE, HorizontalAlignment.CENTER,
Alignment.RIGHT, HorizontalAlignment.RIGHT,
Alignment.FILL, HorizontalAlignment.FILL,
Alignment.JUSTIFY, HorizontalAlignment.JUSTIFY);
// Note: No JXL options for CENTER_SELECTION or DISTRIBUTED
}

@Override
public HorizontalAlignment getAlignment()
Expand Down Expand Up @@ -385,7 +377,7 @@ public boolean getQuotePrefixed()
@Override
public int getFontIndexAsInt()
{
throw new UnsupportedOperationException("method not yet supported");
return getFontIndex();
}

@Override
Expand All @@ -399,4 +391,47 @@ public void setFillForegroundColor(Color color)
{
throw new UnsupportedOperationException("method not yet supported");
}

/**
* A pared down version of {@link org.apache.poi.ss.util.CellUtil#getFormatProperties(org.apache.poi.ss.usermodel.CellStyle)}
* that only includes properties supported by this implementation.
*/
@Override
public EnumMap<CellPropertyType, Object> getFormatProperties()
{
EnumMap<CellPropertyType, Object> properties = new EnumMap<>(CellPropertyType.class);
properties.put(CellPropertyType.ALIGNMENT, getAlignment());
properties.put(CellPropertyType.VERTICAL_ALIGNMENT, getVerticalAlignment());
//properties.put(CellPropertyType.BORDER_BOTTOM, getBorderBottom());
//properties.put(CellPropertyType.BORDER_LEFT, getBorderLeft());
//properties.put(CellPropertyType.BORDER_RIGHT, getBorderRight());
//properties.put(CellPropertyType.BORDER_TOP, getBorderTop());
properties.put(CellPropertyType.BOTTOM_BORDER_COLOR, getBottomBorderColor());
properties.put(CellPropertyType.DATA_FORMAT, getDataFormat());
properties.put(CellPropertyType.FILL_PATTERN, getFillPattern());

//properties.put(CellPropertyType.FILL_FOREGROUND_COLOR, getFillForegroundColor());
//properties.put(CellPropertyType.FILL_BACKGROUND_COLOR, getFillBackgroundColor());
//properties.put(CellPropertyType.FILL_FOREGROUND_COLOR_COLOR, getFillForegroundColorColor());
//properties.put(CellPropertyType.FILL_BACKGROUND_COLOR_COLOR, getFillBackgroundColorColor());

properties.put(CellPropertyType.FONT, getFontIndex());
properties.put(CellPropertyType.HIDDEN, getHidden());
properties.put(CellPropertyType.INDENTION, getIndention());
properties.put(CellPropertyType.LEFT_BORDER_COLOR, getLeftBorderColor());
properties.put(CellPropertyType.LOCKED, getLocked());
properties.put(CellPropertyType.RIGHT_BORDER_COLOR, getRightBorderColor());
//properties.put(CellPropertyType.ROTATION, getRotation());
properties.put(CellPropertyType.TOP_BORDER_COLOR, getTopBorderColor());
properties.put(CellPropertyType.WRAP_TEXT, getWrapText());
//properties.put(CellPropertyType.SHRINK_TO_FIT, getShrinkToFit());
//properties.put(CellPropertyType.QUOTE_PREFIXED, getQuotePrefixed());
return properties;
}

@Override
public void invalidateCachedProperties()
{
// Properties can't change in this implementation, nothing to invalidate
}
}
4 changes: 2 additions & 2 deletions search/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ dependencies {
BuildUtils.addExternalDependency(
project,
new ExternalDependency(
"org.codelibs:jhighlight:1.1.0",
"org.codelibs:jhighlight:1.1.1",
"JHighlight",
"codelibs",
"https://github.com/codelibs/jhighlight",
Expand Down Expand Up @@ -406,7 +406,7 @@ dependencies {
BuildUtils.addExternalDependency(
project,
new ExternalDependency(
"com.googlecode.plist:dd-plist:1.28",
"com.googlecode.plist:dd-plist:1.29",
"DD Plist",
"com.dd.plist",
"https://github.com/3breadt/dd-plist",
Expand Down