Skip to content

Commit c65f3a4

Browse files
committed
releng: Make Trace Compass compatible with Java 21 and Guava 33.4
Change use of deprecated methods from error to warning in o.e.tc.common.core to allow use of deprecated Thread.getId() in TraceCompassLogUtils. Replace use of deprecated URL(String, String, String) constructor. Replace use of Charsets deprecated in Guava 33.4 with java.nio.charset.StandardCharsets. Signed-off-by: Patrick Tasse <[email protected]>
1 parent ca22524 commit c65f3a4

File tree

5 files changed

+21
-14
lines changed
  • common/org.eclipse.tracecompass.common.core
  • rcp/org.eclipse.tracecompass.rcp.ui/src/org/eclipse/tracecompass/internal/tracing/rcp/ui
  • statesystem/org.eclipse.tracecompass.statesystem.core/src/org/eclipse/tracecompass/statesystem/core/snapshot
  • tmf/org.eclipse.tracecompass.tmf.ui.tests/widgetStubs/org/eclipse/tracecompass/tmf/ui/tests/uml2sd/load

5 files changed

+21
-14
lines changed

common/org.eclipse.tracecompass.common.core/.settings/org.eclipse.jdt.core.prefs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.builder.annotationPath.allLocations=disabled
23
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
34
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
45
org.eclipse.jdt.core.codeComplete.fieldPrefixes=f
@@ -15,9 +16,12 @@ org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonN
1516
org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
1617
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
1718
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
19+
org.eclipse.jdt.core.compiler.annotation.notowning=org.eclipse.jdt.annotation.NotOwning
1820
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
1921
org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
2022
org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
23+
org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Owning
24+
org.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabled
2125
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
2226
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
2327
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
@@ -34,7 +38,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
3438
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
3539
org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
3640
org.eclipse.jdt.core.compiler.problem.deadCode=warning
37-
org.eclipse.jdt.core.compiler.problem.deprecation=error
41+
org.eclipse.jdt.core.compiler.problem.deprecation=warning
3842
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
3943
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
4044
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
@@ -51,8 +55,10 @@ org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
5155
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
5256
org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
5357
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
58+
org.eclipse.jdt.core.compiler.problem.incompatibleOwningContract=warning
5459
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
5560
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
61+
org.eclipse.jdt.core.compiler.problem.insufficientResourceAnalysis=warning
5662
org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
5763
org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
5864
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
@@ -127,6 +133,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverridin
127133
org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
128134
org.eclipse.jdt.core.compiler.problem.unusedImport=error
129135
org.eclipse.jdt.core.compiler.problem.unusedLabel=error
136+
org.eclipse.jdt.core.compiler.problem.unusedLambdaParameter=warning
130137
org.eclipse.jdt.core.compiler.problem.unusedLocal=error
131138
org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
132139
org.eclipse.jdt.core.compiler.problem.unusedParameter=error

common/org.eclipse.tracecompass.common.core/src/org/eclipse/tracecompass/common/core/process/ProcessUtils.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2016 EfficiOS Inc., Alexandre Montplaisir
2+
* Copyright (c) 2016, 2025 EfficiOS Inc., Alexandre Montplaisir and others.
33
*
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
@@ -16,6 +16,7 @@
1616
import java.io.BufferedReader;
1717
import java.io.IOException;
1818
import java.io.InputStreamReader;
19+
import java.nio.charset.StandardCharsets;
1920
import java.util.LinkedList;
2021
import java.util.List;
2122
import java.util.logging.Level;
@@ -32,8 +33,6 @@
3233
import org.eclipse.tracecompass.common.core.log.TraceCompassLogUtils;
3334
import org.eclipse.tracecompass.internal.common.core.Activator;
3435

35-
import com.google.common.base.Charsets;
36-
3736
/**
3837
* Common utility methods for launching external processes and retrieving their
3938
* output.
@@ -68,7 +67,7 @@ private ProcessUtils() {}
6867
builder.redirectErrorStream(true);
6968

7069
Process p = builder.start();
71-
try (BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream(), Charsets.UTF_8));) {
70+
try (BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream(), StandardCharsets.UTF_8));) {
7271
List<String> output = new LinkedList<>();
7372

7473
/*
@@ -175,7 +174,7 @@ public static List<String> getOutputFromCommandCancellable(List<String> command,
175174
cancellerThread = new Thread(cancellerRunnable);
176175
cancellerThread.start();
177176

178-
try (BufferedReader stdoutReader = new BufferedReader(new InputStreamReader(p.getInputStream(), Charsets.UTF_8));) {
177+
try (BufferedReader stdoutReader = new BufferedReader(new InputStreamReader(p.getInputStream(), StandardCharsets.UTF_8));) {
179178

180179
List<String> lines = readerFunction.readOutput(stdoutReader, monitor);
181180

rcp/org.eclipse.tracecompass.rcp.ui/src/org/eclipse/tracecompass/internal/tracing/rcp/ui/Application.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**********************************************************************
2-
* Copyright (c) 2013, 2014 Ericsson
2+
* Copyright (c) 2013, 2025 Ericsson
33
*
44
* All rights reserved. This program and the accompanying materials are
55
* made available under the terms of the Eclipse Public License 2.0 which
@@ -14,7 +14,6 @@
1414
package org.eclipse.tracecompass.internal.tracing.rcp.ui;
1515

1616
import java.io.File;
17-
import java.net.URL;
1817
import java.text.MessageFormat;
1918

2019
import org.eclipse.core.runtime.Platform;
@@ -68,7 +67,7 @@ public Object start(IApplicationContext context) throws Exception {
6867

6968
String workspace = TracingRcpPlugin.getWorkspaceRoot() + File.separator + TracingRcpPlugin.WORKSPACE_NAME;
7069
// set location to workspace
71-
fInstanceLoc.set(new URL("file", null, workspace), false); //$NON-NLS-1$
70+
fInstanceLoc.set(new File(workspace).toURI().toURL(), false);
7271
}
7372

7473
/*

statesystem/org.eclipse.tracecompass.statesystem.core/src/org/eclipse/tracecompass/statesystem/core/snapshot/StateSnapshot.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import java.io.IOException;
1616
import java.io.InputStreamReader;
1717
import java.io.Writer;
18+
import java.nio.charset.StandardCharsets;
1819
import java.nio.file.Files;
1920
import java.nio.file.Path;
2021
import java.nio.file.StandardOpenOption;
@@ -37,7 +38,6 @@
3738
import org.eclipse.tracecompass.statesystem.core.interval.ITmfStateInterval;
3839
import org.eclipse.tracecompass.statesystem.core.interval.TmfStateInterval;
3940

40-
import com.google.common.base.Charsets;
4141
import com.google.common.collect.ImmutableList;
4242
import com.google.gson.Gson;
4343
import com.google.gson.GsonBuilder;
@@ -244,7 +244,7 @@ public void write(Path parentPath) throws IOException {
244244
}
245245
Files.createFile(filePath);
246246

247-
try (Writer bw = Files.newBufferedWriter(filePath, Charsets.UTF_8)) {
247+
try (Writer bw = Files.newBufferedWriter(filePath, StandardCharsets.UTF_8)) {
248248
String json = GSON.toJson(this);
249249
bw.write(json);
250250
}

tmf/org.eclipse.tracecompass.tmf.ui.tests/widgetStubs/org/eclipse/tracecompass/tmf/ui/tests/uml2sd/load/TestLoaders.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2013, 2014 Ericsson
2+
* Copyright (c) 2013, 2025 Ericsson
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License 2.0
55
* which accompanies this distribution, and is available at
@@ -22,6 +22,7 @@
2222
import org.eclipse.jface.viewers.ISelection;
2323
import org.eclipse.jface.viewers.StructuredSelection;
2424
import org.eclipse.swt.graphics.Image;
25+
import org.eclipse.tracecompass.internal.tmf.ui.Activator;
2526
import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestamp;
2627
import org.eclipse.tracecompass.tmf.ui.views.uml2sd.SDView;
2728
import org.eclipse.tracecompass.tmf.ui.views.uml2sd.core.AsyncMessageReturn;
@@ -47,6 +48,7 @@
4748
import org.eclipse.ui.ISelectionListener;
4849
import org.eclipse.ui.IWorkbenchPart;
4950
import org.eclipse.ui.PlatformUI;
51+
import org.osgi.framework.Bundle;
5052

5153
/**
5254
* Test loader class.
@@ -446,8 +448,8 @@ public LocalImageImpl(Image img_) {
446448
public Image getResourceImage(String _name) {
447449
ImageDescriptor imgage;
448450
try {
449-
URL BASIC_URL = new URL("platform", "localhost", "plugin");
450-
URL url = new URL(BASIC_URL, (new StringBuilder("plugin/org.eclipse.tracecompass.tmf.ui/icons/")).append(_name).toString());
451+
Bundle bundle = Activator.getDefault().getBundle();
452+
URL url = bundle.getResource(new StringBuilder("icons/").append(_name).toString());
451453
imgage = ImageDescriptor.createFromURL(url);
452454
return imgage.createImage();
453455
} catch (Exception e) {

0 commit comments

Comments
 (0)