diff --git a/analyses/org.eclipse.tracecompass.incubator.kernel.core.tests/src/org/eclipse/tracecompass/incubator/kernel/core/io/tests/AbstractTestInputOutput.java b/analyses/org.eclipse.tracecompass.incubator.kernel.core.tests/src/org/eclipse/tracecompass/incubator/kernel/core/io/tests/AbstractTestInputOutput.java index 2921d78e5..59d5cb440 100644 --- a/analyses/org.eclipse.tracecompass.incubator.kernel.core.tests/src/org/eclipse/tracecompass/incubator/kernel/core/io/tests/AbstractTestInputOutput.java +++ b/analyses/org.eclipse.tracecompass.incubator.kernel.core.tests/src/org/eclipse/tracecompass/incubator/kernel/core/io/tests/AbstractTestInputOutput.java @@ -32,7 +32,6 @@ import org.eclipse.tracecompass.tmf.core.exceptions.TmfTraceException; import org.eclipse.tracecompass.tmf.core.signal.TmfTraceOpenedSignal; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; -import org.eclipse.tracecompass.tmf.core.trace.TmfTrace; import org.eclipse.tracecompass.tmf.core.trace.TmfTraceManager; import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils; import org.junit.After; @@ -143,7 +142,7 @@ public void setUp() { } deleteSuppFiles(trace); - ((TmfTrace) trace).traceOpened(new TmfTraceOpenedSignal(this, trace, null)); + trace.traceOpened(new TmfTraceOpenedSignal(this, trace, null)); fTrace = trace; /* Start the kernel analysis module */ diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/.settings/org.eclipse.jdt.core.prefs b/callstack/org.eclipse.tracecompass.incubator.analysis.core/.settings/org.eclipse.jdt.core.prefs index 9b22a6801..4983c1176 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/.settings/org.eclipse.jdt.core.prefs +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,5 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.builder.annotationPath.allLocations=disabled org.eclipse.jdt.core.codeComplete.argumentPrefixes= org.eclipse.jdt.core.codeComplete.argumentSuffixes= org.eclipse.jdt.core.codeComplete.fieldPrefixes=f @@ -15,9 +16,12 @@ org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonN org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= +org.eclipse.jdt.core.compiler.annotation.notowning=org.eclipse.jdt.annotation.NotOwning org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled +org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Owning +org.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 @@ -27,12 +31,14 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate 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.annotatedTypeArgumentToUnannotated=info 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 @@ -48,8 +54,10 @@ org.eclipse.jdt.core.compiler.problem.forbiddenReference=error org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error +org.eclipse.jdt.core.compiler.problem.incompatibleOwningContract=warning org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error +org.eclipse.jdt.core.compiler.problem.insufficientResourceAnalysis=warning org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled @@ -99,17 +107,23 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info 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=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled +org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info 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 @@ -117,6 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverridin org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=error org.eclipse.jdt.core.compiler.problem.unusedLabel=error +org.eclipse.jdt.core.compiler.problem.unusedLambdaParameter=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=error org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore org.eclipse.jdt.core.compiler.problem.unusedParameter=error diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/internal/analysis/core/model/CompositeHostModel.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/internal/analysis/core/model/CompositeHostModel.java index 355abee6d..99db4019d 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/internal/analysis/core/model/CompositeHostModel.java +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/internal/analysis/core/model/CompositeHostModel.java @@ -110,19 +110,20 @@ public Collection getSamplingData(int tid, long start, long @Override public int getProcessId(int tid, long t) { - Integer pid = fKernelModules.stream() + Optional pid = fKernelModules.stream() .map(module -> KernelThreadInformationProvider.getProcessId(module, tid, t)) .filter(Objects::nonNull) - .findFirst().orElse(null); - return pid == null ? IHostModel.UNKNOWN_TID : (int) pid; + .findFirst(); + return pid.isEmpty() ? IHostModel.UNKNOWN_TID : pid.get(); } @Override public @Nullable String getExecName(int tid, long t) { - return fKernelModules.stream() + Optional execName = fKernelModules.stream() .map(module -> KernelThreadInformationProvider.getExecutableName(module, tid)) .filter(Objects::nonNull) - .findFirst().orElse(null); + .findFirst(); + return execName.isPresent() ? execName.get() : null; } /** diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/instrumented/provider/FlameChartDataProviderFactory.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/instrumented/provider/FlameChartDataProviderFactory.java index 0b27a49ab..386dde1db 100644 --- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/instrumented/provider/FlameChartDataProviderFactory.java +++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/instrumented/provider/FlameChartDataProviderFactory.java @@ -73,7 +73,7 @@ public class FlameChartDataProviderFactory implements IDataProviderFactory { // The trace can be an experiment, so we need to know if there are multiple // analysis modules with the same ID Iterable modules = TmfTraceUtils.getAnalysisModulesOfClass(trace, IFlameChartProvider.class); - Iterable filteredModules = Iterables.filter(modules, m -> ((IAnalysisModule) m).getId().equals(secondaryId)); + Iterable filteredModules = Iterables.filter(modules, m -> m.getId().equals(secondaryId)); Iterator iterator = filteredModules.iterator(); if (iterator.hasNext()) { IFlameChartProvider module = iterator.next(); @@ -82,7 +82,7 @@ public class FlameChartDataProviderFactory implements IDataProviderFactory { // try with individual traces return null; } - ((IAnalysisModule) module).schedule(); + module.schedule(); return new FlameChartDataProvider(trace, module, secondaryId); } return null; diff --git a/common/org.eclipse.tracecompass.incubator.releng-site/pom.xml b/common/org.eclipse.tracecompass.incubator.releng-site/pom.xml index 43c7ad130..92469d34b 100644 --- a/common/org.eclipse.tracecompass.incubator.releng-site/pom.xml +++ b/common/org.eclipse.tracecompass.incubator.releng-site/pom.xml @@ -65,6 +65,17 @@ + + sign-update-site + + + + org.eclipse.tycho + tycho-gpg-plugin + + + + diff --git a/pom.xml b/pom.xml index da3133126..5476d701c 100644 --- a/pom.xml +++ b/pom.xml @@ -50,8 +50,8 @@ 17 17 - 4.0.3 - 4.0.3 + 4.0.11 + 4.0.11 true scm:git:git://git.eclipse.org/gitroot/tracecompass.incubator/org.eclipse.tracecompass.incubator.git 1.4.2 @@ -465,6 +465,23 @@ + + org.eclipse.tycho + tycho-gpg-plugin + ${tycho-version} + + + pgpsigner + + sign-p2-artifacts + + + FDA6044E56578104 + false + + + + org.eclipse.tycho tycho-compiler-plugin diff --git a/rcp/org.eclipse.tracecompass.incubator.rcp.product/pom.xml b/rcp/org.eclipse.tracecompass.incubator.rcp.product/pom.xml index b244e19b1..6a9a70df7 100644 --- a/rcp/org.eclipse.tracecompass.incubator.rcp.product/pom.xml +++ b/rcp/org.eclipse.tracecompass.incubator.rcp.product/pom.xml @@ -115,6 +115,10 @@ repository + + org.eclipse.tycho + tycho-gpg-plugin +