Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2018-02-07 16:42:21 +0000
committerAlexander Kurtakov2018-02-07 17:11:44 +0000
commit9f2a9d2fb6a39c9e7b82eac18746ec17de6d8148 (patch)
tree240b2d9b4857d1d8bcf87c02735b01846eb340d5 /examples
parentd32b6ea3ad024730acd4d7d47735e773558f5e30 (diff)
downloadeclipse.platform.team-9f2a9d2fb6a39c9e7b82eac18746ec17de6d8148.tar.gz
eclipse.platform.team-9f2a9d2fb6a39c9e7b82eac18746ec17de6d8148.tar.xz
eclipse.platform.team-9f2a9d2fb6a39c9e7b82eac18746ec17de6d8148.zip
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>
Diffstat (limited to 'examples')
-rw-r--r--examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureViewer.java37
1 files changed, 10 insertions, 27 deletions
diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureViewer.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureViewer.java
index cf3613fd1..e792a4d76 100644
--- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureViewer.java
+++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureViewer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 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
@@ -101,15 +101,10 @@ public class XMLStructureViewer extends StructureDiffViewer {
final ArrayList originalTree=
new ArrayList(
Arrays.asList(parent.getChildren()));
- Arrays.sort(elements, new Comparator() {
- @Override
- public int compare(Object a, Object b) {
- return XMLSorter.this.compare(
- (DiffNode) a,
- (DiffNode) b,
- originalTree);
- }
- });
+ Arrays.sort(elements, (a, b) -> XMLSorter.this.compare(
+ (DiffNode) a,
+ (DiffNode) b,
+ originalTree));
return;
}
}
@@ -325,11 +320,7 @@ public class XMLStructureViewer extends StructureDiffViewer {
action.setEnabled(false);
} else {
String oldId= (String) idmapHM.get(signature);
- if (oldId
- .startsWith(
- (new Character(XMLStructureCreator
- .ID_TYPE_BODY))
- .toString()))
+ if (oldId.startsWith((Character.valueOf(XMLStructureCreator.ID_TYPE_BODY)).toString()))
oldId= oldId.substring(1);
action.setText(MessageFormat.format("{0} {1}", XMLCompareMessages.XMLStructureViewer_action_setId_text2, oldId)); //$NON-NLS-1$
action.setEnabled(true);
@@ -440,19 +431,11 @@ public class XMLStructureViewer extends StructureDiffViewer {
XMLNode textNode= (XMLNode) fDiffNode.getId();
XMLNode idelem= textNode.getParent();
XMLNode elem= idelem.getParent();
- String signature=
- elem.getSignature().substring(
- 0,
- elem.getSignature().indexOf(
- XMLStructureCreator.SIGN_ELEMENT));
+ String signature = elem.getSignature().substring(0,
+ elem.getSignature().indexOf(XMLStructureCreator.SIGN_ELEMENT));
String idname= idelem.getOrigId();
- idname=
- idname.substring(
- 0,
- idname.indexOf(XMLStructureCreator.ID_SEPARATOR));
- idname=
- Character.valueOf(XMLStructureCreator.ID_TYPE_BODY)
- + idname;
+ idname = idname.substring(0, idname.indexOf(XMLStructureCreator.ID_SEPARATOR));
+ idname = Character.valueOf(XMLStructureCreator.ID_TYPE_BODY) + idname;
idmapHM.put(signature, idname);
XMLPlugin.getDefault().setIdMaps(
fIdMaps,

Back to the top