153: removed a few deprecations

Task-Url: #153
eclipse · Mar 4, 2022 · f3c2f19 · f3c2f19
1 parent 239a022
commit f3c2f19
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/...g.eclipse.xsemantics.runtime/src/org/eclipse/xsemantics/runtime/RuleApplicationTrace.java b/...g.eclipse.xsemantics.runtime/src/org/eclipse/xsemantics/runtime/RuleApplicationTrace.java
@@ -31,10 +31,10 @@ public class RuleApplicationTrace {
 
 	private static final Logger LOGGER = Logger.getLogger(RuleApplicationTrace.class);
 
-	protected List<Object> trace = new ArrayList<Object>();
+	protected List<Object> trace = new ArrayList<>();
 
 	public RuleApplicationTrace() {
-
+		// nothing to do
 	}
 
 	public void addToTrace(Object traceElement) {
@@ -97,16 +97,12 @@ protected RuleApplicationTrace performSafeDeepCloning() {
 		RuleApplicationTrace cloned = null;
 
 		try {
-			cloned = getClass().newInstance();
-		} catch (InstantiationException e) {
-			LOGGER.info(DEEP_CLONING, e);
-			return this;
-		} catch (IllegalAccessException e) {
+			cloned = getClass().getDeclaredConstructor().newInstance();
+		} catch (Exception e) {
 			LOGGER.info(DEEP_CLONING, e);
 			return this;
 		}
-
-		cloned.trace = new ArrayList<Object>();
+		cloned.trace = new ArrayList<>();
 		for (Object orig : trace) {
 			if (orig instanceof RuleApplicationTrace) {
 				cloned.trace.add(((RuleApplicationTrace)orig).performSafeDeepCloning());

diff --git a/...ics.dsl.tests/src/org/eclipse/xsemantics/dsl/tests/generator/XsemanticsCompilerTest.xtend b/...ics.dsl.tests/src/org/eclipse/xsemantics/dsl/tests/generator/XsemanticsCompilerTest.xtend
@@ -316,7 +316,7 @@ newArrayList("first", "second")
 			assertNoValidationErrors
 			// don't assume that the compiled system is the first one
 			val systemClass = getCompiledClass("my.test.ruleinvokations.System")
-			val obj = systemClass.newInstance
+			val obj = systemClass.getDeclaredConstructor().newInstance()
 			injector.injectMembers(obj)
 			obj.invoke("init")
 			instantiated.set(obj as XsemanticsRuntimeSystem)

diff --git a/....dsl.tests/src/org/eclipse/xsemantics/dsl/tests/runtime/XsemanticsRuntimeSystemTests.java b/....dsl.tests/src/org/eclipse/xsemantics/dsl/tests/runtime/XsemanticsRuntimeSystemTests.java
@@ -527,7 +527,7 @@ public void testGetEObjectWithEObject() {
 
 	@Test
 	public void testGetEObjectWithNonEObject() {
-		assertTrue(ts.getEObject(new Integer(10)) == null);
+		assertTrue(ts.getEObject(Integer.valueOf(10)) == null);
 	}
 
 	@Test