Skip to content

Streamline ua.tests.doc bundle code #1683

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
akurtakov merged 1 commit into from
Jan 14, 2025
Merged

Streamline ua.tests.doc bundle code #1683

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
5 changes: 2 additions & 3 deletions ...g.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/CheckLinkAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2009, 2016 IBM Corporation and others.
* Copyright (c) 2009, 2025 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -64,10 +64,9 @@
System.out.println("Checked " + count + " links");
}
//System.out.println("Process " + next);
URL url;
boolean opened;
try {
url = new URL(next);
URL url = new URL(next);

Check warning on line 69 in ua/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/CheckLinkAction.java

View check run for this annotation

Jenkins - Eclipse Platform / Compiler and API Tools

Deprecation 

NORMAL:
The constructor URL(String) is deprecated since version 20
//URLConnection connection = url.openConnection();
//connection.
try (InputStream input = url.openStream()) {
Expand Down
17 changes: 7 additions & 10 deletions ...rg.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/CheckTocAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2009, 2016 IBM Corporation and others.
* Copyright (c) 2009, 2025 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand All @@ -14,7 +14,6 @@

package org.eclipse.ua.tests.doc.internal.actions;

import java.util.ArrayList;
import java.util.List;

import org.eclipse.core.runtime.ILog;
Expand All @@ -30,14 +29,12 @@

public class CheckTocAction implements IWorkbenchWindowActionDelegate {
private IWorkbenchWindow window;
public static List<BrokenLink> errors = new ArrayList<>();

public static void showErrors() {
private static void showErrors(List<BrokenLink> errors) {
if (errors.isEmpty()) {
reportStatus("No errors detected in load");
}
for (int i = 0; i < errors.size(); i++) {
BrokenLink link = errors.get(i);
for (BrokenLink link : errors) {
reportStatus("Invalid link in \"" + link.getTocID() + "\": " + link.getHref());
}
}
Expand Down Expand Up @@ -66,22 +63,22 @@ public void run(IAction action) {
if (dlg.getReturnCode() == Window.CANCEL) {
return;
}
Toc[] tocsToCheck = dlg.getTocsToCheck();
List<Toc> tocsToCheck = dlg.getTocsToCheck();
checkTocFilesExist(tocsToCheck);

}

public void checkTocFilesExist(Toc[] tocsToCheck) {
public void checkTocFilesExist(List<Toc> tocsToCheck) {
for (Toc toc : tocsToCheck) {
String id = toc.getTocContribution().getId();
reportStatus("Testing " + id);
String[] href = { id };
try {
errors = TocValidator.validate(href);
List<BrokenLink> errors = TocValidator.validate(href);
showErrors(errors);
} catch (Exception e) {
e.printStackTrace();
}
showErrors();
}
}

Expand Down
9 changes: 4 additions & 5 deletions ua/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/LoadTocAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2009, 2016 IBM Corporation and others.
* Copyright (c) 2009, 2025 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -84,8 +84,7 @@ public static void showErrors() {
} else {
reportStatus("Testing complete, errors found");
}
for (Iterator<String> iter = errors.iterator(); iter.hasNext();) {
String errorMessage = iter.next();
for (String errorMessage : errors) {
reportStatus(errorMessage);
}
errors = null;
Expand Down Expand Up @@ -170,11 +169,11 @@ public void run(IAction action) {
return;
}
int testKind = dlg.getTestKind();
PrioritizedFilter[] filters = new PrioritizedFilter[] {
PrioritizedFilter[] filters = {
new PrioritizedFilter(new OnLoadFilter(testKind), 1),
new PrioritizedFilter(new AddScriptFilter(), 2)};
ExtraFilters.setFilters(filters);
Toc[] tocsToCheck = dlg.getTocsToCheck();
List<Toc> tocsToCheck = dlg.getTocsToCheck();
if (testKind == SelectTocDialog.PAGES_EXIST) {
new CheckTocAction().checkTocFilesExist(tocsToCheck);
return;
Expand Down
7 changes: 3 additions & 4 deletions ...g.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/dialogs/SelectTocDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,12 @@ protected void okPressed() {
super.okPressed();
}

public Toc[] getTocsToCheck() {
ArrayList<Toc> selected = new ArrayList<>();
public java.util.List<Toc> getTocsToCheck() {
java.util.List<Toc> selected = new ArrayList<>();
for (int selectedToc : selectedTocs) {
selected.add(tocs[selectedToc]);
}
Toc[] tocsToCheck = selected.toArray(new Toc[0]) ;
return tocsToCheck;
return selected;
}

public int getTestKind() {
Expand Down
Loading