Skip to content
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

Fix typos in variable and protected method names #177

Merged
merged 1 commit into from
Dec 16, 2024
Merged

Fix typos in variable and protected method names #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions src/main/java/org/spdx/tools/compare/PackageSheet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@ public void importCompareResults(SpdxComparer comparer, List<String> docNames) t
headerCell.setCellValue(docNames.get(i));
}

SpdxPackageComparer[] packagComparers = comparer.getPackageComparers();
Arrays.sort(packagComparers, new Comparator<SpdxPackageComparer>() {
SpdxPackageComparer[] packageComparers = comparer.getPackageComparers();
Arrays.sort(packageComparers, new Comparator<SpdxPackageComparer>() {

@Override
public int compare(SpdxPackageComparer o1, SpdxPackageComparer o2) {
Expand All @@ -167,8 +167,8 @@ public int compare(SpdxPackageComparer o1, SpdxPackageComparer o2) {
}

});
for (int i = 0; i < packagComparers.length; i++) {
addPackageToSheet(packagComparers[i], comparer.getSpdxDocuments());
for (int i = 0; i < packageComparers.length; i++) {
addPackageToSheet(packageComparers[i], comparer.getSpdxDocuments());
}
}

Expand Down Expand Up @@ -384,7 +384,7 @@ private void addPackageToSheet(SpdxPackageComparer comparer,
Optional<SpdxPackageVerificationCode> verificationCode = pkg.getPackageVerificationCode();
if (verificationCode.isPresent()) {
verificationRow.createCell(FIRST_DOC_COL+i).setCellValue(verificationCode.get().getValue());
verificationExcludedRow.createCell(FIRST_DOC_COL+i).setCellValue(exludeFilesToString(verificationCode.get().getExcludedFileNames()));
verificationExcludedRow.createCell(FIRST_DOC_COL+i).setCellValue(excludeFilesToString(verificationCode.get().getExcludedFileNames()));
} else {
verificationRow.createCell(FIRST_DOC_COL+i).setCellValue(NO_VALUE);
verificationExcludedRow.createCell(FIRST_DOC_COL+i).setCellValue(NO_VALUE);
Expand Down Expand Up @@ -464,7 +464,7 @@ private void addPackageToSheet(SpdxPackageComparer comparer,
* @param excludedFiles
* @return
*/
protected String exludeFilesToString(Collection<String> excludedFiles) {
protected String excludeFilesToString(Collection<String> excludedFiles) {
if (excludedFiles == null || excludedFiles.size() == 0) {
return "";
}
Expand Down
12 changes: 6 additions & 6 deletions testResources/sourcefiles/PackageSheet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@ public void importCompareResults(SpdxComparer comparer, List<String> docNames) t
headerCell.setCellValue(docNames.get(i));
}

SpdxPackageComparer[] packagComparers = comparer.getPackageComparers();
Arrays.sort(packagComparers, new Comparator<SpdxPackageComparer>() {
SpdxPackageComparer[] packageComparers = comparer.getPackageComparers();
Arrays.sort(packageComparers, new Comparator<SpdxPackageComparer>() {

@Override
public int compare(SpdxPackageComparer o1, SpdxPackageComparer o2) {
Expand All @@ -167,8 +167,8 @@ public int compare(SpdxPackageComparer o1, SpdxPackageComparer o2) {
}

});
for (int i = 0; i < packagComparers.length; i++) {
addPackageToSheet(packagComparers[i], comparer.getSpdxDocuments());
for (int i = 0; i < packageComparers.length; i++) {
addPackageToSheet(packageComparers[i], comparer.getSpdxDocuments());
}
}

Expand Down Expand Up @@ -378,7 +378,7 @@ private void addPackageToSheet(SpdxPackageComparer comparer,
Optional<SpdxPackageVerificationCode> verificationCode = pkg.getPackageVerificationCode();
if (verificationCode.isPresent()) {
verificationRow.createCell(FIRST_DOC_COL+i).setCellValue(pkg.getPackageVerificationCode().get().getValue());
verificationExcludedRow.createCell(FIRST_DOC_COL+i).setCellValue(exludeFilesToString(pkg.getPackageVerificationCode().get().getExcludedFileNames()));
verificationExcludedRow.createCell(FIRST_DOC_COL+i).setCellValue(excludeFilesToString(pkg.getPackageVerificationCode().get().getExcludedFileNames()));
} else {
verificationRow.createCell(FIRST_DOC_COL+i).setCellValue(NO_VALUE);
verificationExcludedRow.createCell(FIRST_DOC_COL+i).setCellValue(NO_VALUE);
Expand Down Expand Up @@ -448,7 +448,7 @@ private void addPackageToSheet(SpdxPackageComparer comparer,
* @param excludedFiles
* @return
*/
protected String exludeFilesToString(Collection<String> excludedFiles) {
protected String excludeFilesToString(Collection<String> excludedFiles) {
if (excludedFiles == null || excludedFiles.size() == 0) {
return "";
}
Expand Down
Loading