Bug 530854 - Move away of methods deprecated in Java 9

Number constructors and Class.newInstance. Some small cleanups
(generification, lambdas) in surrounding code.

Change-Id: I62bab4119a98a7b5df560b8c9247f79fdfa8da03
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

1 files changed, 5 insertions, 11 deletions

diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/TextMergeViewerTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/TextMergeViewerTest.java
index 9cd4cfd39..0779899d1 100644
--- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/TextMergeViewerTest.java
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/TextMergeViewerTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2015 IBM Corporation and others.
+ * Copyright (c) 2006, 2018 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
@@ -235,11 +235,7 @@ public class TextMergeViewerTest extends TestCase {
 	}
 
 	protected void saveViewerContents() {
-		try {
-			viewer.save(new NullProgressMonitor());
-		} catch (CoreException e) {
-			throw new WrappedException(e);
-		}
+		viewer.flush(new NullProgressMonitor());
 	}
 
 	protected IDocument getDocument(boolean left) {
@@ -404,7 +400,7 @@ public class TextMergeViewerTest extends TestCase {
 					IMergeViewerTestAdapter ta = (IMergeViewerTestAdapter) adapter;
 					assertEquals(ta.getChangesCount(), 1);
 
-					Map filters = new HashMap();
+					Map<String, ICompareFilter> filters = new HashMap<>();
 					filters.put("filter.id", new ICompareFilter() {
 						public void setInput(Object input, Object ancestor,
 								Object left, Object right) {
@@ -423,15 +419,13 @@ public class TextMergeViewerTest extends TestCase {
 
 							if (thisContributor.equals(Character.valueOf('L'))) {
 								assertEquals(thisLine, leftString);
-								assertEquals(otherContributor, new Character(
-										'R'));
+								assertEquals(otherContributor, Character.valueOf('R'));
 								assertEquals(otherLine, rightString);
 							} else {
 								assertEquals(thisContributor,
 										Character.valueOf('R'));
 								assertEquals(thisLine, rightString);
-								assertEquals(otherContributor, new Character(
-										'L'));
+								assertEquals(otherContributor, Character.valueOf('L'));
 								assertEquals(otherLine, leftString);
 							}