diff --git a/rcp/org.eclipse.tracecompass.rcp/feature.xml b/rcp/org.eclipse.tracecompass.rcp/feature.xml
index 59f36f9236..0ab10e4293 100644
--- a/rcp/org.eclipse.tracecompass.rcp/feature.xml
+++ b/rcp/org.eclipse.tracecompass.rcp/feature.xml
@@ -428,4 +428,39 @@
version="0.0.0"
unpack="false"/>
+
+
+
+
+
+
+
+
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.20.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.20.target
index e0781ca0fa..e7e66ab270 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.20.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.20.target
@@ -1,4 +1,4 @@
-
+
@@ -40,6 +40,12 @@
+
+
+
+
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.21.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.21.target
index a6007110cc..f02f63da90 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.21.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.21.target
@@ -1,4 +1,4 @@
-
+
@@ -9,14 +9,14 @@
-
+
-
+
@@ -40,6 +40,12 @@
+
+
+
+
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.22.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.22.target
index ed159edefd..2dd4c0f552 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.22.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.22.target
@@ -1,4 +1,4 @@
-
+
@@ -40,6 +40,12 @@
+
+
+
+
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.23.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.23.target
index 12aba62da9..eb3bb179d1 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.23.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.23.target
@@ -1,4 +1,4 @@
-
+
@@ -40,6 +40,12 @@
+
+
+
+
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.24.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.24.target
index 4e01e38cec..0b2c557cfd 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.24.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.24.target
@@ -1,4 +1,4 @@
-
+
@@ -41,6 +41,12 @@
+
+
+
+
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.25.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.25.target
index 49699d15f9..5db69503ae 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.25.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.25.target
@@ -1,4 +1,4 @@
-
+
@@ -41,6 +41,12 @@
+
+
+
+
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.26.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.26.target
index 5337396755..a750c4363c 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.26.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.26.target
@@ -1,4 +1,4 @@
-
+
@@ -25,6 +25,8 @@
+
+
@@ -41,6 +43,12 @@
+
+
+
+
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.27.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.27.target
index 533da5a7dd..382a91606c 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.27.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.27.target
@@ -1,4 +1,4 @@
-
+
@@ -26,6 +26,8 @@
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.28.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.28.target
index abdb1ebccf..273f51c9f9 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.28.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.28.target
@@ -1,4 +1,4 @@
-
+
@@ -26,6 +26,8 @@
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.29.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.29.target
new file mode 100644
index 0000000000..1e757cc3ae
--- /dev/null
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.29.target
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+-Xms40m
+-Xmx512M
+-consolelog
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
index 940fdeb425..bef0d5ad97 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
@@ -1,4 +1,4 @@
-
+
@@ -7,7 +7,7 @@
-
+
@@ -26,6 +26,8 @@
+
+
@@ -59,7 +61,7 @@
-
+
@@ -69,11 +71,11 @@
-
+
-
+
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/.settings/org.eclipse.jdt.core.prefs b/tmf/org.eclipse.tracecompass.tmf.ui/.settings/org.eclipse.jdt.core.prefs
index 2299735e7f..bd3df7c632 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/.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
@@ -34,7 +35,6 @@ 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=warning
-# changed to warning due to FilteredTree, ITimeEventStyleStrings, Object.finalize()
org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
@@ -73,7 +73,7 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/FileSystemObjectLeveledImportStructureProvider.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/FileSystemObjectLeveledImportStructureProvider.java
index e02c278871..6acd5bd4d9 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/FileSystemObjectLeveledImportStructureProvider.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/FileSystemObjectLeveledImportStructureProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015 Ericsson
+ * Copyright (c) 2015, 2023 Ericsson
*
* All rights reserved. This program and the accompanying materials are
* made available under the terms of the Eclipse Public License 2.0 which
@@ -51,6 +51,16 @@ public boolean closeArchive() {
return fLeveledImportProvider.closeArchive();
}
+ /**
+ * Closes this resource, relinquishing any underlying resources.
+ * This method is invoked automatically on objects managed by the
+ * {@code try}-with-resources statement.
+ */
+ // @Override annotation cannot be used with pre-e4.29 targets
+ public void close() {
+ closeArchive();
+ }
+
@Override
public void dispose() {
super.dispose();
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/GzipLeveledStructureProvider.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/GzipLeveledStructureProvider.java
index e469049a5a..400e261838 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/GzipLeveledStructureProvider.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/GzipLeveledStructureProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015 Ericsson
+ * Copyright (c) 2015, 2023 Ericsson
*
* All rights reserved. This program and the accompanying materials are
* made available under the terms of the Eclipse Public License 2.0 which
@@ -102,6 +102,16 @@ public boolean closeArchive() {
return true;
}
+ /**
+ * Closes this resource, relinquishing any underlying resources.
+ * This method is invoked automatically on objects managed by the
+ * {@code try}-with-resources statement.
+ */
+ // @Override annotation cannot be used with pre-e4.29 targets
+ public void close() {
+ closeArchive();
+ }
+
@Override
public boolean isFolder(Object element) {
return ((GzipEntry) element).getFileType() == GzipEntry.DIRECTORY;
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/TarLeveledStructureProvider.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/TarLeveledStructureProvider.java
index 4f4fb86b27..dfcef090ab 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/TarLeveledStructureProvider.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/TarLeveledStructureProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2023 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -193,6 +193,16 @@ public boolean closeArchive(){
return true;
}
+ /**
+ * Closes this resource, relinquishing any underlying resources.
+ * This method is invoked automatically on objects managed by the
+ * {@code try}-with-resources statement.
+ */
+ // @Override annotation cannot be used with pre-e4.29 targets
+ public void close() {
+ closeArchive();
+ }
+
/**
* Initializes this object's children table based on the contents of the
* specified source file.
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/ZipLeveledStructureProvider.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/ZipLeveledStructureProvider.java
index 765eae83f3..1d567e3636 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/ZipLeveledStructureProvider.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/ZipLeveledStructureProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2023 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -211,6 +211,16 @@ public boolean closeArchive() {
return true;
}
+ /**
+ * Closes this resource, relinquishing any underlying resources.
+ * This method is invoked automatically on objects managed by the
+ * {@code try}-with-resources statement.
+ */
+ // @Override annotation cannot be used with pre-e4.29 targets
+ public void close() {
+ closeArchive();
+ }
+
/**
* Initializes this object's children table based on the contents of the
* specified source file.