fix!: use the same cell reference constructor in order to ensure consistency #4634
+239
−71
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
There was a problem hiding this comment. Would it make sense to make The @Override
public boolean contains(Object object) {
if (this.isEmpty()) {
return false;
}
if (object instanceof CellReference cellReference) {
if (cellReference.getSheetName() == null) {
CellReference cellWithSheetName = new CellReference(
this.iterator().next().getSheetName(),
cellReference.getRow(), cellReference.getCol(),
cellReference.isRowAbsolute(),
cellReference.isColAbsolute());
return super.contains(cellWithSheetName);
}
}
return super.contains(object); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| /** | ||
| * Copyright 2000-2023 Vaadin Ltd. | ||
| * | ||
| * This program is available under Vaadin Commercial License and Service Terms. | ||
| * | ||
| * See {@literal <https://vaadin.com/commercial-license-and-service-terms>} for the full | ||
| * license. | ||
| */ | ||
| package com.vaadin.flow.component.spreadsheet; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.Objects; | ||
| import java.util.Set; | ||
|
|
||
| import org.apache.poi.ss.util.CellReference; | ||
|
|
||
| /** | ||
| * CellSet is a set of cells that also provides utilities regarding the contents | ||
| * of the set. | ||
| */ | ||
| public class CellSet { | ||
|
|
||
| private final Set<CellReference> cells; | ||
|
|
||
| /** | ||
| * Creates a set with the specified cells | ||
| * | ||
| * @param cells | ||
| * cells to construct the set with, not {@code null} | ||
| */ | ||
| public CellSet(Set<CellReference> cells) { | ||
| Objects.requireNonNull(cells, "Cells cannot be null"); | ||
| this.cells = cells; | ||
| } | ||
|
|
||
| /** | ||
| * Gets an unmodifiable set of the cells | ||
| * | ||
| * @return an unmodifiable set of the cells | ||
| */ | ||
| public Set<CellReference> getCells() { | ||
| return Collections.unmodifiableSet(cells); | ||
| } | ||
|
|
||
| /** | ||
| * Gets the number of the cells | ||
| * | ||
| * @return number of cells | ||
| */ | ||
| public int size() { | ||
| return cells.size(); | ||
| } | ||
|
|
||
| /** | ||
| * Whether the set contains the specified cell. Does not take the sheet | ||
| * names of the cells in set into account if the sheet name of the cell | ||
| * reference is {@code null}. | ||
| * | ||
| * @param cellReference | ||
| * cell to be checked whether it exists in the set | ||
| * @return {@code true} if set contains the specified cell, {@code false} | ||
| * otherwise | ||
| */ | ||
| public boolean contains(CellReference cellReference) { | ||
| if (cells.isEmpty()) { | ||
| return false; | ||
| } | ||
| if (cellReference.getSheetName() == null) { | ||
| CellReference cellWithSheetName = new CellReference( | ||
| cells.iterator().next().getSheetName(), | ||
| cellReference.getRow(), cellReference.getCol(), | ||
| cellReference.isRowAbsolute(), | ||
| cellReference.isColAbsolute()); | ||
| return cells.contains(cellWithSheetName); | ||
| } | ||
| return cells.contains(cellReference); | ||
| } | ||
|
|
||
| /** | ||
| * Whether the set contains the specified cell. Does not take the sheet | ||
| * names of the cells in set into account. | ||
| * | ||
| * @param row | ||
| * row index of the cell, 0-based | ||
| * @param col | ||
| * col index of the cell, 0-based | ||
| * @return {@code true} if set contains the specified cell, {@code false} | ||
| * otherwise | ||
| */ | ||
| public boolean contains(int row, int col) { | ||
| return contains(new CellReference(row, col)); | ||
| } | ||
|
|
||
| /** | ||
| * Whether the set contains the specified cell | ||
| * | ||
| * @param row | ||
| * row index of the cell, 0-based | ||
| * @param col | ||
| * col index of the cell, 0-based | ||
| * @param sheetName | ||
| * sheet name of the cell, not {@code null} | ||
| * @return {@code true} if set contains the specified cell, {@code false} | ||
| * otherwise | ||
| */ | ||
| public boolean contains(int row, int col, String sheetName) { | ||
| Objects.requireNonNull(sheetName, "The sheet name cannot be null"); | ||
| return contains(new CellReference(sheetName, row, col, false, false)); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NULL_DEREFERENCE: object
selectedCellReferencelast assigned on line 398 could be null and is dereferenced by call toisCellInRange(...)at line 401.ℹ️ Learn about @sonatype-lift commands
You can reply with the following commands. For example, reply with @sonatype-lift ignoreall to leave out all findings.
@sonatype-lift ignore@sonatype-lift ignoreall@sonatype-lift exclude <file|issue|path|tool>file|issue|path|toolfrom Lift findings by updating your config.toml fileNote: When talking to LiftBot, you need to refresh the page to see its response.
Click here to add LiftBot to another repo.
Was this a good recommendation?
[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]