Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Hammer2019-12-06 18:09:23 +0000
committerKarsten Thoms2019-12-10 22:54:35 +0000
commit21f09a48d685553bbb46c3e447e7e8bd36f43ed4 (patch)
tree1037771d29607348cd270757fdc33c0bca15fbfe
parent88d043d5c9b6c8cd889d1868de51ec099cb40d0c (diff)
downloadeclipse.platform.ua-21f09a48d685553bbb46c3e447e7e8bd36f43ed4.tar.gz
eclipse.platform.ua-21f09a48d685553bbb46c3e447e7e8bd36f43ed4.tar.xz
eclipse.platform.ua-21f09a48d685553bbb46c3e447e7e8bd36f43ed4.zip
Remove unnecessary type specifications
Since Java 7 the diamond operator can be used instead of explicit type parameters. Change-Id: I09b387aae76e2bed342456edccbc83c1bf006dac Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/PrintData.java2
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/SearchData.java2
-rw-r--r--org.eclipse.help/src/org/eclipse/help/internal/UAElementFactory.java2
-rw-r--r--org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/composite/TestPersistence.java4
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/ExtraDirTest.java2
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/MetaKeywords.java2
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java2
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchCheatsheet.java2
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchIntro.java2
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchRanking.java2
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchTestUtils.java2
-rw-r--r--org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/contentdetect/ContentDetectorTest.java2
12 files changed, 13 insertions, 13 deletions
diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/PrintData.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/PrintData.java
index 5e5eedf6f..8a185907e 100644
--- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/PrintData.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/PrintData.java
@@ -296,7 +296,7 @@ public class PrintData extends RequestData {
*/
public void generateContent(Writer out) throws IOException {
int topicsGenerated = 0;
- generateContent(getTopic(), null, topicsGenerated, new HashSet<String>(), out);
+ generateContent(getTopic(), null, topicsGenerated, new HashSet<>(), out);
}
/*
diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/SearchData.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/SearchData.java
index b41de42b9..7e3cbd385 100644
--- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/SearchData.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/SearchData.java
@@ -463,7 +463,7 @@ public class SearchData extends ActivitiesData {
String fieldSearchStr = request.getParameter("fieldSearch"); //$NON-NLS-1$
boolean fieldSearch = fieldSearchStr != null ? Boolean.parseBoolean(
fieldSearchStr) : false;
- return new SearchQuery(searchWord == null ? "" : searchWord, fieldSearch, new ArrayList<String>(), //$NON-NLS-1$
+ return new SearchQuery(searchWord == null ? "" : searchWord, fieldSearch, new ArrayList<>(), //$NON-NLS-1$
getLocale());
}
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/UAElementFactory.java b/org.eclipse.help/src/org/eclipse/help/internal/UAElementFactory.java
index 43efd2371..15e142d2f 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/UAElementFactory.java
+++ b/org.eclipse.help/src/org/eclipse/help/internal/UAElementFactory.java
@@ -77,7 +77,7 @@ public class UAElementFactory {
private static final Map<String, Class<?>> classByElementName;
static {
- classByElementName = Collections.synchronizedMap(new HashMap<String, Class<?>>());
+ classByElementName = Collections.synchronizedMap(new HashMap<>());
classByElementName.put(Anchor.NAME, Anchor.class);
classByElementName.put(Include.NAME, Include.class);
classByElementName.put(Toc.NAME, Toc.class);
diff --git a/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/composite/TestPersistence.java b/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/composite/TestPersistence.java
index 9d2158ec0..e5a77f68c 100644
--- a/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/composite/TestPersistence.java
+++ b/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/composite/TestPersistence.java
@@ -102,7 +102,7 @@ public class TestPersistence {
helper.saveCompositeState(model, null);
createCompositeCheatSheet();
- model.loadState(new Hashtable<String, String>());
+ model.loadState(new Hashtable<>());
assertEquals(ICompositeCheatSheetTask.IN_PROGRESS, task1.getState());
assertEquals(ICompositeCheatSheetTask.COMPLETED, task2.getState());
}
@@ -132,7 +132,7 @@ public class TestPersistence {
helper.saveCompositeState(model, null);
createCompositeCheatSheet();
- model.loadState(new Hashtable<String, String>());
+ model.loadState(new Hashtable<>());
editor1.setInput(task1, model.getTaskMemento(task1.getId()));
editor2.setInput(task2, model.getTaskMemento(task2.getId()));
assertEquals(value1, editor1.getValue());
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/ExtraDirTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/ExtraDirTest.java
index 254e991b6..e97ed52fe 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/ExtraDirTest.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/ExtraDirTest.java
@@ -151,7 +151,7 @@ public class ExtraDirTest {
// run test
final Set<String> unexpectedHrefs = new HashSet<>();
- ISearchQuery query = new SearchQuery(searchWord, false, new ArrayList<String>(), Platform.getNL());
+ ISearchQuery query = new SearchQuery(searchWord, false, new ArrayList<>(), Platform.getNL());
SearchResults collector = new SearchResults(workingSets, 500, Platform.getNL());
BaseHelpSystem.getSearchManager().search(query, collector, new NullProgressMonitor());
SearchHit[] hits = collector.getSearchHits();
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/MetaKeywords.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/MetaKeywords.java
index 6d687a8df..a2343068d 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/MetaKeywords.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/MetaKeywords.java
@@ -63,7 +63,7 @@ public class MetaKeywords {
}
private SearchHit[] getResultDescriptions(String searchWord, String nl) {
- ISearchQuery query = new SearchQuery(searchWord, false, new ArrayList<String>(), nl);
+ ISearchQuery query = new SearchQuery(searchWord, false, new ArrayList<>(), nl);
SearchResults collector = new SearchResults(null, 500, nl);
BaseHelpSystem.getSearchManager().search(query, collector, new NullProgressMonitor());
return collector.getSearchHits();
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java
index 01323cc4b..e701dbb17 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java
@@ -235,7 +235,7 @@ public class PrebuiltIndexCompatibility {
if ("file".equals(resolved.getProtocol())) { //$NON-NLS-1$
String filePath = resolved.getFile();
QueryBuilder queryBuilder = new QueryBuilder("eclipse", new AnalyzerDescriptor("en-us"));
- Query luceneQuery = queryBuilder.getLuceneQuery(new ArrayList<String>() , false);
+ Query luceneQuery = queryBuilder.getLuceneQuery(new ArrayList<>() , false);
IndexSearcher searcher;
try (Directory luceneDirectory = new NIOFSDirectory(new File(filePath).toPath())) {
searcher = new IndexSearcher(DirectoryReader.open(luceneDirectory));
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchCheatsheet.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchCheatsheet.java
index e25da1584..93a7a1fe5 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchCheatsheet.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchCheatsheet.java
@@ -31,7 +31,7 @@ import org.junit.Test;
public class SearchCheatsheet {
public SearchHit[] findHits(String searchWord) {
- ISearchQuery query = new SearchQuery(searchWord, false, new ArrayList<String>(), Platform.getNL());
+ ISearchQuery query = new SearchQuery(searchWord, false, new ArrayList<>(), Platform.getNL());
SearchResults collector = new SearchResults(null, 10, Platform.getNL());
BaseHelpSystem.getSearchManager().search(query, collector, new NullProgressMonitor());
return collector.getSearchHits();
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchIntro.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchIntro.java
index 480251117..33bf8718c 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchIntro.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchIntro.java
@@ -30,7 +30,7 @@ import org.junit.Test;
public class SearchIntro {
public SearchHit[] findHits(String searchWord) {
- ISearchQuery query = new SearchQuery(searchWord, false, new ArrayList<String>(), Platform.getNL());
+ ISearchQuery query = new SearchQuery(searchWord, false, new ArrayList<>(), Platform.getNL());
SearchResults collector = new SearchResults(null, 10, Platform.getNL());
BaseHelpSystem.getSearchManager().search(query, collector, new NullProgressMonitor());
return collector.getSearchHits();
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchRanking.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchRanking.java
index 3c71ede30..ca6a6982e 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchRanking.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchRanking.java
@@ -31,7 +31,7 @@ import org.junit.Test;
public class SearchRanking {
public SearchHit[] findHits(String searchWord) {
- ISearchQuery query = new SearchQuery(searchWord, false, new ArrayList<String>(), Platform.getNL());
+ ISearchQuery query = new SearchQuery(searchWord, false, new ArrayList<>(), Platform.getNL());
SearchResults collector = new SearchResults(null, 10, Platform.getNL());
BaseHelpSystem.getSearchManager().search(query, collector, new NullProgressMonitor());
return collector.getSearchHits();
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 5818f8b36..566b39dbd 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
@@ -98,7 +98,7 @@ public class SearchTestUtils {
public static SearchHit[] getSearchHits(String searchWord, String nl) {
SearchHit[] hits;
- ISearchQuery query = new SearchQuery(searchWord, false, new ArrayList<String>(), nl);
+ ISearchQuery query = new SearchQuery(searchWord, false, new ArrayList<>(), nl);
SearchResults collector = new SearchResults(null, 500, nl);
BaseHelpSystem.getSearchManager().search(query, collector, new NullProgressMonitor());
hits = collector.getSearchHits();
diff --git a/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/contentdetect/ContentDetectorTest.java b/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/contentdetect/ContentDetectorTest.java
index 045d9f230..a638ec969 100644
--- a/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/contentdetect/ContentDetectorTest.java
+++ b/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/contentdetect/ContentDetectorTest.java
@@ -47,7 +47,7 @@ public class ContentDetectorTest {
@Test
public void testContributorSaveNoNames() {
ContentDetectHelper helper = new ContentDetectHelper();
- helper.saveContributors(new HashSet<String>());
+ helper.saveContributors(new HashSet<>());
assertTrue(helper.getContributors().size() == 0);
}

Back to the top