Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2016-02-08 10:26:06 +0000
committerAlexander Kurtakov2016-02-08 10:26:06 +0000
commitd7c3b1ff552cefcdf128d6ea84df29b6a4770354 (patch)
tree0c5742e7382182810214e74085a2c8b245b6b19b /org.eclipse.ua.tests/help
parent24ee16ef8c752d8d2b6b8425d663dd0fbfb8b35d (diff)
downloadeclipse.platform.ua-d7c3b1ff552cefcdf128d6ea84df29b6a4770354.tar.gz
eclipse.platform.ua-d7c3b1ff552cefcdf128d6ea84df29b6a4770354.tar.xz
eclipse.platform.ua-d7c3b1ff552cefcdf128d6ea84df29b6a4770354.zip
Bug 485922 - Remove trailing white spaces in org.eclipse.ua.testsI20160209-0800
Mass remove in all java files. Change-Id: I51b8600fb0e80bb12f326c882e48328900a721d7 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'org.eclipse.ua.tests/help')
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/AllHelpPerformanceTests.java4
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/criteria/SampleCriteriaDefinitionProvider.java2
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/criteria/SampleCriteriaProvider.java2
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/AllOtherHelpTests.java2
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserContext.java8
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriteria.java2
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriteriaDefinition.java4
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriteriaDefinitionContribution.java2
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriterionDefinition.java6
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriterionValueDefinition.java4
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserIndex.java6
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserIndexEntry.java12
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserIndexSee.java6
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserIndexSubpath.java6
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserToc.java6
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserToc2.java2
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserTopic.java6
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserTopic2.java6
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/BuildHtmlSearchIndex.java16
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/HelpServerTest.java24
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/IndexAssemblePerformanceTest.java14
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/LowIterationHelpServerTest.java24
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/OpenHelpTest.java28
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/TocAssemblePerformanceTest.java18
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/AllRemoteTests.java4
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/GetContentUsingRemoteHelp.java24
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/JettyTestServer.java6
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockContentServlet.java2
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockContextServlet.java4
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockIndexServlet.java10
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockSearchServlet.java12
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/RemotePreferenceStore.java30
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/TestServerManager.java8
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/scope/MockScope.java10
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/scope/TScope.java2
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/AllSearchTests.java2
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/MockSearchParticipant.java6
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/MockSearchParticipantXML.java8
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchTestUtils.java8
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/UATestContentExtensionProvider.java122
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/UaTestTocProvider.java12
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/DocumentCreator.java4
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/LoadServletUtil.java12
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/LoadTestServlet.java8
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/ParallelTestSupport.java20
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/TocModelSerializer.java16
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilter.java16
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterOne.java2
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterThree.java4
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterTwo.java4
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/MockServletRequest.java14
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/MockServletResponse.java50
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/AllWebappServiceTests.java2
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/SchemaValidator.java8
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/ServicesTestUtils.java4
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TestFrame.java8
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TestHelpToolbarFrame.java10
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchButton.java8
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchData.java4
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchView.java8
60 files changed, 341 insertions, 341 deletions
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/AllHelpPerformanceTests.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/AllHelpPerformanceTests.java
index 6ea0ae194..8c954e8e0 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/AllHelpPerformanceTests.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/AllHelpPerformanceTests.java
@@ -36,9 +36,9 @@ public class AllHelpPerformanceTests extends TestSuite {
/*
* Disabled due to inability to get reliable results. Browser/SWT
- * changes in timing of listener events no longer consistent in 3.3.
+ * changes in timing of listener events no longer consistent in 3.3.
*/
-
+
//addTest(OpenHelpTest.suite());
addTest(TocAssemblePerformanceTest.suite());
addTest(IndexAssemblePerformanceTest.suite());
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/criteria/SampleCriteriaDefinitionProvider.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/criteria/SampleCriteriaDefinitionProvider.java
index 04ff74b91..f955868b4 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/criteria/SampleCriteriaDefinitionProvider.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/criteria/SampleCriteriaDefinitionProvider.java
@@ -50,7 +50,7 @@ public class SampleCriteriaDefinitionProvider extends
private ICriteriaDefinitionContribution[] getSpanishCriteriaDefinitionContributions() {
UserCriteriaDefinition criteriaDefinition = new UserCriteriaDefinition();
UserCriterionDefinition criterionDefinition = new UserCriterionDefinition(
- SampleCriteriaProvider.CONTAINS_LETTER,
+ SampleCriteriaProvider.CONTAINS_LETTER,
"Letras en titulo");
UserCriteriaDefinitionContribution contribution = new UserCriteriaDefinitionContribution();
criteriaDefinition.addDefinition(criterionDefinition);
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/criteria/SampleCriteriaProvider.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/criteria/SampleCriteriaProvider.java
index bc600a9c7..a902c086a 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/criteria/SampleCriteriaProvider.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/criteria/SampleCriteriaProvider.java
@@ -51,6 +51,6 @@ public class SampleCriteriaProvider extends AbstractCriteriaProvider {
criteria.add( new UserCriteria(CONTAINS_LETTER, "c", true) );
}
return criteria.toArray(new UserCriteria[criteria.size()]);
- }
+ }
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/AllOtherHelpTests.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/AllOtherHelpTests.java
index 98e689c31..3355e8a13 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/AllOtherHelpTests.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/AllOtherHelpTests.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserContext.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserContext.java
index 8a1dd571e..059e8509e 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserContext.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserContext.java
@@ -28,7 +28,7 @@ public class UserContext implements IContext3 {
private String title;
private String text;
private List<ITopic> children = new ArrayList<ITopic>();
-
+
public UserContext(String title, String text) {
this.title = title;
this.text = text;
@@ -63,10 +63,10 @@ public class UserContext implements IContext3 {
public String getText() {
return text;
}
-
+
public void addTopic(ITopic child) {
children.add(child);
}
-
-
+
+
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriteria.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriteria.java
index 779596c18..2f6d72a6a 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriteria.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriteria.java
@@ -15,7 +15,7 @@ import org.eclipse.help.ICriteria;
import org.eclipse.help.IUAElement;
public class UserCriteria implements ICriteria {
-
+
private String name;
private String value;
private boolean enabled;
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriteriaDefinition.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriteriaDefinition.java
index 160d01fac..ea55b9b0f 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriteriaDefinition.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriteriaDefinition.java
@@ -22,7 +22,7 @@ import org.eclipse.help.IUAElement;
public class UserCriteriaDefinition implements ICriteriaDefinition {
private List<ICriterionDefinition> children = new ArrayList<ICriterionDefinition>();
-
+
@Override
public boolean isEnabled(IEvaluationContext context) {
return true;
@@ -32,7 +32,7 @@ public class UserCriteriaDefinition implements ICriteriaDefinition {
public ICriterionDefinition[] getCriterionDefinitions() {
return children.toArray(new ICriterionDefinition[0]);
}
-
+
public void addDefinition(ICriterionDefinition definition) {
children.add(definition);
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriteriaDefinitionContribution.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriteriaDefinitionContribution.java
index 93382600c..1979c8e23 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriteriaDefinitionContribution.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriteriaDefinitionContribution.java
@@ -20,7 +20,7 @@ public class UserCriteriaDefinitionContribution implements ICriteriaDefinitionCo
private ICriteriaDefinition criteriaDefinition;
private String id;
private String locale;
-
+
public boolean isEnabled(IEvaluationContext context) {
return true;
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriterionDefinition.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriterionDefinition.java
index 6396548e3..05e7dc133 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriterionDefinition.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriterionDefinition.java
@@ -24,12 +24,12 @@ public class UserCriterionDefinition implements ICriterionDefinition {
private String id;
private String name;
private List<ICriterionValueDefinition> children = new ArrayList<ICriterionValueDefinition>();
-
+
public UserCriterionDefinition(String id, String name) {
this.id = id;
this.name = name;
}
-
+
@Override
public boolean isEnabled(IEvaluationContext context) {
return true;
@@ -62,7 +62,7 @@ public class UserCriterionDefinition implements ICriterionDefinition {
public ICriterionValueDefinition[] getCriterionValueDefinitions() {
return children.toArray(new ICriterionValueDefinition[0]);
}
-
+
public void addValue(ICriterionValueDefinition value) {
children.add(value);
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriterionValueDefinition.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriterionValueDefinition.java
index 87372cba0..f6460170d 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriterionValueDefinition.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriterionValueDefinition.java
@@ -19,12 +19,12 @@ public class UserCriterionValueDefinition implements ICriterionValueDefinition {
private String id;
private String name;
-
+
public UserCriterionValueDefinition(String id, String name) {
this.id = id;
this.name = name;
}
-
+
@Override
public boolean isEnabled(IEvaluationContext context) {
return true;
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserIndex.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserIndex.java
index 55d9dd0ea..c60c161c4 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserIndex.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserIndex.java
@@ -24,10 +24,10 @@ import org.eclipse.help.IUAElement;
*/
public class UserIndex implements IIndex {
-
+
private List<IIndexEntry> entries = new ArrayList<IIndexEntry>();
private boolean enabled;
-
+
public UserIndex(boolean enabled) {
this.enabled = true;
}
@@ -36,7 +36,7 @@ public class UserIndex implements IIndex {
public IUAElement[] getChildren() {
return getEntries();
}
-
+
public void addEntry(IIndexEntry child) {
entries.add(child);
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserIndexEntry.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserIndexEntry.java
index 622e23e01..f29bf680d 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserIndexEntry.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserIndexEntry.java
@@ -26,9 +26,9 @@ import org.eclipse.help.IUAElement;
*/
public class UserIndexEntry implements IIndexEntry2 {
-
- private List<IIndexEntry> subentries = new ArrayList<IIndexEntry>();
- private List<IIndexSee> sees = new ArrayList<IIndexSee>();
+
+ private List<IIndexEntry> subentries = new ArrayList<IIndexEntry>();
+ private List<IIndexSee> sees = new ArrayList<IIndexSee>();
private List<ITopic> topics = new ArrayList<ITopic>();
private boolean isEnabled;
private String keyword;
@@ -53,15 +53,15 @@ public class UserIndexEntry implements IIndexEntry2 {
public void addSee(IIndexSee child) {
sees.add(child);
}
-
+
public void addEntry(IIndexEntry child) {
subentries.add(child);
}
-
+
public void addTopic(ITopic child) {
topics.add(child);
}
-
+
public UserIndexEntry(String keyword, boolean isEnabled) {
this.keyword = keyword;
this.isEnabled = isEnabled;
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserIndexSee.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserIndexSee.java
index 13956d3aa..7c5d226bc 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserIndexSee.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserIndexSee.java
@@ -20,7 +20,7 @@ import org.eclipse.help.IIndexSubpath;
import org.eclipse.help.IUAElement;
public class UserIndexSee implements IIndexSee {
-
+
private List<IIndexSubpath> children = new ArrayList<IIndexSubpath>();
private boolean isEnabled;
private String keyword;
@@ -34,11 +34,11 @@ public class UserIndexSee implements IIndexSee {
public boolean isEnabled(IEvaluationContext context) {
return isEnabled;
}
-
+
public void addSubpath(IIndexSubpath child) {
children.add(child);
}
-
+
public UserIndexSee(String keyword, boolean isEnabled) {
this.keyword = keyword;
this.isEnabled = isEnabled;
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserIndexSubpath.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserIndexSubpath.java
index ade4e0a86..c4da7ab43 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserIndexSubpath.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserIndexSubpath.java
@@ -17,13 +17,13 @@ import org.eclipse.help.IUAElement;
public class UserIndexSubpath implements IIndexSubpath {
-
+
private String keyword;
-
+
public UserIndexSubpath(String keyword) {
this.keyword = keyword;
}
-
+
@Override
public String getKeyword() {
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserToc.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserToc.java
index a310632db..1c3d55dc4 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserToc.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserToc.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -19,12 +19,12 @@ import org.eclipse.help.ITopic;
import org.eclipse.help.IUAElement;
public class UserToc implements IToc {
-
+
private List<ITopic> children = new ArrayList<ITopic>();
private boolean isEnabled;
private String href;
private String label;
-
+
public UserToc(String label, String href, boolean isEnabled) {
this.label = label;
this.href = href;
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserToc2.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserToc2.java
index 5d8f3b9c5..de9c54ce5 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserToc2.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserToc2.java
@@ -35,7 +35,7 @@ public class UserToc2 extends UserToc implements IToc2 {
System.arraycopy(criteriaElements, 0, result, topics.length, criteriaElements.length);
return result;
}
-
+
public void addCriterion(ICriteria child) {
criteria.add(child);
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserTopic.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserTopic.java
index 0828636eb..ef404f393 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserTopic.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserTopic.java
@@ -23,7 +23,7 @@ import org.eclipse.help.IUAElement;
*/
public class UserTopic implements ITopic {
-
+
private List<ITopic> children = new ArrayList<ITopic>();
private boolean isEnabled;
private String href;
@@ -53,11 +53,11 @@ public class UserTopic implements ITopic {
public String getLabel() {
return label;
}
-
+
public void addTopic(ITopic child) {
children.add(child);
}
-
+
public UserTopic(String label, String href, boolean isEnabled) {
this.label = label;
this.href = href;
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserTopic2.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserTopic2.java
index 291c3087a..629a7be69 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserTopic2.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserTopic2.java
@@ -19,7 +19,7 @@ import org.eclipse.help.ITopic2;
import org.eclipse.help.IUAElement;
public class UserTopic2 extends UserTopic implements ITopic2 {
-
+
private List<ICriteria> criteria = new ArrayList<ICriteria>();
@Override
@@ -31,11 +31,11 @@ public class UserTopic2 extends UserTopic implements ITopic2 {
System.arraycopy(criteriaElements, 0, result, topics.length, criteriaElements.length);
return result;
}
-
+
public UserTopic2(String label, String href, boolean isEnabled) {
super(label, href, isEnabled);
}
-
+
public void addCriterion(ICriteria child) {
criteria.add(child);
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/BuildHtmlSearchIndex.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/BuildHtmlSearchIndex.java
index d44e86091..0f80974fc 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/BuildHtmlSearchIndex.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/BuildHtmlSearchIndex.java
@@ -36,7 +36,7 @@ public class BuildHtmlSearchIndex extends PerformanceTestCase {
private AbstractTocProvider[] tocProviders;
private AbstractIndexProvider[] indexProviders;
private AnalyzerDescriptor analyzerDesc;
-
+
/*
* Returns an instance of this Test.
*/
@@ -58,7 +58,7 @@ public class BuildHtmlSearchIndex extends PerformanceTestCase {
indexManager.clearCache();
analyzerDesc = new AnalyzerDescriptor("en-us");
}
-
+
@Override
protected void tearDown() throws Exception {
super.tearDown();
@@ -73,7 +73,7 @@ public class BuildHtmlSearchIndex extends PerformanceTestCase {
tocProviders = null;
indexProviders = null;
}
-
+
public void testCreateHtmlSearchIndex() throws Exception {
tagAsGlobalSummary("Create HTML Search Index", Dimension.ELAPSED_PROCESS);
@@ -81,14 +81,14 @@ public class BuildHtmlSearchIndex extends PerformanceTestCase {
for (int i=0;i<3;++i) {
buildIndex();
}
-
+
// run the tests
for (int i=0;i<100;++i) {
startMeasuring();
buildIndex();
stopMeasuring();
}
-
+
commitMeasurements();
assertPerformance();
}
@@ -164,17 +164,17 @@ public class BuildHtmlSearchIndex extends PerformanceTestCase {
new TocFile(id, "data/help/performance/org.eclipse.jdt.doc.user/topics_GettingStarted.xml", false, nl, null, null),
new TocFile(id, "data/help/performance/org.eclipse.jdt.doc.user/topics_Reference.xml", false, nl, null, null),
new TocFile(id, "data/help/performance/org.eclipse.jdt.doc.user/topics_Tasks.xml", false, nl, null, null),
-
+
new TocFile(id, "data/help/performance/org.eclipse.pde.doc.user/toc.xml", true, nl, null, null),
new TocFile(id, "data/help/performance/org.eclipse.pde.doc.user/topics_Reference.xml", false, nl, null, null),
-
+
new TocFile(id, "data/help/performance/org.eclipse.platform.doc.isv/toc.xml", true, nl, null, null),
new TocFile(id, "data/help/performance/org.eclipse.platform.doc.isv/topics_Guide.xml", false, nl, null, null),
new TocFile(id, "data/help/performance/org.eclipse.platform.doc.isv/topics_Porting.xml", false, nl, null, null),
new TocFile(id, "data/help/performance/org.eclipse.platform.doc.isv/topics_Questions.xml", false, nl, null, null),
new TocFile(id, "data/help/performance/org.eclipse.platform.doc.isv/topics_Reference.xml", false, nl, null, null),
new TocFile(id, "data/help/performance/org.eclipse.platform.doc.isv/topics_Samples.xml", false, nl, null, null),
-
+
new TocFile(id, "data/help/performance/org.eclipse.platform.doc.user/toc.xml", true, nl, null, null),
new TocFile(id, "data/help/performance/org.eclipse.platform.doc.user/topics_Concepts.xml", false, nl, null, null),
new TocFile(id, "data/help/performance/org.eclipse.platform.doc.user/topics_GettingStarted.xml", false, nl, null, null),
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/HelpServerTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/HelpServerTest.java
index 1bfa430d6..373e1ba7b 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/HelpServerTest.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/HelpServerTest.java
@@ -23,7 +23,7 @@ import org.eclipse.ua.tests.help.util.LoadServletUtil;
*/
public class HelpServerTest extends PerformanceTestCase {
-
+
/*
* Returns an instance of this Test.
*/
@@ -35,12 +35,12 @@ public class HelpServerTest extends PerformanceTestCase {
protected void setUp() throws Exception {
super.setUp();
}
-
+
@Override
protected void tearDown() throws Exception {
LoadServletUtil.stopServer();
}
-
+
public void testServletRead100x() throws Exception {
tagAsSummary("Servlet Read", Dimension.ELAPSED_PROCESS);
LoadServletUtil.startServer();
@@ -49,8 +49,8 @@ public class HelpServerTest extends PerformanceTestCase {
boolean warmup = i < 2;
if (!warmup) {
startMeasuring();
- }
-
+ }
+
for (int j = 0; j <= 100; j++) {
LoadServletUtil.readLoadServlet(200);
}
@@ -59,14 +59,14 @@ public class HelpServerTest extends PerformanceTestCase {
stopMeasuring();
}
}
-
+
commitMeasurements();
assertPerformance();
- }
+ }
public void testStartServer() throws Exception {
tagAsSummary("Start Server", Dimension.ELAPSED_PROCESS);
-
+
// run the tests
for (int i=0; i < 25; ++i) {
boolean warmup = i < 2;
@@ -74,16 +74,16 @@ public class HelpServerTest extends PerformanceTestCase {
if (!warmup) {
startMeasuring();
}
-
+
LoadServletUtil.startServer();
-
+
if (!warmup) {
stopMeasuring();
}
}
-
+
commitMeasurements();
assertPerformance();
}
-
+
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/IndexAssemblePerformanceTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/IndexAssemblePerformanceTest.java
index e4dbe6afd..2f94f5f93 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/IndexAssemblePerformanceTest.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/IndexAssemblePerformanceTest.java
@@ -32,7 +32,7 @@ import org.eclipse.ua.tests.plugin.UserAssistanceTestPlugin;
import org.xml.sax.SAXException;
public class IndexAssemblePerformanceTest extends PerformanceTestCase {
-
+
/*
* Returns an instance of this Test.
*/
@@ -44,24 +44,24 @@ public class IndexAssemblePerformanceTest extends PerformanceTestCase {
protected void setUp() throws Exception {
super.setUp();
}
-
+
public void testIndexAssemble() throws Exception {
tagAsSummary("Assemble Index", Dimension.ELAPSED_PROCESS);
-
+
// run the tests
for (int i=0; i < 10; ++i) {
boolean warmup = i == 0;
if (!warmup) {
startMeasuring();
}
-
+
assembleIndex();
if (!warmup) {
stopMeasuring();
}
}
-
+
commitMeasurements();
assertPerformance();
}
@@ -74,8 +74,8 @@ public class IndexAssemblePerformanceTest extends PerformanceTestCase {
IndexContribution c = parser.parse(new IndexFile(UserAssistanceTestPlugin.getPluginId(), "data/help/performance/index/index3.xml", "en"));
IndexAssembler assembler = new IndexAssembler();
List<IndexContribution> contributions = new ArrayList<IndexContribution>(Arrays.asList(a, b, c));
- Index assembled = assembler.assemble(contributions, Platform.getNL());
+ Index assembled = assembler.assemble(contributions, Platform.getNL());
assertEquals(100, assembled.getChildren().length);
}
-
+
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/LowIterationHelpServerTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/LowIterationHelpServerTest.java
index 24f9d9ae6..180d3fb2a 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/LowIterationHelpServerTest.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/LowIterationHelpServerTest.java
@@ -23,7 +23,7 @@ import org.eclipse.ua.tests.help.util.LoadServletUtil;
*/
public class LowIterationHelpServerTest extends PerformanceTestCase {
-
+
/*
* Returns an instance of this Test.
*/
@@ -35,12 +35,12 @@ public class LowIterationHelpServerTest extends PerformanceTestCase {
protected void setUp() throws Exception {
super.setUp();
}
-
+
@Override
protected void tearDown() throws Exception {
LoadServletUtil.stopServer();
}
-
+
public void testServletRead20x() throws Exception {
tagAsSummary("Servlet Read", Dimension.ELAPSED_PROCESS);
LoadServletUtil.startServer();
@@ -49,8 +49,8 @@ public class LowIterationHelpServerTest extends PerformanceTestCase {
boolean warmup = i < 2;
if (!warmup) {
startMeasuring();
- }
-
+ }
+
for (int j = 0; j <= 20; j++) {
LoadServletUtil.readLoadServlet(200);
}
@@ -59,14 +59,14 @@ public class LowIterationHelpServerTest extends PerformanceTestCase {
stopMeasuring();
}
}
-
+
commitMeasurements();
assertPerformance();
- }
+ }
public void testStartServer() throws Exception {
tagAsSummary("Start Server", Dimension.ELAPSED_PROCESS);
-
+
// run the tests
for (int i=0; i < 25; ++i) {
boolean warmup = i < 2;
@@ -74,16 +74,16 @@ public class LowIterationHelpServerTest extends PerformanceTestCase {
if (!warmup) {
startMeasuring();
}
-
+
LoadServletUtil.startServer();
-
+
if (!warmup) {
stopMeasuring();
}
}
-
+
commitMeasurements();
assertPerformance();
}
-
+
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/OpenHelpTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/OpenHelpTest.java
index c4792e219..216a1999f 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/OpenHelpTest.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/OpenHelpTest.java
@@ -40,7 +40,7 @@ public class OpenHelpTest extends PerformanceTestCase {
private AbstractTocProvider[] tocProviders;
private AbstractIndexProvider[] indexProviders;
private Shell shell;
-
+
/*
* Returns an instance of this Test.
*/
@@ -61,7 +61,7 @@ public class OpenHelpTest extends PerformanceTestCase {
indexManager.setIndexProviders(new AbstractIndexProvider[0]);
indexManager.clearCache();
}
-
+
@Override
protected void tearDown() throws Exception {
super.tearDown();
@@ -73,7 +73,7 @@ public class OpenHelpTest extends PerformanceTestCase {
indexManager.setIndexProviders(indexProviders);
indexManager.clearCache();
}
-
+
public void testOpenHelp() throws Exception {
tagAsGlobalSummary("Open help", Dimension.ELAPSED_PROCESS);
@@ -82,7 +82,7 @@ public class OpenHelpTest extends PerformanceTestCase {
openHelp();
closeHelp();
}
-
+
// run the tests
for (int i=0;i<50;++i) {
startMeasuring();
@@ -90,15 +90,15 @@ public class OpenHelpTest extends PerformanceTestCase {
stopMeasuring();
closeHelp();
}
-
+
commitMeasurements();
assertPerformance();
}
-
+
private void openHelp() throws Exception {
// start the webapp
BaseHelpSystem.ensureWebappRunning();
-
+
// open a browser
Shell parent = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
shell = new Shell(parent);
@@ -106,7 +106,7 @@ public class OpenHelpTest extends PerformanceTestCase {
shell.setSize(parent.getSize());
Browser browser = new Browser(shell, SWT.NONE);
shell.open();
-
+
// open help url
final boolean[] done = new boolean[] { false };
final String url = "http://" + WebappManager.getHost() + ":" + WebappManager.getPort() + "/help/index.jsp";
@@ -119,7 +119,7 @@ public class OpenHelpTest extends PerformanceTestCase {
}
});
browser.setUrl(url);
-
+
// wait until the browser finishes loading
Display display = Display.getDefault();
while (!done[0]) {
@@ -129,14 +129,14 @@ public class OpenHelpTest extends PerformanceTestCase {
}
flush();
}
-
+
private void closeHelp() throws Exception {
if (shell != null) {
shell.dispose();
shell = null;
}
}
-
+
private static void flush() {
Display display = Display.getCurrent();
while (display.readAndDispatch()) {
@@ -161,17 +161,17 @@ public class OpenHelpTest extends PerformanceTestCase {
new TocFile(id, "data/help/performance/org.eclipse.jdt.doc.user/topics_GettingStarted.xml", false, nl, null, null),
new TocFile(id, "data/help/performance/org.eclipse.jdt.doc.user/topics_Reference.xml", false, nl, null, null),
new TocFile(id, "data/help/performance/org.eclipse.jdt.doc.user/topics_Tasks.xml", false, nl, null, null),
-
+
new TocFile(id, "data/help/performance/org.eclipse.pde.doc.user/toc.xml", true, nl, null, null),
new TocFile(id, "data/help/performance/org.eclipse.pde.doc.user/topics_Reference.xml", false, nl, null, null),
-
+
new TocFile(id, "data/help/performance/org.eclipse.platform.doc.isv/toc.xml", true, nl, null, null),
new TocFile(id, "data/help/performance/org.eclipse.platform.doc.isv/topics_Guide.xml", false, nl, null, null),
new TocFile(id, "data/help/performance/org.eclipse.platform.doc.isv/topics_Porting.xml", false, nl, null, null),
new TocFile(id, "data/help/performance/org.eclipse.platform.doc.isv/topics_Questions.xml", false, nl, null, null),
new TocFile(id, "data/help/performance/org.eclipse.platform.doc.isv/topics_Reference.xml", false, nl, null, null),
new TocFile(id, "data/help/performance/org.eclipse.platform.doc.isv/topics_Samples.xml", false, nl, null, null),
-
+
new TocFile(id, "data/help/performance/org.eclipse.platform.doc.user/toc.xml", true, nl, null, null),
new TocFile(id, "data/help/performance/org.eclipse.platform.doc.user/topics_Concepts.xml", false, nl, null, null),
new TocFile(id, "data/help/performance/org.eclipse.platform.doc.user/topics_GettingStarted.xml", false, nl, null, null),
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/TocAssemblePerformanceTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/TocAssemblePerformanceTest.java
index 6fcac6c90..d7c07168d 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/TocAssemblePerformanceTest.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/TocAssemblePerformanceTest.java
@@ -31,7 +31,7 @@ import org.eclipse.ua.tests.plugin.UserAssistanceTestPlugin;
import org.xml.sax.SAXException;
public class TocAssemblePerformanceTest extends PerformanceTestCase {
-
+
/*
* Returns an instance of this Test.
*/
@@ -43,12 +43,12 @@ public class TocAssemblePerformanceTest extends PerformanceTestCase {
protected void setUp() throws Exception {
super.setUp();
}
-
+
private TocContribution parse(TocFileParser parser, String tocFile)
throws IOException, SAXException, ParserConfigurationException {
return parser.parse(new TocFile(UserAssistanceTestPlugin.getPluginId(), tocFile, true, "en", null, null));
}
-
+
public void assembleToc() throws Exception {
TocFileParser parser = new TocFileParser();
List<TocContribution> contributions = new ArrayList<TocContribution>();
@@ -59,14 +59,14 @@ public class TocAssemblePerformanceTest extends PerformanceTestCase {
contributions.add(parse(parser, "data/help/performance/org.eclipse.jdt.doc.isv/topics_Reference.xml"));
contributions.add(parse(parser, "data/help/performance/org.eclipse.jdt.doc.isv/topics_Samples.xml"));
contributions.add(parse(parser, "data/help/performance/org.eclipse.jdt.doc.isv/topics_Samples.xml"));
- TocAssembler assembler = new TocAssembler();
+ TocAssembler assembler = new TocAssembler();
contributions = assembler.assemble(contributions);
assertEquals(1, contributions.size());
TocContribution toc = contributions.get(0);
assertEquals(101, countTopics(toc.getToc().getTopics()));
}
-
+
private int countTopics(ITopic[] topics) {
int result = topics.length;
for (ITopic topic : topics) {
@@ -77,7 +77,7 @@ public class TocAssemblePerformanceTest extends PerformanceTestCase {
public void testTocAssemble() throws Exception {
tagAsSummary("Assemble TOC", Dimension.ELAPSED_PROCESS);
-
+
// run the tests
for (int i=0; i < 100; ++i) {
boolean warmup = i < 2;
@@ -91,10 +91,10 @@ public class TocAssemblePerformanceTest extends PerformanceTestCase {
stopMeasuring();
}
}
-
+
commitMeasurements();
assertPerformance();
}
-
-
+
+
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/AllRemoteTests.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/AllRemoteTests.java
index 4ed5bb239..4f9480cb5 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/AllRemoteTests.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/AllRemoteTests.java
@@ -18,12 +18,12 @@ import org.junit.runners.Suite;
*/
@RunWith(Suite.class)
@Suite.SuiteClasses({
- RemotePreferenceTest.class,
+ RemotePreferenceTest.class,
TocServletTest.class,
SearchServletTest.class,
IndexServletTest.class,
ContentServletTest.class,
- ContextServletTest.class,
+ ContextServletTest.class,
LoadTocUsingRemoteHelp.class,
SearchUsingRemoteHelp.class,
LoadIndexUsingRemoteHelp.class,
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/GetContentUsingRemoteHelp.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/GetContentUsingRemoteHelp.java
index 8ed40e0d7..1e773291d 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/GetContentUsingRemoteHelp.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/GetContentUsingRemoteHelp.java
@@ -28,7 +28,7 @@ import org.junit.runners.MethodSorters;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class GetContentUsingRemoteHelp {
-
+
private int mode;
@Before
@@ -41,7 +41,7 @@ public class GetContentUsingRemoteHelp {
BaseHelpSystem.setMode(BaseHelpSystem.MODE_INFOCENTER);
HelpPlugin.getTocManager().getTocs("en");
}
-
+
@After
public void tearDown() throws Exception {
RemotePreferenceStore.restorePreferences();
@@ -84,7 +84,7 @@ public class GetContentUsingRemoteHelp {
String localContent = RemoteTestUtils.getLocalContent(plugin, path);
assertEquals(localContent, helpContent);
}
-
+
@Test
public void testRemoteHelpPreferredPreference() throws Exception {
RemotePreferenceStore.setMockRemotePriority();
@@ -109,12 +109,12 @@ public class GetContentUsingRemoteHelp {
final String path = "/doc/help_home.html";
String plugin = "org.eclipse.help.base";
String helpContent = GetContentUsingRemoteHelp.getHelpContent(plugin, path, "en");
-
+
//Get remote content from first one in prefs
int port0 = TestServerManager.getPort(0);
String remoteContent0 = RemoteTestUtils.createMockContent(plugin, path, "en", port0);
-
+
int port1 = TestServerManager.getPort(1);
String remoteContent1 = RemoteTestUtils.createMockContent(plugin, path, "en", port1);
@@ -122,7 +122,7 @@ public class GetContentUsingRemoteHelp {
assertFalse(remoteContent1.equals(helpContent));
}
-
+
@Test
public void testRemoteOrderingReversed() throws Exception {
RemotePreferenceStore.setTwoMockRemoteServersReversePriority();
@@ -133,16 +133,16 @@ public class GetContentUsingRemoteHelp {
final String path = "/doc/help_home.html";
String plugin = "org.eclipse.help.base";
String helpContent = GetContentUsingRemoteHelp.getHelpContent(plugin, path, "en");
-
+
//Get remote content from second in prefs
int port0 = TestServerManager.getPort(0);
String remoteContent0 = RemoteTestUtils.createMockContent(plugin, path, "en", port0);
-
+
int port1 = TestServerManager.getPort(1);
String remoteContent1 = RemoteTestUtils.createMockContent(plugin, path, "en", port1);
-
-
+
+
assertEquals(remoteContent1, helpContent);
assertFalse(remoteContent0.equals(helpContent));
@@ -155,12 +155,12 @@ public class GetContentUsingRemoteHelp {
HelpPlugin.getTocManager().getTocs("en");
final String path = "/data/help/nonlocal.html";
String plugin = "org.eclipse.help.base";
- String remoteContent = getHelpContent(plugin, path, "en");
+ String remoteContent = getHelpContent(plugin, path, "en");
int port = TestServerManager.getPort(0);
String expectedContent = RemoteTestUtils.createMockContent(plugin, path, "en", port);
assertEquals(expectedContent, remoteContent);
}
-
+
private static String getHelpContent(String plugin, String path, String locale)
throws Exception {
int port = WebappManager.getPort();
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/JettyTestServer.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/JettyTestServer.java
index c1c58b5d0..530ab9bfb 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/JettyTestServer.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/JettyTestServer.java
@@ -19,17 +19,17 @@ import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
public class JettyTestServer extends JettyHelpServer {
-
+
@Override
protected String getOtherInfo() {
return "org.eclipse.ua.tests";
}
-
+
@Override
protected int getPortParameter() {
return AUTO_SELECT_JETTY_PORT;
}
-
+
/*
* Ensures that the bundle with the specified name and the highest available
* version is started and reads the port number
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockContentServlet.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockContentServlet.java
index c2c718316..29cbc023f 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockContentServlet.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockContentServlet.java
@@ -48,7 +48,7 @@ public class MockContentServlet extends HttpServlet {
}
callcount++;
}
-
+
public static int getCallcount() {
return callcount;
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockContextServlet.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockContextServlet.java
index 0400d2fdf..0d04db4fa 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockContextServlet.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockContextServlet.java
@@ -29,10 +29,10 @@ public class MockContextServlet extends ContextServlet {
UserContext context = new UserContext(title, "Decriptiion for " + title);
UserTopic topic = new UserTopic(title, "topic.html", true);
context.addTopic(topic);
- return context;
+ return context;
}
return null;
}
-
+
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockIndexServlet.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockIndexServlet.java
index b49b4e2b1..ce1d44bd2 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockIndexServlet.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockIndexServlet.java
@@ -29,7 +29,7 @@ import org.eclipse.ua.tests.help.other.UserTopic;
public class MockIndexServlet extends IndexServlet {
private static final long serialVersionUID = -930969620357059313L;
-
+
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
@@ -50,11 +50,11 @@ public class MockIndexServlet extends IndexServlet {
private IndexContribution[] getIndex(HttpServletRequest req, String locale) {
int port = req.getLocalPort();
UserIndex index = new UserIndex(true);
- UserIndexEntry entry1 = new UserIndexEntry("entry1_" + locale, false);
+ UserIndexEntry entry1 = new UserIndexEntry("entry1_" + locale, false);
UserTopic topic1 = new UserTopic("topic1_", "href.html", false);
index.addEntry(entry1);
entry1.addTopic(topic1);
- UserIndexEntry entry2 = new UserIndexEntry("entry2_" + locale, false);
+ UserIndexEntry entry2 = new UserIndexEntry("entry2_" + locale, false);
UserTopic topic2 = new UserTopic("topic2_" + port, "href" + port + ".html", false);
index.addEntry(entry2);
entry2.addTopic(topic2);
@@ -64,7 +64,7 @@ public class MockIndexServlet extends IndexServlet {
contribution.setLocale(locale);
return new IndexContribution[] { contribution };
}
-
+
}
-
+
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockSearchServlet.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockSearchServlet.java
index a93dd0a1b..28888803f 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockSearchServlet.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockSearchServlet.java
@@ -27,18 +27,18 @@ import org.eclipse.help.internal.webapp.servlet.SearchServlet;
public class MockSearchServlet extends HttpServlet {
private static final long serialVersionUID = -5115067950875335923L;
-
+
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- String phrase = req.getParameter("phrase");
+ String phrase = req.getParameter("phrase");
String locale = UrlUtil.getLocale(req, resp);
req.setCharacterEncoding("UTF-8"); //$NON-NLS-1$
resp.setContentType("application/xml; charset=UTF-8"); //$NON-NLS-1$
List<SearchHit> results = new ArrayList<SearchHit>();
if (isSearchHit(phrase, locale)) {
- SearchHit hit = new SearchHit("http://www.eclipse.org",
- "Hit from Mock Servlet",
+ SearchHit hit = new SearchHit("http://www.eclipse.org",
+ "Hit from Mock Servlet",
"This is the description of a hit from the mock servlet",
0, null, null, null, false);
results.add(hit);
@@ -52,7 +52,7 @@ public class MockSearchServlet extends HttpServlet {
return "dedfdsadsads".equals(phrase);
} else {
return "endfdsadsads".equals(phrase);
- }
- }
+ }
+ }
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/RemotePreferenceStore.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/RemotePreferenceStore.java
index 852a76672..97a88ff19 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/RemotePreferenceStore.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/RemotePreferenceStore.java
@@ -18,7 +18,7 @@ import org.eclipse.help.internal.base.HelpBasePlugin;
import org.eclipse.help.internal.base.IHelpBaseConstants;
public class RemotePreferenceStore {
-
+
private static String namePreference;
private static String hostPreference;
private static String pathPreference;
@@ -29,7 +29,7 @@ public class RemotePreferenceStore {
private static String defaultPort;
private static String remoteHelpPreferred;
private static String pageNotFound;
-
+
public static void savePreferences() throws Exception {
namePreference = Platform.getPreferencesService().getString
(HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_KEY_REMOTE_HELP_NAME,
@@ -54,15 +54,15 @@ public class RemotePreferenceStore {
"", null);
helpOn = Platform.getPreferencesService().getString
(HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_KEY_REMOTE_HELP_ON,
- "", null);
+ "", null);
remoteHelpPreferred = Platform.getPreferencesService().getString
(HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_KEY_REMOTE_HELP_PREFERRED,
- "", null);
+ "", null);
pageNotFound = Platform.getPreferencesService().getString
(HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_PAGE_NOT_FOUND,
- "", null);
+ "", null);
}
-
+
public static void restorePreferences() throws Exception {
IEclipsePreferences prefs = InstanceScope.INSTANCE.getNode(HelpBasePlugin.PLUGIN_ID);
prefs.put(IHelpBaseConstants.P_KEY_REMOTE_HELP_NAME, namePreference);
@@ -71,9 +71,9 @@ public class RemotePreferenceStore {
prefs.put(IHelpBaseConstants.P_KEY_REMOTE_HELP_PROTOCOL, protocolPreference);
prefs.put(IHelpBaseConstants.P_KEY_REMOTE_HELP_PORT, portPreference);
prefs.put(IHelpBaseConstants.P_KEY_REMOTE_HELP_DEFAULT_PORT, defaultPort);
- prefs.put(IHelpBaseConstants.P_KEY_REMOTE_HELP_ON, helpOn);
- prefs.put(IHelpBaseConstants.P_KEY_REMOTE_HELP_ICEnabled, icEnabledPreference);
- prefs.put(IHelpBaseConstants.P_KEY_REMOTE_HELP_PREFERRED, remoteHelpPreferred);
+ prefs.put(IHelpBaseConstants.P_KEY_REMOTE_HELP_ON, helpOn);
+ prefs.put(IHelpBaseConstants.P_KEY_REMOTE_HELP_ICEnabled, icEnabledPreference);
+ prefs.put(IHelpBaseConstants.P_KEY_REMOTE_HELP_PREFERRED, remoteHelpPreferred);
prefs.put(IHelpBaseConstants.P_PAGE_NOT_FOUND, pageNotFound);
}
@@ -88,7 +88,7 @@ public class RemotePreferenceStore {
RemotePreferenceTest.setPreference("remoteHelpName", "uatest");
RemotePreferenceTest.setPreference("remoteHelpICEnabled", "true");
RemotePreferenceTest.setPreference("remoteHelpICContributed", "false");
- }
+ }
public static void setTwoMockRemoteServers() throws Exception {
TestServerManager.start("ua.test", 0);
@@ -98,7 +98,7 @@ public class RemotePreferenceStore {
RemotePreferenceTest.setPreference("remoteHelpPath", "/help,/help");
RemotePreferenceTest.setPreference("remoteHelpProtocol", "http,http");
RemotePreferenceTest.setPreference("remoteHelpUseDefaultPort", ",");
- RemotePreferenceTest.setPreference("remoteHelpPort", ""
+ RemotePreferenceTest.setPreference("remoteHelpPort", ""
+ TestServerManager.getPort(0) + ',' + TestServerManager.getPort(1));
RemotePreferenceTest.setPreference("remoteHelpName", "uatest,uatest2");
RemotePreferenceTest.setPreference("remoteHelpICEnabled", "true,true");
@@ -112,17 +112,17 @@ public class RemotePreferenceStore {
RemotePreferenceTest.setPreference("remoteHelpPath", "/help,/help");
RemotePreferenceTest.setPreference("remoteHelpProtocol", "http,http");
RemotePreferenceTest.setPreference("remoteHelpUseDefaultPort", "true,true");
- RemotePreferenceTest.setPreference("remoteHelpPort", ""
+ RemotePreferenceTest.setPreference("remoteHelpPort", ""
+ TestServerManager.getPort(1) + ',' + TestServerManager.getPort(0));
RemotePreferenceTest.setPreference("remoteHelpName", "uatest,uatest2");
RemotePreferenceTest.setPreference("remoteHelpICEnabled", "true,true");
RemotePreferenceTest.setPreference("remoteHelpICContributed", "false,false");
}
-
+
public static void disableRemoteHelp() throws Exception {
RemotePreferenceTest.setPreference("remoteHelpOn", "false");
}
-
+
public static void disableErrorPage() throws Exception {
RemotePreferenceTest.setPreference(IHelpBaseConstants.P_PAGE_NOT_FOUND, "");
}
@@ -131,7 +131,7 @@ public class RemotePreferenceStore {
RemotePreferenceTest.setPreference("remoteHelpOn", "true");
RemotePreferenceTest.setPreference("remoteHelpPreferred", "false");
}
-
+
public static void setMockRemotePriority() throws Exception {
RemotePreferenceTest.setPreference("remoteHelpOn", "true");
RemotePreferenceTest.setPreference("remoteHelpPreferred", "true");
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/TestServerManager.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/TestServerManager.java
index 5d9bdf6b3..ff812b3b0 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/TestServerManager.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/TestServerManager.java
@@ -18,17 +18,17 @@ import org.eclipse.core.runtime.CoreException;
*/
public class TestServerManager {
-
+
private static JettyTestServer[] server = new JettyTestServer[2];
private static boolean serverRunning[] = new boolean[] { false, false };
-
+
private static JettyTestServer getHelpServer(int index) {
if (server[index] == null) {
server[index] = new JettyTestServer();
}
return server[index];
}
-
+
public static void start(String webappName, int index) throws Exception {
if (!serverRunning[index]) {
getHelpServer(index).start(webappName);
@@ -42,7 +42,7 @@ public class TestServerManager {
serverRunning[index] = false;
}
}
-
+
public static int getPort(int index) {
return getHelpServer(index).getPort();
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/scope/MockScope.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/scope/MockScope.java
index 506ddcb6d..b4e07222c 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/scope/MockScope.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/scope/MockScope.java
@@ -20,11 +20,11 @@ import org.eclipse.help.ITopic;
import org.eclipse.help.base.AbstractHelpScope;
public class MockScope extends AbstractHelpScope {
-
+
// Used for testing of scope based classes and utilities
- // Elements are in scope if they contain the letter specified
+ // Elements are in scope if they contain the letter specified
// in the constructor
-
+
private char letter;
private boolean isHierarchical;
@@ -57,11 +57,11 @@ public class MockScope extends AbstractHelpScope {
public String getName(Locale locale) {
return null;
}
-
+
private boolean testForInScope(String label) {
return label.indexOf(letter) >= 0;
}
-
+
@Override
public boolean isHierarchicalScope() {
return isHierarchical;
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/scope/TScope.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/scope/TScope.java
index 577f190c8..327845f56 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/scope/TScope.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/scope/TScope.java
@@ -12,7 +12,7 @@
package org.eclipse.ua.tests.help.scope;
public class TScope extends MockScope {
-
+
public TScope() {
super('t', true);
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/AllSearchTests.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/AllSearchTests.java
index 8ee531f24..5a388d9d4 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/AllSearchTests.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/AllSearchTests.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/MockSearchParticipant.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/MockSearchParticipant.java
index 7f6611166..b99c4dd4d 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/MockSearchParticipant.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/MockSearchParticipant.java
@@ -25,7 +25,7 @@ public class MockSearchParticipant extends SearchParticipant {
private static final String DOC_1 = "/org.eclipse.ua.tests/participant1.xml";
private static final String DOC_2 = "/org.eclipse.ua.tests/participant2.xml";
-
+
@Override
public Set<String> getAllDocuments(String locale) {
HashSet<String> set = new HashSet<String>();
@@ -42,8 +42,8 @@ public class MockSearchParticipant extends SearchParticipant {
String summary = isDoc1? "Summary1" : "Summary2";
String contents = isDoc1? "jkijkijkk frgeded" : "olhoykk lgktihku";
doc.setTitle(title);
- doc.setSummary(summary);
- doc.addContents(contents);
+ doc.setSummary(summary);
+ doc.addContents(contents);
return Status.OK_STATUS;
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/MockSearchParticipantXML.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/MockSearchParticipantXML.java
index 93d56a98c..353425744 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/MockSearchParticipantXML.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/MockSearchParticipantXML.java
@@ -21,7 +21,7 @@ public class MockSearchParticipantXML extends SearchParticipantXML {
public static final String DOC_1 = "/org.eclipse.ua.tests/data/help/search/participant_xml_1.xml";
public static final String DOC_2 = "/org.eclipse.ua.tests/data/help/search/participant_xml_2.xml";
-
+
@Override
public Set<String> getAllDocuments(String locale) {
HashSet<String> set = new HashSet<String>();
@@ -29,7 +29,7 @@ public class MockSearchParticipantXML extends SearchParticipantXML {
set.add(DOC_2);
return set;
}
-
+
@Override
public Set<String> getContributingPlugins() {
Set<String> result = new HashSet<String>();
@@ -41,7 +41,7 @@ public class MockSearchParticipantXML extends SearchParticipantXML {
protected void handleStartElement(String name, Attributes attributes,
IParsedXMLContent data) {
if ("participant".equalsIgnoreCase(name)) {
- data.setTitle(attributes.getValue("title"));
+ data.setTitle(attributes.getValue("title"));
}
String summary = attributes.getValue("summary");
if (summary != null) {
@@ -60,7 +60,7 @@ public class MockSearchParticipantXML extends SearchParticipantXML {
data.addText(text);
}
}
-
+
@Override
public boolean open(String id) {
System.out.println("Open " + id);
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchTestUtils.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchTestUtils.java
index ab68e609c..a4b22a4dd 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchTestUtils.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchTestUtils.java
@@ -30,7 +30,7 @@ import org.eclipse.core.runtime.NullProgressMonitor;
public class SearchTestUtils {
public static void searchAllLocales(String searchWord, String[] hrefs) {
- searchOneLocale(searchWord, hrefs, "en");
+ searchOneLocale(searchWord, hrefs, "en");
searchOneLocale(searchWord, hrefs, "de");
}
@@ -48,9 +48,9 @@ public class SearchTestUtils {
public static String searchForExpectedResults(String searchWord,
String[] hrefs, String nl) {
final Set<String> hrefsToFind = new HashSet<String>();
- final Set<String> unexpectedHrefs = new HashSet<String>();
+ final Set<String> unexpectedHrefs = new HashSet<String>();
hrefsToFind.addAll(Arrays.asList(hrefs));
-
+
SearchHit[] hits;
hits = getSearchHits(searchWord, nl);
for (SearchHit hit : hits) {
@@ -67,7 +67,7 @@ public class SearchTestUtils {
unexpectedHrefs.add(href);
}
}
-
+
if (!hrefsToFind.isEmpty() || !unexpectedHrefs.isEmpty()) {
StringBuffer buf = new StringBuffer();
buf.append("While searching for: " + searchWord + ",\n");
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/UATestContentExtensionProvider.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/UATestContentExtensionProvider.java
index 3fd854a82..a73e22fc0 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/UATestContentExtensionProvider.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/UATestContentExtensionProvider.java
@@ -1,62 +1,62 @@
-/*******************************************************************************
- * Copyright (c) 2011, 2015 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
+/*******************************************************************************
+ * Copyright (c) 2011, 2015 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
*******************************************************************************/
-
-package org.eclipse.ua.tests.help.search;
-
-import org.eclipse.core.expressions.IEvaluationContext;
-import org.eclipse.help.AbstractContentExtensionProvider;
-import org.eclipse.help.IContentExtension;
-import org.eclipse.help.IUAElement;
-
-public class UATestContentExtensionProvider extends
- AbstractContentExtensionProvider {
-
- private IContentExtension extension;
-
- public UATestContentExtensionProvider() {
- // TODO Auto-generated constructor stub
- extension = new IContentExtension() {
-
- @Override
- public boolean isEnabled(IEvaluationContext context) {
- // TODO Auto-generated method stub
- return true;
- }
-
- @Override
- public IUAElement[] getChildren() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public int getType() {
- return REPLACEMENT;
- }
-
- @Override
- public String getPath() {
- return "org.eclipse.ua.tests/data/help/search/test6.xhtml#test6_paragraph_to_replace2";
- }
-
- @Override
- public String getContent() {
- return "/org.eclipse.ua.tests/data/help/search/testProvider.xhtml";
- }
- };
- }
-
- @Override
- public IContentExtension[] getContentExtensions(String locale) {
- return new IContentExtension[] { extension };
- }
-
-}
+
+package org.eclipse.ua.tests.help.search;
+
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.help.AbstractContentExtensionProvider;
+import org.eclipse.help.IContentExtension;
+import org.eclipse.help.IUAElement;
+
+public class UATestContentExtensionProvider extends
+ AbstractContentExtensionProvider {
+
+ private IContentExtension extension;
+
+ public UATestContentExtensionProvider() {
+ // TODO Auto-generated constructor stub
+ extension = new IContentExtension() {
+
+ @Override
+ public boolean isEnabled(IEvaluationContext context) {
+ // TODO Auto-generated method stub
+ return true;
+ }
+
+ @Override
+ public IUAElement[] getChildren() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public int getType() {
+ return REPLACEMENT;
+ }
+
+ @Override
+ public String getPath() {
+ return "org.eclipse.ua.tests/data/help/search/test6.xhtml#test6_paragraph_to_replace2";
+ }
+
+ @Override
+ public String getContent() {
+ return "/org.eclipse.ua.tests/data/help/search/testProvider.xhtml";
+ }
+ };
+ }
+
+ @Override
+ public IContentExtension[] getContentExtensions(String locale) {
+ return new IContentExtension[] { extension };
+ }
+
+}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/UaTestTocProvider.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/UaTestTocProvider.java
index 0dee80a4c..70afb8203 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/UaTestTocProvider.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/UaTestTocProvider.java
@@ -18,11 +18,11 @@ import org.eclipse.ua.tests.help.other.UserToc;
import org.eclipse.ua.tests.help.other.UserTopic;
public class UaTestTocProvider extends AbstractTocProvider {
-
+
UserToc toc;
TocContribution contribution;
private ITocContribution[] contributions;
-
+
private class TocContribution implements ITocContribution {
@Override
@@ -64,15 +64,15 @@ public class UaTestTocProvider extends AbstractTocProvider {
public boolean isPrimary() {
return false;
}
-
+
};
public UaTestTocProvider() {
toc = new UserToc("Generated Toc", null, true);
- UserTopic parentTopic = new UserTopic("Generated Parent",
+ UserTopic parentTopic = new UserTopic("Generated Parent",
"generated/Generated+Parent/Parent+page+with+searchable+word+egrology+.html", true);
for (int i = 1; i <= 4; i++) {
- UserTopic childTopic = new UserTopic("Generated Child " + i,
+ UserTopic childTopic = new UserTopic("Generated Child " + i,
"generated/Generated+Child" + i +
"/Child+topic+" + i + ".html", true);
parentTopic.addTopic(childTopic);
@@ -84,7 +84,7 @@ public class UaTestTocProvider extends AbstractTocProvider {
@Override
public ITocContribution[] getTocContributions(String locale) {
- return contributions;
+ return contributions;
}
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/DocumentCreator.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/DocumentCreator.java
index 17c4567db..f9ac11a64 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/DocumentCreator.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/DocumentCreator.java
@@ -22,9 +22,9 @@ import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
public class DocumentCreator {
-
+
public static Document createDocument(String input) throws SAXException, IOException {
- StringReader reader = new StringReader(input);
+ StringReader reader = new StringReader(input);
InputSource source = new InputSource(reader);
DocumentBuilder documentBuilder = CheatSheetPlugin.getPlugin()
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/LoadServletUtil.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/LoadServletUtil.java
index 8fc1fb362..01c1cb2a6 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/LoadServletUtil.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/LoadServletUtil.java
@@ -22,9 +22,9 @@ import org.eclipse.help.internal.server.WebappManager;
import org.eclipse.core.runtime.CoreException;
public class LoadServletUtil {
-
+
private static long uniqueParam = System.currentTimeMillis();
-
+
/**
* Start a server for use in the performance tests
* @throws Exception
@@ -40,7 +40,7 @@ public class LoadServletUtil {
input.close();
Assert.assertTrue(firstbyte > 0);
}
-
+
/**
* Stop the server created by startServer()
* @throws CoreException
@@ -48,7 +48,7 @@ public class LoadServletUtil {
public static void stopServer() throws CoreException {
WebappManager.stop("help");
}
-
+
/**
* Read an html page generated by a servlet
* @param paragraphs the number of paragraphs in the page
@@ -58,7 +58,7 @@ public class LoadServletUtil {
int port = WebappManager.getPort();
// Use a unique parameter to defeat caching
++uniqueParam;
- URL url = new URL("http", "localhost", port,
+ URL url = new URL("http", "localhost", port,
"/help/loadtest?value=" + uniqueParam + "&repeat=" + paragraphs);
InputStream input = url.openStream();
int nextChar;
@@ -79,7 +79,7 @@ public class LoadServletUtil {
Assert.assertEquals(uniqueParam, value);
input.close();
}
-
+
private static void setTimeout(URLConnection conn, int milliseconds) {
conn.setConnectTimeout(milliseconds);
conn.setReadTimeout(milliseconds);
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/LoadTestServlet.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/LoadTestServlet.java
index 015f15dc6..ec823ec83 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/LoadTestServlet.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/LoadTestServlet.java
@@ -21,15 +21,15 @@ public class LoadTestServlet extends HttpServlet {
public LoadTestServlet() {
}
-
+
/**
- *
+ *
*/
private static final long serialVersionUID = -1426745453574711075L;
private static final String XHTML_1 = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n<title>"; //$NON-NLS-1$
private static final String XHTML_2 = "</title>\n <style type = \"text/css\"> td { padding-right : 10px; }</style></head>\n<body>\n"; //$NON-NLS-1$
private static final String XHTML_3 = "</body>\n</html>"; //$NON-NLS-1$
-
+
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
@@ -59,7 +59,7 @@ public class LoadTestServlet extends HttpServlet {
buf.append('$');
buf.append(XHTML_3);
String response = buf.toString();
- resp.getWriter().write(response);
+ resp.getWriter().write(response);
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/ParallelTestSupport.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/ParallelTestSupport.java
index c85b8641e..7bcb781b8 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/ParallelTestSupport.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/ParallelTestSupport.java
@@ -15,17 +15,17 @@ import org.junit.Assert;
public class ParallelTestSupport {
-
+
public interface ITestCase {
/**
* Runs a test case one time
- * @return null if the test passes, otherwise a string representing
+ * @return null if the test passes, otherwise a string representing
* the reason for the failure
- * @throws Exception
+ * @throws Exception
*/
public String runTest() throws Exception;
}
-
+
public static void testSingleCase(ITestCase testCase, int repetitions) {
String result = null;
for (int i = 0; i < repetitions && result == null; i++) {
@@ -39,7 +39,7 @@ public class ParallelTestSupport {
}
}
}
-
+
public static void testInParallel(ITestCase[] testCases, int repetitions) {
int numberOfThreads = testCases.length;
TestThread[] testThreads = new TestThread[numberOfThreads];
@@ -68,7 +68,7 @@ public class ParallelTestSupport {
}
}
}
-
+
private static class TestThread extends Thread {
private int index;
@@ -80,9 +80,9 @@ public class ParallelTestSupport {
this.testCase = testCase;
this.repetitions = repetitions;
}
-
+
public String failureReason = null;
-
+
@Override
public void run() {
for (int j = 0; j <= repetitions; j++) {
@@ -97,7 +97,7 @@ public class ParallelTestSupport {
return;
}
}
- }
+ }
}
-
+
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/TocModelSerializer.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/TocModelSerializer.java
index 267706934..2153d0c48 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/TocModelSerializer.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/TocModelSerializer.java
@@ -18,46 +18,46 @@ import org.eclipse.help.internal.base.HelpEvaluationContext;
public class TocModelSerializer {
private static final String EMPTY_STRING = "";
-
+
public static String serialize(IToc toc) {
StringBuffer buf = new StringBuffer();
buf.append("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
buf.append(serializeAux(toc, ""));
return buf.toString();
}
-
+
private static String serializeAux(IToc toc, String indent) {
if (!UAContentFilter.isFiltered(toc, HelpEvaluationContext.getContext())) {
StringBuffer buf = new StringBuffer();
buf.append(indent + "<toc\n");
buf.append(indent + " label=\"" + toc.getLabel() + "\"\n");
buf.append(indent + " href=\"" + toc.getHref() + "\">\n");
-
+
ITopic[] topics = toc.getTopics();
for (ITopic topic : topics) {
buf.append(serializeAux(topic, indent + " "));
}
-
+
buf.append(indent + "</toc>");
return buf.toString();
}
return EMPTY_STRING;
}
-
+
private static String serializeAux(ITopic topic, String indent) {
if (!UAContentFilter.isFiltered(topic, HelpEvaluationContext.getContext())) {
StringBuffer buf = new StringBuffer();
buf.append(indent + "<topic\n");
buf.append(indent + " label=\"" + topic.getLabel() + "\"\n");
buf.append(indent + " href=\"" + topic.getHref() + "\">\n");
-
+
ITopic[] subtopics = topic.getSubtopics();
for (ITopic subtopic : subtopics) {
buf.append(serializeAux(subtopic, indent + " "));
}
-
+
buf.append(indent + "</topic>\n");
- return buf.toString();
+ return buf.toString();
}
return EMPTY_STRING;
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilter.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilter.java
index 87f96607b..03f7084ee 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilter.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilter.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -27,9 +27,9 @@ public class CommentFilter implements IFilter {
public OutputStream filter(HttpServletRequest req, OutputStream out) {
return new OutFilter(out);
}
-
+
private class OutFilter extends OutputStream {
-
+
private OutputStream out;
private boolean preambleWritten = false;
@@ -44,9 +44,9 @@ public class CommentFilter implements IFilter {
String comment = "<!-- pre " + getCommentText() + " -->";
out.write(comment.getBytes());
}
- out.write(b);
+ out.write(b);
}
-
+
@Override
public void close() throws IOException {
String comment = "<!-- post " + getCommentText() + " -->";
@@ -54,11 +54,11 @@ public class CommentFilter implements IFilter {
out.close();
super.close();
}
-
+
}
-
+
protected String getCommentText() {
return "comment";
- }
+ }
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterOne.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterOne.java
index db7f6c16f..e9129b323 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterOne.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterOne.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterThree.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterThree.java
index 0ccb9768a..e8f70173c 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterThree.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterThree.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -16,7 +16,7 @@ package org.eclipse.ua.tests.help.webapp;
*/
public class CommentFilterThree extends CommentFilter {
-
+
@Override
protected String getCommentText() {
return "3";
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterTwo.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterTwo.java
index 3200a3855..2b5102c80 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterTwo.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterTwo.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -16,7 +16,7 @@ package org.eclipse.ua.tests.help.webapp;
*/
public class CommentFilterTwo extends CommentFilter {
-
+
@Override
protected String getCommentText() {
return "2";
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/MockServletRequest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/MockServletRequest.java
index 4b93abf69..4a19f407b 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/MockServletRequest.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/MockServletRequest.java
@@ -41,14 +41,14 @@ import javax.servlet.http.Part;
*/
public class MockServletRequest implements HttpServletRequest {
-
+
private Locale locale;
private Map<String, String[]> parameterMap = new HashMap<String, String[]>();
private Cookie[] cookies = new Cookie[0];
private String pathInfo = null;
public MockServletRequest() {
-
+
}
@Override
@@ -66,7 +66,7 @@ public class MockServletRequest implements HttpServletRequest {
public Cookie[] getCookies() {
return cookies;
}
-
+
public void setCookies(Cookie[] cookies) {
this.cookies = cookies;
}
@@ -111,7 +111,7 @@ public class MockServletRequest implements HttpServletRequest {
public String getPathInfo() {
return pathInfo;
}
-
+
public void setPathInfo(String info) {
this.pathInfo = info;
}
@@ -263,7 +263,7 @@ public class MockServletRequest implements HttpServletRequest {
public Locale getLocale() {
return locale;
}
-
+
public void setLocale(Locale locale) {
this.locale = locale;
}
@@ -436,13 +436,13 @@ public class MockServletRequest implements HttpServletRequest {
@Override
public void login(String username, String password) throws ServletException {
// TODO Auto-generated method stub
-
+
}
@Override
public void logout() throws ServletException {
// TODO Auto-generated method stub
-
+
}
@Override
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/MockServletResponse.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/MockServletResponse.java
index 058eedd57..480976540 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/MockServletResponse.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/MockServletResponse.java
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletResponse;
*/
public class MockServletResponse implements HttpServletResponse {
-
+
private List<Cookie> cookies = new ArrayList<Cookie>();
private String illegalCharactersFound = "";
@@ -53,7 +53,7 @@ public class MockServletResponse implements HttpServletResponse {
@Override
public void setCharacterEncoding(String charset) {
-
+
}
@Override
@@ -62,12 +62,12 @@ public class MockServletResponse implements HttpServletResponse {
@Override
public void setContentType(String type) {
-
+
}
@Override
public void setBufferSize(int size) {
-
+
}
@Override
@@ -77,12 +77,12 @@ public class MockServletResponse implements HttpServletResponse {
@Override
public void flushBuffer() throws IOException {
-
+
}
@Override
public void resetBuffer() {
-
+
}
@Override
@@ -92,12 +92,12 @@ public class MockServletResponse implements HttpServletResponse {
@Override
public void reset() {
-
+
}
@Override
public void setLocale(Locale loc) {
-
+
}
@Override
@@ -119,9 +119,9 @@ public class MockServletResponse implements HttpServletResponse {
}
cookies.add(cookie);
}
-
+
private void checkForIllegalCharacters(String value) {
- // Check for illegal characters
+ // Check for illegal characters
final String illegalChars = "()<>@,;:\\\"/[]?={} \t";
for (int i = 0; i < illegalChars.length(); i++) {
char ch = illegalChars.charAt(i);
@@ -168,69 +168,69 @@ public class MockServletResponse implements HttpServletResponse {
@Override
public void sendError(int sc, String msg) throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
public void sendError(int sc) throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
public void sendRedirect(String location) throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
public void setDateHeader(String name, long date) {
// TODO Auto-generated method stub
-
+
}
@Override
public void addDateHeader(String name, long date) {
// TODO Auto-generated method stub
-
+
}
@Override
public void setHeader(String name, String value) {
// TODO Auto-generated method stub
-
+
}
@Override
public void addHeader(String name, String value) {
// TODO Auto-generated method stub
-
+
}
@Override
public void setIntHeader(String name, int value) {
// TODO Auto-generated method stub
-
+
}
@Override
public void addIntHeader(String name, int value) {
// TODO Auto-generated method stub
-
+
}
@Override
public void setStatus(int sc) {
// TODO Auto-generated method stub
-
+
}
@Override
public void setStatus(int sc, String sm) {
// TODO Auto-generated method stub
-
+
}
-
+
public String getIllegalCharatersFound() {
return illegalCharactersFound;
}
@@ -262,8 +262,8 @@ public class MockServletResponse implements HttpServletResponse {
@Override
public void setContentLengthLong(long len) {
// TODO Auto-generated method stub
-
+
}
-
-
+
+
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/AllWebappServiceTests.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/AllWebappServiceTests.java
index 5a12012a2..71e3b510e 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/AllWebappServiceTests.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/AllWebappServiceTests.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/SchemaValidator.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/SchemaValidator.java
index e220db3ed..865c5b22e 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/SchemaValidator.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/SchemaValidator.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -32,7 +32,7 @@ public class SchemaValidator {
schema = factory.newSchema(new URL(schemaFile));
else
schema = factory.newSchema(new File(schemaFile));
-
+
Validator validator = schema.newValidator();
Source source = new StreamSource(uri);
try {
@@ -44,10 +44,10 @@ public class SchemaValidator {
} catch(Exception e) {
msg = "Exception e: " + e; //$NON-NLS-1$
}
-
+
return msg;
}
-
+
public static String testJSONSchema(String uri, String schemaFile) {
// TODO: Not yet implemented
return ""; //$NON-NLS-1$
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/ServicesTestUtils.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/ServicesTestUtils.java
index 096de8159..dad6b97fc 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/ServicesTestUtils.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/ServicesTestUtils.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -26,7 +26,7 @@ public class ServicesTestUtils extends RemoteTestUtils {
+ path + "?lang=" + locale);
return readFromURL(url);
}
-
+
public static String getLocalContent(String plugin, String path)
throws IOException {
String localContent = RemoteTestUtils.getLocalContent(plugin, path);
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TestFrame.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TestFrame.java
index dba2d9a0c..2975fa11e 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TestFrame.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TestFrame.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -26,17 +26,17 @@ public class TestFrame extends AbstractFrame {
public String getURL() {
return "/titlesearch/jsp/advanced/testFrame.jsp";
}
-
+
@Override
public int getLocation() {
return AbstractFrame.BELOW_CONTENT;
}
-
+
@Override
public String getSize() {
return "24";
}
-
+
@Override
public boolean isVisible() {
return Platform.getPreferencesService().getBoolean
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TestHelpToolbarFrame.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TestHelpToolbarFrame.java
index f525d93cd..9cacc8290 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TestHelpToolbarFrame.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TestHelpToolbarFrame.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -26,22 +26,22 @@ public class TestHelpToolbarFrame extends AbstractFrame {
public String getURL() {
return "/titlesearch/jsp/advanced/testHelpToolbarFrame.jsp";
}
-
+
@Override
public int getLocation() {
return AbstractFrame.HELP_TOOLBAR;
}
-
+
@Override
public String getSize() {
return "*";
}
-
+
@Override
public String getFrameAttributes() {
return "\"marginwidth=\"0\" marginheight=\"0\" frameborder=\"0\" scrolling=\"no\""; //$NON-NLS-1$
}
-
+
@Override
public boolean isVisible() {
return Platform.getPreferencesService().getBoolean
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchButton.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchButton.java
index cabff8a77..1e0b86fbc 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchButton.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchButton.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2009, 2015 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -41,12 +41,12 @@ public class TitleSearchButton extends AbstractButton {
}
return "Show Search Topic Title";
}
-
+
@Override
public String getJavaScriptURL() {
return "/titlesearch/script/titlesearch.js";
}
-
+
@Override
public boolean isAddedToToolbar(String toolbarName) {
boolean addButton = Platform.getPreferencesService().getBoolean
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchData.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchData.java
index 30120dec3..ca17e18d2 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchData.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchData.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -55,7 +55,7 @@ private void searchTopic(ITopic topic) {
&& topic.getHref() != null) {
SearchResult result = new SearchResult();
result.title = topic.getLabel();
- result.href = "../../../topic" + topic.getHref();
+ result.href = "../../../topic" + topic.getHref();
results.add(result);
}
ITopic[] topics = topic.getSubtopics();
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchView.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchView.java
index 2a0ab855d..5dd864c71 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchView.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchView.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -46,18 +46,18 @@ public class TitleSearchView extends AbstractView {
public String getURL() {
return "/titlesearch/jsp/advanced/";
}
-
+
@Override
public String getBasicURL() {
return "/titlesearch/jsp/basic/";
}
-
+
@Override
public boolean isVisible() {
return Platform.getPreferencesService().getBoolean
(UserAssistanceTestPlugin.getPluginId(), "extraView", false, null);
}
-
+
@Override
public boolean isVisibleBasic() {
return Platform.getPreferencesService().getBoolean

Back to the top