releng: Bug 552713: Support building of Trace Compass with Java 11
[Added] Bug 552713: Support building of Trace Compass with Java 11
Change-Id: I194ecd649a97e2b18899416955ddf939fdf6b584
Signed-off-by: Bernd Hufmann <Bernd.Hufmann@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/152091
Tested-by: CI Bot
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/152157
diff --git a/common/org.eclipse.tracecompass.common.core.tests/.settings/org.eclipse.jdt.core.prefs b/common/org.eclipse.tracecompass.common.core.tests/.settings/org.eclipse.jdt.core.prefs
index a525527..2406509 100644
--- a/common/org.eclipse.tracecompass.common.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/common/org.eclipse.tracecompass.common.core.tests/.settings/org.eclipse.jdt.core.prefs
@@ -27,12 +27,13 @@
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.deprecation=error
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
@@ -101,6 +102,7 @@
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
@@ -113,6 +115,7 @@
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
diff --git a/common/org.eclipse.tracecompass.common.core/annotations/java/lang/Boolean.eea b/common/org.eclipse.tracecompass.common.core/annotations/java/lang/Boolean.eea
new file mode 100644
index 0000000..2be2355
--- /dev/null
+++ b/common/org.eclipse.tracecompass.common.core/annotations/java/lang/Boolean.eea
@@ -0,0 +1,7 @@
+class java/lang/Boolean
+FALSE
+ Ljava/lang/Boolean;
+ L1java/lang/Boolean;
+TRUE
+ Ljava/lang/Boolean;
+ L1java/lang/Boolean;
diff --git a/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/trace/CTFStreamInputTest.java b/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/trace/CTFStreamInputTest.java
index 884f13a..0d2ecf6 100644
--- a/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/trace/CTFStreamInputTest.java
+++ b/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/trace/CTFStreamInputTest.java
@@ -149,7 +149,7 @@
public void testEquals2() throws CTFException {
s1 = new CTFStreamInput(new CTFStream(CtfTestTraceUtils.getTrace(testTrace)),
createFile());
- assertFalse(s1.equals(new Long(23L)));
+ assertFalse(s1.equals(Long.valueOf(23)));
}
diff --git a/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/trace/CTFTraceTest.java b/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/trace/CTFTraceTest.java
index 8a4dfd2..e0dadc3 100644
--- a/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/trace/CTFTraceTest.java
+++ b/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/trace/CTFTraceTest.java
@@ -188,7 +188,7 @@
*/
@Test
public void testGetStream() {
- Long id = new Long(0L);
+ Long id = 0L;
ICTFStream result = fixture.getStream(id);
assertNotNull(result);
}
@@ -337,7 +337,7 @@
String name = "";
CTFClock ctfClock = new CTFClock();
ctfClock.addAttribute("name", "Bob");
- ctfClock.addAttribute("pi", new Double(java.lang.Math.PI));
+ ctfClock.addAttribute("pi", Double.valueOf(java.lang.Math.PI));
fixture.addClock(name, ctfClock);
CTFClock result = fixture.getClock(name);
diff --git a/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/types/EventDeclarationTest.java b/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/types/EventDeclarationTest.java
index 2118a48..e5f8504 100644
--- a/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/types/EventDeclarationTest.java
+++ b/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/types/EventDeclarationTest.java
@@ -350,7 +350,7 @@
@Test
public void testEquals2() {
e1 = LostEventDeclaration.INSTANCE;
- assertFalse(e1.equals(new Long(23L)));
+ assertFalse(e1.equals(Long.valueOf(23L)));
}
@Test
diff --git a/tmf/org.eclipse.tracecompass.tmf.chart.ui/src/org/eclipse/tracecompass/internal/tmf/chart/ui/data/ChartRangeMap.java b/tmf/org.eclipse.tracecompass.tmf.chart.ui/src/org/eclipse/tracecompass/internal/tmf/chart/ui/data/ChartRangeMap.java
index a992fb4..81e32a9 100644
--- a/tmf/org.eclipse.tracecompass.tmf.chart.ui/src/org/eclipse/tracecompass/internal/tmf/chart/ui/data/ChartRangeMap.java
+++ b/tmf/org.eclipse.tracecompass.tmf.chart.ui/src/org/eclipse/tracecompass/internal/tmf/chart/ui/data/ChartRangeMap.java
@@ -12,6 +12,7 @@
import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
import java.math.BigDecimal;
+import java.math.RoundingMode;
/**
* Simple class that maps two {@link ChartRange} together. The first one is the
@@ -159,7 +160,7 @@
BigDecimal internalValue = value
.subtract(external.getMinimum())
.multiply(internal.getDelta())
- .divide(external.getDelta(), BIG_DECIMAL_DIVISION_SCALE, BigDecimal.ROUND_DOWN)
+ .divide(external.getDelta(), BIG_DECIMAL_DIVISION_SCALE, RoundingMode.DOWN)
.add(internal.getMinimum());
return checkNotNull(internalValue);
@@ -189,7 +190,7 @@
BigDecimal externalValue = (new BigDecimal(number.toString()))
.subtract(internal.getMinimum())
.multiply(external.getDelta())
- .divide(internal.getDelta(), BIG_DECIMAL_DIVISION_SCALE, BigDecimal.ROUND_DOWN)
+ .divide(internal.getDelta(), BIG_DECIMAL_DIVISION_SCALE, RoundingMode.DOWN)
.add(external.getMinimum());
return checkNotNull(externalValue);
diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/dataprovider/DataProviderParameterTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/dataprovider/DataProviderParameterTest.java
index d260328..711fc01 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/dataprovider/DataProviderParameterTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/dataprovider/DataProviderParameterTest.java
@@ -37,9 +37,9 @@
private static final String CUSTOM_KEY = "MyKey";
private static Map<String, Object> fParameters = new HashMap<>();
- private List<?> fLongList = Arrays.asList(new Long(1), new Long(2), new Long(3));
- private List<?> fIntList = Arrays.asList(new Integer(1), new Integer(2), new Integer(3));
- private List<?> fMixedList = Arrays.asList(new Integer(1), new Long(2), new Integer(3));
+ private List<?> fLongList = Arrays.asList(Long.valueOf(1), Long.valueOf(2), Long.valueOf(3));
+ private List<?> fIntList = Arrays.asList(Integer.valueOf(1), Integer.valueOf(2), Integer.valueOf(3));
+ private List<?> fMixedList = Arrays.asList(Integer.valueOf(1), Long.valueOf(2), Integer.valueOf(3));
private String fWrongParameter = "Unsupported";
/**
@@ -119,12 +119,12 @@
*/
@Test
public void testExtractBoolean() {
- fParameters.put(CUSTOM_KEY, new Boolean(true));
+ fParameters.put(CUSTOM_KEY, Boolean.TRUE);
Boolean extractedBoolean = DataProviderParameterUtils.extractBoolean(fParameters, CUSTOM_KEY);
assertNotNull(extractedBoolean);
assertTrue(extractedBoolean);
- fParameters.put(CUSTOM_KEY, new Boolean(false));
+ fParameters.put(CUSTOM_KEY, Boolean.FALSE);
extractedBoolean = DataProviderParameterUtils.extractBoolean(fParameters, CUSTOM_KEY);
assertNotNull(extractedBoolean);
assertFalse(extractedBoolean);
diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/location/TmfLocationTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/location/TmfLocationTest.java
index 91eae78..9b8decf 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/location/TmfLocationTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/location/TmfLocationTest.java
@@ -20,6 +20,7 @@
import static org.junit.Assert.assertTrue;
import java.nio.ByteBuffer;
+import java.util.Objects;
import org.eclipse.tracecompass.internal.tmf.core.trace.experiment.TmfExperimentLocation;
import org.eclipse.tracecompass.internal.tmf.core.trace.experiment.TmfLocationArray;
@@ -168,8 +169,8 @@
assertTrue("equals", fLocation3.equals(fLocation3));
assertTrue("equals", fExpLocation.equals(fExpLocation));
- assertTrue("equals", !fLocation2.equals(fLocation3));
- assertTrue("equals", !fLocation3.equals(fLocation2));
+ assertFalse("equals", Objects.equals(fLocation2, fLocation3));
+ assertFalse("equals", Objects.equals(fLocation3, fLocation2));
TmfLocationArray locationArray1 = new TmfLocationArray(aLocationArray, 2, fLocation3, 5);
TmfExperimentLocation expLocation1 = new TmfExperimentLocation(locationArray1);
TmfLocationArray locationArray2 = new TmfLocationArray(aLocationArray, 2, fLocation2, 4);
diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/TmfAnalysisManager.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/TmfAnalysisManager.java
index fdaabff..ba07f02 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/TmfAnalysisManager.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/TmfAnalysisManager.java
@@ -14,6 +14,7 @@
import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
+import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -22,6 +23,7 @@
import java.util.Set;
import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.tracecompass.internal.tmf.core.Activator;
import org.eclipse.tracecompass.internal.tmf.core.analysis.TmfAnalysisModuleSources;
import org.eclipse.tracecompass.internal.tmf.core.analysis.TmfAnalysisParameterProviders;
@@ -203,15 +205,15 @@
List<Class<? extends IAnalysisParameterProvider>> parameterProviders = checkNotNull(fParameterProviders.get(module.getId()));
for (Class<? extends IAnalysisParameterProvider> providerClass : parameterProviders) {
try {
- IAnalysisParameterProvider provider = fParamProviderInstances.get(providerClass);
+ @Nullable IAnalysisParameterProvider provider = fParamProviderInstances.get(providerClass);
if (provider == null) {
- provider = providerClass.newInstance();
+ provider = providerClass.getConstructor().newInstance();
fParamProviderInstances.put(providerClass, provider);
}
if (provider.appliesToTrace(trace)) {
providerSet.add(provider);
}
- } catch (IllegalArgumentException | SecurityException | InstantiationException | IllegalAccessException e) {
+ } catch (IllegalArgumentException | SecurityException | InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
Activator.logError(Messages.TmfAnalysisManager_ErrorParameterProvider, e);
}
}
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/views/PalettedPresentationProvider.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/views/PalettedPresentationProvider.java
index bb3438f..a587c8c 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/views/PalettedPresentationProvider.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/views/PalettedPresentationProvider.java
@@ -53,7 +53,8 @@
private int getColor(TimeEvent event) {
List<@NonNull RGBAColor> list = getPalette().get();
- return list.get((int) Math.floorMod((event.getValue() & ((1L << Integer.SIZE) - 1)), list.size())).toInt();
+ int floor = Long.valueOf(Math.floorMod((event.getValue() & ((1L << Integer.SIZE) - 1)), list.size())).intValue();
+ return list.get(floor).toInt();
}
@Override
