Bug 460924 - Remove Whitespace issues in org.eclipse.ua.tests.doc
Change-Id: I620f18ec9a34d9af650cfa9ce1375585228fa6ec
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
diff --git a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/Activator.java b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/Activator.java
index eeba7fd..c322252 100644
--- a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/Activator.java
+++ b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/Activator.java
@@ -24,7 +24,7 @@
// The shared instance
private static Activator plugin;
-
+
/**
* The constructor
*/
diff --git a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/LinkCheckServlet.java b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/LinkCheckServlet.java
index 4dd0d3e..37ee3eb 100644
--- a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/LinkCheckServlet.java
+++ b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/LinkCheckServlet.java
@@ -19,7 +19,7 @@
import javax.servlet.http.HttpServletResponse;
public class LinkCheckServlet extends HttpServlet {
-
+
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
@@ -33,5 +33,5 @@
private static final long serialVersionUID = 6412817998904081026L;
-
+
}
diff --git a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/CheckLinkAction.java b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/CheckLinkAction.java
index 9e5b654..c23545b 100644
--- a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/CheckLinkAction.java
+++ b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/CheckLinkAction.java
@@ -23,7 +23,7 @@
import org.eclipse.help.internal.base.HelpBasePlugin;
public class CheckLinkAction implements ILiveHelpAction {
-
+
private static final String HELP_TOPIC = "/help/topic";
private static Map<String, String> links = new HashMap<String, String>();
private String link;
@@ -80,7 +80,7 @@
}
if (!opened) {
String containingPage = links.get(next);
- System.out.println("Cannot open link from " + trimPath(containingPage)
+ System.out.println("Cannot open link from " + trimPath(containingPage)
+ " to " + trimPath(next));
}
}
@@ -89,7 +89,7 @@
links = new HashMap<String, String>();
System.out.println("End check links");
}
-
+
private String trimPath(String next) {
String result = next;
int htIndex = result.indexOf(HELP_TOPIC);
diff --git a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/CheckTocAction.java b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/CheckTocAction.java
index 8d4fbd9..c6dc834 100644
--- a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/CheckTocAction.java
+++ b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/CheckTocAction.java
@@ -27,7 +27,7 @@
public class CheckTocAction implements IWorkbenchWindowActionDelegate {
private IWorkbenchWindow window;
public static List<BrokenLink> errors = new ArrayList<BrokenLink>();
-
+
public static void showErrors() {
if (errors.size() == 0) {
reportStatus("No errors detected in load");
@@ -41,8 +41,8 @@
private static void reportStatus(String errorMessage) {
HelpPlugin.logWarning(errorMessage);
}
-
-
+
+
/**
* The constructor.
*/
@@ -76,7 +76,7 @@
errors = TocValidator.validate(href);
} catch (Exception e) {
e.printStackTrace();
- }
+ }
showErrors();
}
}
@@ -84,9 +84,9 @@
/**
- * Selection in the workbench has been changed. We
+ * Selection in the workbench has been changed. We
* can change the state of the 'real' action here
- * if we want, but this can only happen after
+ * if we want, but this can only happen after
* the delegate has been created.
* @see IWorkbenchWindowActionDelegate#selectionChanged
*/
diff --git a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/LoadTocAction.java b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/LoadTocAction.java
index 8375718..af3e0fe 100644
--- a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/LoadTocAction.java
+++ b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/LoadTocAction.java
@@ -33,7 +33,7 @@
* Our sample action implements workbench action delegate.
* The action proxy will be created by the workbench and
* shown in the UI. When the user tries to use the action,
- * this delegate will be created and execution will be
+ * this delegate will be created and execution will be
* delegated to it.
* @see IWorkbenchWindowActionDelegate
*/
@@ -44,7 +44,7 @@
public static List<String> errors = new ArrayList<String>();
public static String lastPage;
public static String currentPage;
-
+
private class MonitorThread extends Thread {
String lastHref;
int timesSame = 0;
@@ -73,7 +73,7 @@
}
}
}
-
+
public static void showErrors() {
if (errors == null) return;
if (errors.size() == 0) {
@@ -85,7 +85,7 @@
String errorMessage = iter.next();
reportStatus(errorMessage);
}
- errors = null;
+ errors = null;
topicList = null;
}
@@ -93,24 +93,24 @@
//HelpPlugin.logWarning(errorMessage);
System.out.println(errorMessage);
}
-
+
private class NotFoundCallout implements EclipseConnector.INotFoundCallout {
@Override
public void notFound(String url) {
if (errors != null) {
- errors.add("Error opening " + lastPage + "\n cannot load " + url);
+ errors.add("Error opening " + lastPage + "\n cannot load " + url);
}
- }
+ }
}
-
+
private class LinkProvider implements Iterator<String> {
private List<String> links;
int lastLink = -1;
-
+
public LinkProvider(List<String> links) {
this.links = links;
}
-
+
@Override
public boolean hasNext() {
if (topicList != null && lastLink < links.size() && links.size() > 0) {
@@ -120,7 +120,7 @@
showErrors();
return false;
}
-
+
@Override
public String next() {
if (lastLink >= 0 && lastLink < links.size()) {
@@ -131,21 +131,21 @@
if (lastLink < links.size()) {
currentPage = links.get(lastLink);
//System.out.println("Current page is " + currentPage);
- return currentPage;
+ return currentPage;
} else if (lastLink == links.size()) {
currentPage = links.get(lastLink - 1);
//System.out.println("Current page is " + currentPage);
- return currentPage;
+ return currentPage;
}
return null;
}
-
+
@Override
public void remove() {
- }
-
+ }
+
}
-
+
/**
* The constructor.
*/
@@ -176,7 +176,7 @@
new CheckTocAction().checkTocFilesExist(tocsToCheck);
return;
}
-
+
firstHref = null;
topicList = new ArrayList<String>();
for (Toc toc : tocsToCheck) {
@@ -209,12 +209,12 @@
if (href != null && !isFiltered(href)) {
if (firstHref == null) {
firstHref = href;
- }
+ }
topicList.add(href);
}
addTopics(nextTopic.getSubtopics());
}
-
+
private boolean isFiltered(String href) {
if (!href.startsWith("/")) return true;
//if (href.startsWith("/org.eclipse.pde.doc.user/reference")) return true;
@@ -225,9 +225,9 @@
}
/**
- * Selection in the workbench has been changed. We
+ * Selection in the workbench has been changed. We
* can change the state of the 'real' action here
- * if we want, but this can only happen after
+ * if we want, but this can only happen after
* the delegate has been created.
* @see IWorkbenchWindowActionDelegate#selectionChanged
*/
diff --git a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/VisitPageAction.java b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/VisitPageAction.java
index 6fe8c0b..1954e6c 100644
--- a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/VisitPageAction.java
+++ b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/VisitPageAction.java
@@ -14,9 +14,9 @@
import org.eclipse.help.ILiveHelpAction;
public class VisitPageAction implements ILiveHelpAction {
-
+
public static String lastPageVisited = "NO_PAGES_VISITED";
-
+
@Override
public void setInitializationString(String data) {
lastPageVisited = data;
diff --git a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/dialogs/SelectTocDialog.java b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/dialogs/SelectTocDialog.java
index 6b8eb5c..605bcf1 100644
--- a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/dialogs/SelectTocDialog.java
+++ b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/dialogs/SelectTocDialog.java
@@ -28,7 +28,7 @@
import org.eclipse.swt.widgets.Shell;
public class SelectTocDialog extends Dialog {
-
+
private int[] selectedTocs = {};
private List tocList;
private Toc[] tocs;
@@ -45,13 +45,13 @@
tocs = HelpPlugin.getTocManager().getTocs(locale);
setShellStyle(getShellStyle() | SWT.RESIZE);
}
-
+
@Override
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
newShell.setText("Check Table of Contents");
}
-
+
@Override
protected Control createDialogArea(Composite parent) {
Composite inner = new Composite(parent, SWT.NULL);
@@ -77,7 +77,7 @@
existButton.setSelection(true);
return inner;
}
-
+
@Override
protected void okPressed() {
selectedTocs = tocList.getSelectionIndices();
@@ -92,16 +92,16 @@
}
super.okPressed();
}
-
+
public Toc[] getTocsToCheck() {
ArrayList<Toc> selected = new ArrayList<Toc>();
for (int selectedToc : selectedTocs) {
selected.add(tocs[selectedToc]);
}
Toc[] tocsToCheck = selected.toArray(new Toc[0]) ;
- return tocsToCheck;
+ return tocsToCheck;
}
-
+
public int getTestKind() {
return buttonState;
}
diff --git a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/AddScriptFilter.java b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/AddScriptFilter.java
index b755401..87c2119 100644
--- a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/AddScriptFilter.java
+++ b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/AddScriptFilter.java
@@ -31,7 +31,7 @@
@Override
public OutputStream filter(HttpServletRequest req, OutputStream out) {
String relativePath = FilterUtils.getRelativePathPrefix(req);
- StringBuffer script = new StringBuffer();
+ StringBuffer script = new StringBuffer();
script.append("\n<script type=\"text/javascript\" src=\"");
script.append(relativePath);
script.append("content/org.eclipse.ua.tests.doc/checkdoc.js\"> </script>"); //$NON-NLS-1$
diff --git a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/OnLoadFilter.java b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/OnLoadFilter.java
index 1bada0a..33a94ee 100644
--- a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/OnLoadFilter.java
+++ b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/OnLoadFilter.java
@@ -22,17 +22,17 @@
import org.eclipse.ua.tests.doc.internal.dialogs.SelectTocDialog;
public class OnLoadFilter implements IFilter {
-
+
private static long uniqueId = 0;
-
+
private class OutFilter extends OutputStream {
-
+
private OutputStream out;
-
+
private int state = 0;
private String pathPrefix;
-
+
public void updateState(int b) throws IOException {
if (state == 0 && b == '<') {
state = 1;
@@ -46,7 +46,7 @@
state = 20;
out.write(b);
if (linkProvider.hasNext()) {
- String location = linkProvider.next();
+ String location = linkProvider.next();
String onload = getOnloadText(pathPrefix + location, testKind);
out.write(onload.getBytes());
//System.out.println("Onload = " + onload);
@@ -96,7 +96,7 @@
onload += '"';
return onload;
}
-
+
private String getCompletionText(int testKind) {
if (testKind == SelectTocDialog.FOLLOW_LINKS) {
return " onload = \"ua_test_doc_check_links();\" ";
@@ -114,28 +114,28 @@
public void write(int b) throws IOException {
updateState(b);
if (state != 20) {
- out.write(b);
+ out.write(b);
}
}
-
+
@Override
public void close() throws IOException {
out.close();
super.close();
- }
+ }
}
private int testKind;
-
+
public OnLoadFilter(int testKind) {
this.testKind = testKind;
}
-
+
private static Iterator<String> linkProvider;
-
+
protected String getCommentText() {
return "comment";
- }
+ }
@Override
public OutputStream filter(HttpServletRequest req, OutputStream out) {
@@ -151,6 +151,6 @@
public static void setLinkProvider(Iterator<String> provider) {
linkProvider = provider;
- }
+ }
}
diff --git a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/PrebuiltIndexChecker.java b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/PrebuiltIndexChecker.java
index 616d345..55cce52 100644
--- a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/PrebuiltIndexChecker.java
+++ b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/PrebuiltIndexChecker.java
@@ -34,33 +34,33 @@
*******************************************************************************/
public class PrebuiltIndexChecker extends TestCase {
-
+
private static final String PLATFORM_USER = "org.eclipse.platform.doc.user";
private static final String PLATFORM_ISV = "org.eclipse.platform.doc.isv";
private static final String PDE_USER = "org.eclipse.pde.doc.user";
private static final String JDT_USER = "org.eclipse.jdt.doc.user";
private static final String JDT_ISV = "org.eclipse.jdt.doc.isv";
-
+
public static Test suite() {
return new TestSuite(PrebuiltIndexChecker.class);
}
-
+
public void testPlatformUserIndex() throws Exception {
validateIndex(PLATFORM_USER, "index");
}
-
+
public void testPlatformIsvIndex() throws Exception {
validateIndex(PLATFORM_ISV, "index");
}
-
+
public void testPdeUserIndex() throws Exception {
validateIndex(PDE_USER, "index");
}
-
+
public void testJdtUserIndex() throws Exception {
validateIndex(JDT_USER, "index");
}
-
+
public void testJdtIsvIndex() throws Exception {
validateIndex(JDT_ISV, "index");
}
@@ -68,7 +68,7 @@
private void validateIndex(String plugin, String filepath) {
Bundle bundle = Platform.getBundle(plugin);
assertNotNull(bundle);
-
+
String[] suffixes = { "", "/indexed_contributions", "/indexed_docs", "/indexed_dependencies" };
for (String suffixe : suffixes) {
String fullPath = filepath + suffixe;
diff --git a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/TocLinkChecker.java b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/TocLinkChecker.java
index 08d6e4e..913bffd 100644
--- a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/TocLinkChecker.java
+++ b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/TocLinkChecker.java
@@ -22,42 +22,42 @@
import org.eclipse.help.internal.validation.TocValidator.BrokenLink;
/**
- * Contains tests for the documentation bundles that
+ * Contains tests for the documentation bundles that
* are included with the Eclipse SDK. This tests that the
* table of contents can be parsed and that the file
* corresponding to each href actually exists.
- * It does not check for broken links within the files or
+ * It does not check for broken links within the files or
* references to missing images, css files etc.
- *
- * Note that some API documents are generated as part of the
+ *
+ * Note that some API documents are generated as part of the
* Eclipse build process. Tests for these documents contain
* "Generated" in their name and are not expected to pass
* if that project is checked out in your workspace.
*/
public class TocLinkChecker extends TestCase {
-
+
private final class ReferenceFilter extends TocValidator.Filter {
@Override
public boolean isIncluded(String href) {
return href.startsWith("reference");
}
}
-
+
private final class NonReferenceFilter extends TocValidator.Filter {
@Override
public boolean isIncluded(String href) {
return !href.startsWith("reference");
}
}
-
+
private final class NonReferenceNonSampleFilter extends TocValidator.Filter {
@Override
public boolean isIncluded(String href) {
return !href.startsWith("reference") && !href.startsWith("samples");
}
}
-
+
private final class ReferenceOrSampleFilter extends TocValidator.Filter {
@Override
public boolean isIncluded(String href) {
@@ -70,11 +70,11 @@
private static final String[] PDE_USER = {"/org.eclipse.pde.doc.user/toc.xml"};
private static final String[] JDT_USER = {"/org.eclipse.jdt.doc.user/toc.xml"};
private static final String[] JDT_ISV = {"/org.eclipse.jdt.doc.isv/toc.xml"};
-
+
public static Test suite() {
return new TestSuite(TocLinkChecker.class);
}
-
+
public void testPlatformUser() throws Exception {
ArrayList<BrokenLink> failures = TocValidator.validate(PLATFORM_USER);
doAssert(failures);
@@ -84,7 +84,7 @@
ArrayList<BrokenLink> failures = TocValidator.filteredValidate(PLATFORM_ISV, new NonReferenceNonSampleFilter());
doAssert(failures);
}
-
+
public void testPlatformIsvGenerated() throws Exception {
ArrayList<BrokenLink> failures = TocValidator.filteredValidate(PLATFORM_ISV, new ReferenceOrSampleFilter());
doAssert(failures);
@@ -94,27 +94,27 @@
ArrayList<BrokenLink> failures = TocValidator.filteredValidate(PDE_USER, new NonReferenceFilter());
doAssert(failures);
}
-
+
public void testPdeUserGenerated() throws Exception {
ArrayList<BrokenLink> failures = TocValidator.filteredValidate(PDE_USER, new ReferenceFilter());
doAssert(failures);
}
-
+
public void testJdtUser() throws Exception {
ArrayList<BrokenLink> failures = TocValidator.validate(JDT_USER);
doAssert(failures);
}
-
+
public void testJdtIsvStatic() throws Exception {
ArrayList<BrokenLink> failures = TocValidator.filteredValidate(JDT_ISV, new NonReferenceFilter());
doAssert(failures);
}
-
+
public void testJdtIsvGenerated() throws Exception {
ArrayList<BrokenLink> failures = TocValidator.filteredValidate(JDT_ISV, new ReferenceFilter());
doAssert(failures);
}
-
+
private void doAssert(List<BrokenLink> failures) {
StringBuffer message = new StringBuffer();
for (int i = 0; i < failures.size(); i++) {
