diff options
Diffstat (limited to 'profiling')
109 files changed, 483 insertions, 662 deletions
diff --git a/profiling/org.eclipse.linuxtools.binutils/.classpath b/profiling/org.eclipse.linuxtools.binutils/.classpath index 43b986286a..1db08c6b4c 100644 --- a/profiling/org.eclipse.linuxtools.binutils/.classpath +++ b/profiling/org.eclipse.linuxtools.binutils/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="target/classes"/> diff --git a/profiling/org.eclipse.linuxtools.binutils/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.binutils/.settings/org.eclipse.jdt.core.prefs index a2ad975f85..02a0001884 100644 --- a/profiling/org.eclipse.linuxtools.binutils/.settings/org.eclipse.jdt.core.prefs +++ b/profiling/org.eclipse.linuxtools.binutils/.settings/org.eclipse.jdt.core.prefs @@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullanalysis=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=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -24,6 +24,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore @@ -80,6 +81,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -111,4 +113,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/profiling/org.eclipse.linuxtools.binutils/.settings/org.eclipse.jdt.ui.prefs b/profiling/org.eclipse.linuxtools.binutils/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000000..690dcacd30 --- /dev/null +++ b/profiling/org.eclipse.linuxtools.binutils/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,65 @@ +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=true +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_functional_interfaces=true +sp_cleanup.convert_to_enhanced_for_loop=true +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=true +sp_cleanup.insert_inferred_type_arguments=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=false +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=true +sp_cleanup.push_down_negation=false +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_redundant_modifiers=true +sp_cleanup.remove_redundant_semicolons=true +sp_cleanup.remove_redundant_type_arguments=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_array_creation=true +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_anonymous_class_creation=false +sp_cleanup.use_autoboxing=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_lambda=true +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true +sp_cleanup.use_unboxing=false diff --git a/profiling/org.eclipse.linuxtools.binutils/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.binutils/META-INF/MANIFEST.MF index 1bd00fc18e..4f7449d3a0 100644 --- a/profiling/org.eclipse.linuxtools.binutils/META-INF/MANIFEST.MF +++ b/profiling/org.eclipse.linuxtools.binutils/META-INF/MANIFEST.MF @@ -19,6 +19,6 @@ Require-Bundle: org.eclipse.ui, Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.linuxtools.binutils.link2source, org.eclipse.linuxtools.binutils.utils -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Localization: plugin Automatic-Module-Name: org.eclipse.linuxtools.binutils diff --git a/profiling/org.eclipse.linuxtools.binutils/pom.xml b/profiling/org.eclipse.linuxtools.binutils/pom.xml index f5dc6488f0..b2e0a37af6 100644 --- a/profiling/org.eclipse.linuxtools.binutils/pom.xml +++ b/profiling/org.eclipse.linuxtools.binutils/pom.xml @@ -15,7 +15,7 @@ <parent> <artifactId>linuxtools-profiling-parent</artifactId> <groupId>org.eclipse.linuxtools.profiling</groupId> - <version>7.4.0-SNAPSHOT</version> + <version>8.6.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.linuxtools.binutils</artifactId> diff --git a/profiling/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STCSourceNotFoundEditorInput.java b/profiling/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STCSourceNotFoundEditorInput.java index f05a6a70cb..b613fcd759 100644 --- a/profiling/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STCSourceNotFoundEditorInput.java +++ b/profiling/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STCSourceNotFoundEditorInput.java @@ -1,6 +1,6 @@ /******************************************************************************* * Copyright (c) 2009, 2018 STMicroelectronics and others. - * + * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -15,10 +15,10 @@ package org.eclipse.linuxtools.binutils.link2source; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ResourceLocator; import org.eclipse.linuxtools.internal.Activator; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IPersistableElement; -import org.eclipse.ui.plugin.AbstractUIPlugin; /** * Editor Input used for source not found @@ -49,7 +49,7 @@ public class STCSourceNotFoundEditorInput implements IEditorInput { @Override public ImageDescriptor getImageDescriptor() { - return AbstractUIPlugin.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/c_file_obj.gif"); //$NON-NLS-1$ + return ResourceLocator.imageDescriptorFromBundle(Activator.PLUGIN_ID, "icons/c_file_obj.gif").get(); //$NON-NLS-1$ } @Override diff --git a/profiling/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STLink2SourceSupport.java b/profiling/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STLink2SourceSupport.java index 15c41a46f8..8b6a5bcfef 100644 --- a/profiling/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STLink2SourceSupport.java +++ b/profiling/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STLink2SourceSupport.java @@ -1,6 +1,6 @@ /******************************************************************************* - * Copyright (c) 2009, 2018 STMicroelectronics and others. - * + * Copyright (c) 2009, 2019 STMicroelectronics and others. + * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -66,16 +66,15 @@ public final class STLink2SourceSupport { } /** - * Open a C Editor at the given location. - * - * @param binaryLoc A path to a binary file. - * @param sourceLoc The location of the source file. - * @param lineNumber The line to open at. - * @return <code>true</code> if the link-to-source was successful, <code>false</code> otherwise - */ + * Open a C Editor at the given location. + * + * @param binaryLoc A path to a binary file. + * @param sourceLoc The location of the source file. + * @param lineNumber The line to open at. + * @return <code>true</code> if the link-to-source was successful, + * <code>false</code> otherwise + */ private static boolean openSourceFileAtLocation(IPath binaryLoc, IPath sourceLoc, int lineNumber) { - IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); - //FIXME EK-LINUXTOOLS: IFile binary = root.getFileForLocation(binaryLoc); IFile binary = STSymbolManager.sharedInstance.findFileFromPath(binaryLoc); IProject project = null; if (binary != null) { @@ -237,7 +236,7 @@ public final class STLink2SourceSupport { public IResource getResource() { return resource; } - + @Override public boolean visit(IResourceProxy proxy) { // To correctly find a file in a linked directory, we cannot just look at the isLinked() attribute @@ -255,7 +254,7 @@ public final class STLink2SourceSupport { } } - + private static IFile getFileForPathImpl(IPath path, IProject project) { IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); if (path.isAbsolute()) { @@ -294,7 +293,7 @@ public final class STLink2SourceSupport { } } } - + // no match found...try and see if we are dealing with a link IPath realPath = project.getLocation().append(path).makeAbsolute(); URI realURI = URIUtil.toURI(realPath.toString()); diff --git a/profiling/org.eclipse.linuxtools.dataviewers-feature/feature.xml b/profiling/org.eclipse.linuxtools.dataviewers-feature/feature.xml index 49eb12bb7b..681b5e5c5d 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers-feature/feature.xml +++ b/profiling/org.eclipse.linuxtools.dataviewers-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.linuxtools.dataviewers.feature" label="%featureName" - version="7.4.0.qualifier" + version="8.6.0.qualifier" provider-name="%featureProvider" license-feature="org.eclipse.license" license-feature-version="0.0.0"> @@ -35,8 +35,7 @@ <import plugin="org.eclipse.cdt.ui"/> <import plugin="org.eclipse.cdt.core"/> <import plugin="org.eclipse.core.resources" version="3.4.2" match="greaterOrEqual"/> - <import plugin="com.ibm.icu"/> - <import plugin="org.swtchart"/> + <import plugin="org.eclipse.swtchart"/> </requires> <plugin diff --git a/profiling/org.eclipse.linuxtools.dataviewers-feature/p2.inf b/profiling/org.eclipse.linuxtools.dataviewers-feature/p2.inf index 5246a0c824..60665c654d 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers-feature/p2.inf +++ b/profiling/org.eclipse.linuxtools.dataviewers-feature/p2.inf @@ -1,3 +1,5 @@ instructions.configure=\ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); +org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0); \ +org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1); \ +org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:https${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \ +org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:https${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); diff --git a/profiling/org.eclipse.linuxtools.dataviewers-feature/pom.xml b/profiling/org.eclipse.linuxtools.dataviewers-feature/pom.xml index 5140e8f86b..f98254de5e 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers-feature/pom.xml +++ b/profiling/org.eclipse.linuxtools.dataviewers-feature/pom.xml @@ -15,7 +15,7 @@ <parent> <artifactId>linuxtools-profiling-parent</artifactId> <groupId>org.eclipse.linuxtools.profiling</groupId> - <version>7.4.0-SNAPSHOT</version> + <version>8.6.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.linuxtools.dataviewers.feature</artifactId> @@ -27,11 +27,24 @@ <plugins> <plugin> <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + <executions> + <execution> + <id>feature-source</id> + <phase>package</phase> + <goals> + <goal>feature-source</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-p2-plugin</artifactId> <version>${tycho-version}</version> <executions> <execution> - <id>attached-p2-metadata</id> + <id>attach-p2-metadata</id> <phase>package</phase> <goals> <goal>p2-metadata</goal> diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/.classpath b/profiling/org.eclipse.linuxtools.dataviewers.charts/.classpath index 43b986286a..1db08c6b4c 100755 --- a/profiling/org.eclipse.linuxtools.dataviewers.charts/.classpath +++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="target/classes"/> diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.dataviewers.charts/.settings/org.eclipse.jdt.core.prefs index fcac9d2a76..44fccc8cbb 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers.charts/.settings/org.eclipse.jdt.core.prefs +++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/.settings/org.eclipse.jdt.core.prefs @@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -23,6 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore @@ -79,6 +80,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -110,4 +112,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/.settings/org.eclipse.jdt.ui.prefs b/profiling/org.eclipse.linuxtools.dataviewers.charts/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000000..ea88167ddc --- /dev/null +++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,72 @@ +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=true +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_functional_interfaces=true +sp_cleanup.convert_to_enhanced_for_loop=true +sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=true +sp_cleanup.insert_inferred_type_arguments=false +sp_cleanup.lazy_logical_operator=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=false +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.merge_conditional_blocks=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.number_suffix=false +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=true +sp_cleanup.push_down_negation=false +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_redundant_modifiers=true +sp_cleanup.remove_redundant_semicolons=true +sp_cleanup.remove_redundant_type_arguments=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_array_creation=true +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=true +sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.simplify_lambda_expression_and_method_ref=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_anonymous_class_creation=false +sp_cleanup.use_autoboxing=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_directly_map_method=false +sp_cleanup.use_lambda=true +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true +sp_cleanup.use_unboxing=false +sp_cleanup.use_var=false diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.dataviewers.charts/META-INF/MANIFEST.MF index d756273843..b268386aae 100755 --- a/profiling/org.eclipse.linuxtools.dataviewers.charts/META-INF/MANIFEST.MF +++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/META-INF/MANIFEST.MF @@ -2,17 +2,19 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.linuxtools.dataviewers.charts;singleton:=true -Bundle-Version: 6.0.0.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-Activator: org.eclipse.linuxtools.internal.dataviewers.charts.Activator Bundle-Vendor: %bundleProvider Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.linuxtools.dataviewers;bundle-version="4.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.linuxtools.dataviewers.charts.actions, org.eclipse.linuxtools.dataviewers.charts.provider Import-Package: org.eclipse.linuxtools.dataviewers.piechart, - org.swtchart + org.eclipse.linuxtools.internal.dataviewers.piechart, + org.eclipse.swtchart, + org.eclipse.swtchart.extensions.charts Bundle-Localization: plugin Automatic-Module-Name: org.eclipse.linuxtools.dataviewers.charts diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/pom.xml b/profiling/org.eclipse.linuxtools.dataviewers.charts/pom.xml index 1e18842799..f40b426cae 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers.charts/pom.xml +++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/pom.xml @@ -15,11 +15,11 @@ <parent> <artifactId>linuxtools-profiling-parent</artifactId> <groupId>org.eclipse.linuxtools.profiling</groupId> - <version>7.4.0-SNAPSHOT</version> + <version>8.6.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.linuxtools.dataviewers.charts</artifactId> - <version>6.0.0-SNAPSHOT</version> + <version>7.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>Linux Tools Data Viewers Charts Plug-in</name> diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/ChartAction.java b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/ChartAction.java index 0bc979ef80..c1fe9793fb 100755 --- a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/ChartAction.java +++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/ChartAction.java @@ -1,6 +1,6 @@ /******************************************************************************* * Copyright (c) 2009, 2018 STMicroelectronics and others. - * + * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -13,23 +13,25 @@ package org.eclipse.linuxtools.dataviewers.charts.actions; import org.eclipse.jface.action.Action; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTViewer; import org.eclipse.linuxtools.internal.dataviewers.charts.Activator; import org.eclipse.linuxtools.internal.dataviewers.charts.Messages; -import org.eclipse.linuxtools.internal.dataviewers.charts.dialogs.ChartDialog; +import org.eclipse.linuxtools.internal.dataviewers.charts.dialogs.ChartDialog2; import org.eclipse.linuxtools.internal.dataviewers.charts.view.ChartView; import org.eclipse.swt.widgets.Shell; -import org.swtchart.Chart; /** * An action that open a chart dialog from an <code>AbstractSTViewer</code>. * * @see AbstractSTViewer + * @deprecated Functionality to be moved to Eclipse.org SWTChart project. */ +@Deprecated public class ChartAction extends Action { /** The dialog */ - private final ChartDialog dialog; + private final Dialog dialog; /** * The constructor. @@ -41,7 +43,7 @@ public class ChartAction extends Action { */ public ChartAction(Shell shell, AbstractSTViewer viewer) { super(Messages.ChartConstants_CREATE_CHART, Activator.getImageDescriptor("icons/chart_icon.png")); //$NON-NLS-1$ - dialog = new ChartDialog(shell, viewer); + dialog = new ChartDialog2(shell, viewer); setEnabled(!viewer.getViewer().getSelection().isEmpty()); viewer.getViewer().addSelectionChangedListener(event -> setEnabled(!event.getSelection().isEmpty())); } @@ -49,10 +51,6 @@ public class ChartAction extends Action { @Override public void run() { dialog.open(); - Chart chart = dialog.getValue(); - if (chart != null) { - ChartView.createChartView(chart); - - } + ChartView.createChartView(); } } diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/SaveChartAction.java b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/SaveChartAction.java deleted file mode 100755 index 3e9d85001f..0000000000 --- a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/SaveChartAction.java +++ /dev/null @@ -1,228 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014, 2018 Red Hat, Inc. and others. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation - * Red Hat (various) - ongoing maintenance - *******************************************************************************/ -package org.eclipse.linuxtools.dataviewers.charts.actions; - -import java.io.File; -import java.text.MessageFormat; -import java.util.HashMap; -import java.util.Map; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.action.Action; -import org.eclipse.jface.dialogs.ErrorDialog; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.linuxtools.internal.dataviewers.charts.Activator; -import org.eclipse.linuxtools.internal.dataviewers.charts.Messages; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.GC; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.graphics.ImageData; -import org.eclipse.swt.graphics.ImageLoader; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.FileDialog; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.PlatformUI; -import org.swtchart.Chart; - -/** - * An action to save any {@link Composite} (typically a {@link Chart}) as an image (jpeg/jpg, bmp, png). - * - * @since 6.0 - */ -public class SaveChartAction extends Action { - - private static final String[] EXTENSIONS = - { "*.png", "*.bmp", "*.jpg", "*.jpeg", "*.*" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ - private static final String DEFAULT_EXT = "png"; //$NON-NLS-1$ - private static final String DEFAULT_TITLE = "newChart"; //$NON-NLS-1$ - private static final Map<String, Integer> EXTENSION_MAP = new HashMap<>(); - - private Composite contents = null; - private String title = null; - - static { - EXTENSION_MAP.put("png", SWT.IMAGE_PNG); //$NON-NLS-1$ - EXTENSION_MAP.put("bmp", SWT.IMAGE_BMP); //$NON-NLS-1$ - EXTENSION_MAP.put("jpeg", SWT.IMAGE_JPEG); //$NON-NLS-1$ - EXTENSION_MAP.put("jpg", SWT.IMAGE_JPEG); //$NON-NLS-1$ - } - - public SaveChartAction() { - super(Messages.ChartConstants_SAVE_CHART_AS, Activator.getImageDescriptor("icons/chart-save.png")); //$NON-NLS-1$ - this.setEnabled(false); - } - - /** - * Sets the image plugin on the contents and enables the action if contents are not null. - * Also, a default title for the file to be saved is generated. - * @param contents The image contents to be saved. - */ - public void setChart(Composite contents) { - setChart(contents, null); - } - - /** - * The same as {@link #setChart(Composite)}, but allows specification of a custom default - * title for the image file to be saved. - * @param contents The image contents to be saved. - * @param title The default title of the image file when it is saved. Set this to <code>null</code> - * if a title should be generated from the {@link #contents}. - */ - public void setChart(Composite contents, String title) { - this.contents = contents; - if (contents != null) { - this.title = title != null ? title : getDefaultName(); - setEnabled(true); - } else { - setEnabled(false); - } - } - - private String getDefaultName() { - if (contents instanceof Chart) { - return ((Chart) contents).getTitle().getText().replaceAll(" ", "_"); //$NON-NLS-1$ //$NON-NLS-2$ - } else { - return DEFAULT_TITLE; - } - } - - /** - * Open a dialog with which to save the contents at a user-specified path. - */ - @Override - public void run() { - if (problemExists()) { - return; - } - File file = askForAndPrepareFile(); - if (file == null) { - return; // Cancelled - } - generateImageFile(file); - } - - /** - * Save the previously-set contents as an image without the need for user input. - * @param path The path to save the image to. - */ - public void run(String path) { - if (problemExists()) { - return; - } - File file = new File(makePathWithVerifiedExt(path)); - if (shouldOverwrite(file, null)) { - generateImageFile(new File(path)); - } - } - - private boolean problemExists() { - IStatus status = null; - if (!isEnabled()) { - status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, - Messages.ChartConstants_ERROR_CHART_CLOSED); - } else if (contents.isDisposed()) { - status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, - Messages.ChartConstants_ERROR_CHART_DISPOSED); - } - - if (status != null) { - ErrorDialog.openError(getWorkbenchShell(), - Messages.ChartConstants_ERROR_SAVING_CHART, - Messages.ChartConstants_ERROR_SAVING_CHART_MESSAGE, status); - return true; - } - return false; - } - - /** - * Ask the user for the path to save the file at, and check if this path overwrites any existing file. - * (Note that using dialog.setOverwrite(true) is insufficient, as the path name may be appended with a - * file extension after the standard overwrite checks occur.) - * @return A file with the specified pathname, appended with an appropriate extension. - */ - private File askForAndPrepareFile() { - final Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); - final FileDialog dialog = new FileDialog(shell, SWT.SAVE); - dialog.setFilterExtensions(EXTENSIONS); - dialog.setText(Messages.ChartConstants_SAVE_CHART_DIALOG_TEXT); - dialog.setFileName(title); - - do { - String path = dialog.open(); - if (path == null) { - return null; // Cancelled - } - - path = makePathWithVerifiedExt(path); - - File file = new File(path); - if (shouldOverwrite(file, shell)) { - return file; - } - // If not overwriting, bring up dialog again (loop) - dialog.setFileName(file.getName()); - } while (true); - } - - private boolean shouldOverwrite(File file, Shell shell) { - if (!file.exists()) { - return true; - } - if (MessageDialog.openQuestion(shell != null ? shell : - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), - Messages.ChartConstants_CONFIRM_OVERWRITE_TITLE, - MessageFormat.format(Messages.ChartConstants_CONFIRM_OVERWRITE_MSG, file))) { - file.delete(); - return true; - } - return false; - } - - /** - * Checks if the provided path has a valid file extension supported by {@link ImageLoader#save(String, int)}. - * If not, a copy of the path is returned, with its extension replaced with a default one. - */ - private String makePathWithVerifiedExt(String path) { - String pathExt = Path.fromOSString(path).getFileExtension(); - if (pathExt == null) { - return path.concat('.' + DEFAULT_EXT); - } - if (EXTENSION_MAP.containsKey(pathExt)) { - return path; - } - return path.replaceAll(pathExt.concat("$"), DEFAULT_EXT); //$NON-NLS-1$ - } - - private void generateImageFile(File file) { - // Extension is chosen based on the file name, not the dialog filter selection. - int extension = EXTENSION_MAP.get(Path.fromOSString(file.getName()).getFileExtension()); - - Display dsp = Display.getCurrent(); - GC gc = new GC(contents); - Image img = new Image(dsp, contents.getSize().x, contents.getSize().y); - gc.copyArea(img, 0, 0); - gc.dispose(); - ImageLoader imageLoader = new ImageLoader(); - imageLoader.data = new ImageData[] { img.getImageData() }; - imageLoader.save(file.getAbsolutePath(), extension); - } - - private Shell getWorkbenchShell() { - return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); - } - -} diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/IChartField.java b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/IChartField.java index 20918970e2..38e2e28d8b 100755 --- a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/IChartField.java +++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/IChartField.java @@ -16,7 +16,9 @@ import org.eclipse.linuxtools.dataviewers.abstractviewers.ISTDataViewersField; /** * The interface used by the charts to get a <code>Number</code> data from a field. + * */ +@Deprecated public interface IChartField extends ISTDataViewersField { /** diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/Activator.java b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/Activator.java index 9d1cba2824..478c2d8475 100755 --- a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/Activator.java +++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/Activator.java @@ -13,6 +13,7 @@ package org.eclipse.linuxtools.internal.dataviewers.charts; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ResourceLocator; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -57,7 +58,7 @@ public class Activator extends AbstractUIPlugin { * @return the image descriptor */ public static ImageDescriptor getImageDescriptor(String path) { - return imageDescriptorFromPlugin(PLUGIN_ID, path); + return ResourceLocator.imageDescriptorFromBundle(PLUGIN_ID, path).get(); } /** diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/dialogs/ChartDialog.java b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/dialogs/ChartDialog2.java index b344d3a97a..a009c8637d 100755..100644 --- a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/dialogs/ChartDialog.java +++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/dialogs/ChartDialog2.java @@ -23,10 +23,10 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTViewer; import org.eclipse.linuxtools.dataviewers.abstractviewers.ISTDataViewersField; -import org.eclipse.linuxtools.dataviewers.charts.provider.ChartFactory; import org.eclipse.linuxtools.dataviewers.charts.provider.IChartField; import org.eclipse.linuxtools.internal.dataviewers.charts.Activator; import org.eclipse.linuxtools.internal.dataviewers.charts.Messages; +import org.eclipse.linuxtools.internal.dataviewers.charts.view.ChartFactory; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; @@ -41,12 +41,12 @@ import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.swtchart.Chart; +import org.eclipse.swtchart.extensions.charts.InteractiveChart; /** * The dialog used to customize the chart before creating it. */ -public class ChartDialog extends Dialog { +public class ChartDialog2 extends Dialog { /** The section name of the viewer's dialog settings where the chart dialog save its state */ private static final String TAG_SECTION_CHARTS_STATE = "charts_section"; //$NON-NLS-1$ @@ -68,7 +68,7 @@ public class ChartDialog extends Dialog { private static final boolean DEFAULT_VERTICAL_BARS_BUTTON = false; private final AbstractSTViewer stViewer; - private Chart chart; + private InteractiveChart chart; private Text errorMessageText; private Button verticalBarsButton; @@ -83,7 +83,7 @@ public class ChartDialog extends Dialog { * @param shell Parent shell. * @param stViewer The viewer this dialog fetch data from. */ - public ChartDialog(Shell shell, AbstractSTViewer stViewer) { + public ChartDialog2(Shell shell, AbstractSTViewer stViewer) { super(shell); this.stViewer = stViewer; } @@ -304,7 +304,7 @@ public class ChartDialog extends Dialog { * * @return the chart */ - public Chart getValue() { + public InteractiveChart getValue() { return chart; } @@ -356,7 +356,7 @@ public class ChartDialog extends Dialog { * * @return a new chart */ - private Chart produceChart() { + private InteractiveChart produceChart() { IStructuredSelection selection = stViewer.getViewer().getStructuredSelection(); if (selection == StructuredSelection.EMPTY) return null; diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/ChartFactory.java b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/view/ChartFactory.java index e304cbf38d..028d507131 100755 --- a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/ChartFactory.java +++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/view/ChartFactory.java @@ -10,29 +10,30 @@ * Contributors: * Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.dataviewers.charts.provider; +package org.eclipse.linuxtools.internal.dataviewers.charts.view; import java.util.List; import org.eclipse.linuxtools.dataviewers.abstractviewers.ISTDataViewersField; -import org.eclipse.linuxtools.dataviewers.piechart.PieChart; +import org.eclipse.linuxtools.dataviewers.charts.provider.IChartField; import org.eclipse.linuxtools.internal.dataviewers.charts.Activator; -import org.eclipse.linuxtools.internal.dataviewers.charts.view.ChartView; +import org.eclipse.linuxtools.internal.dataviewers.piechart.PieChart; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.widgets.Display; +import org.eclipse.swtchart.IAxis; +import org.eclipse.swtchart.IBarSeries; +import org.eclipse.swtchart.ISeries.SeriesType; +import org.eclipse.swtchart.ITitle; +import org.eclipse.swtchart.LineStyle; +import org.eclipse.swtchart.extensions.charts.InteractiveChart; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; -import org.swtchart.Chart; -import org.swtchart.IAxis; -import org.swtchart.IBarSeries; -import org.swtchart.ISeries.SeriesType; -import org.swtchart.ITitle; -import org.swtchart.LineStyle; /** * A utility class that handles the charts creation (pie chart and bar chart) + * */ public final class ChartFactory { @@ -50,7 +51,7 @@ public final class ChartFactory { * @param title Title of the chart. * @return a new pie chart */ - public static Chart producePieChart(Object[] objects, ISTDataViewersField nameField, + public static InteractiveChart producePieChart(Object[] objects, ISTDataViewersField nameField, List<IChartField> valFields, String title) { ChartView view; @@ -64,7 +65,7 @@ public final class ChartFactory { PieChart chart = new PieChart(view.getParent(), SWT.NONE); chart.setBackground(WHITE); - chart.setBackgroundInPlotArea(GRAD); + chart.getPlotArea().setBackground(GRAD); chart.getTitle().setText(title); chart.getTitle().setForeground(BLACK); @@ -115,7 +116,7 @@ public final class ChartFactory { * @return a new 2D bar chart */ - public static Chart produceBarChart(Object[] objects, final ISTDataViewersField nameField, + public static InteractiveChart produceBarChart(Object[] objects, final ISTDataViewersField nameField, List<IChartField> valFields, String title, boolean horizontal) { ChartView view; try { @@ -125,13 +126,14 @@ public final class ChartFactory { view = (ChartView) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() .showView(ChartView.VIEW_ID, String.valueOf(ChartView.getSecId()), IWorkbenchPage.VIEW_ACTIVATE); - Chart chart = new Chart(view.getParent(), SWT.NONE); + InteractiveChart chart = new InteractiveChart(view.getParent(), SWT.NONE); chart.setBackground(WHITE); - chart.setBackgroundInPlotArea(GRAD); + chart.getPlotArea().setBackground(GRAD); chart.getTitle().setText(title); chart.getTitle().setForeground(BLACK); + chart.setProposedSaveAsFilename(title.replace(' ', '_')); // this is correct (refers to orientation of x-axis, not bars) if (horizontal) { diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/view/ChartView.java b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/view/ChartView.java index 6389c3fd81..29c5578187 100755 --- a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/view/ChartView.java +++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/view/ChartView.java @@ -1,6 +1,6 @@ /******************************************************************************* * Copyright (c) 2009, 2018 STMicroelectronics and others. - * + * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -15,16 +15,12 @@ package org.eclipse.linuxtools.internal.dataviewers.charts.view; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.jface.action.IToolBarManager; -import org.eclipse.linuxtools.dataviewers.charts.actions.SaveChartAction; import org.eclipse.linuxtools.internal.dataviewers.charts.Activator; import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.IActionBars; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.ViewPart; -import org.swtchart.Chart; /** * The chart view. @@ -47,8 +43,6 @@ public class ChartView extends ViewPart { private Composite parent; - private SaveChartAction saveChartAction; - /** * Create and open a new chart view <br/> * <br/> @@ -56,15 +50,13 @@ public class ChartView extends ViewPart { * thread execution is synchronized on internal Integer SEC_ID which is the secondary id of the chart view. Each new * chart view has a secondary id equal to SEC_ID++. * - * @param chart The chart to create view for. */ - public static void createChartView(final Chart chart) { + public static void createChartView() { PlatformUI.getWorkbench().getDisplay().syncExec(() -> { try { synchronized (lock) { - ChartView view = (ChartView) PlatformUI.getWorkbench().getActiveWorkbenchWindow() + PlatformUI.getWorkbench().getActiveWorkbenchWindow() .getActivePage().showView(VIEW_ID, String.valueOf(SEC_ID++), IWorkbenchPage.VIEW_ACTIVATE); - view.setChart(chart); } } catch (PartInitException e) { @@ -78,18 +70,6 @@ public class ChartView extends ViewPart { @Override public void createPartControl(Composite parent) { this.parent = parent; - createActions(); - IActionBars actionBars = getViewSite().getActionBars(); - initToolBar(actionBars.getToolBarManager()); - } - - private void createActions() { - saveChartAction = new SaveChartAction(); - } - - protected void initToolBar(IToolBarManager manager) { - manager.add(saveChartAction); - manager.update(true); } @Override @@ -99,15 +79,6 @@ public class ChartView extends ViewPart { } } - /** - * Set the chart in this view - * - * @param chart - */ - private void setChart(Chart chart) { - saveChartAction.setChart(chart); - } - public Composite getParent() { return parent; } diff --git a/profiling/org.eclipse.linuxtools.dataviewers.piechart/.classpath b/profiling/org.eclipse.linuxtools.dataviewers.piechart/.classpath index 43b986286a..1db08c6b4c 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers.piechart/.classpath +++ b/profiling/org.eclipse.linuxtools.dataviewers.piechart/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="target/classes"/> diff --git a/profiling/org.eclipse.linuxtools.dataviewers.piechart/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.dataviewers.piechart/.settings/org.eclipse.jdt.core.prefs index c6519a5b63..9d8a94bc9d 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers.piechart/.settings/org.eclipse.jdt.core.prefs +++ b/profiling/org.eclipse.linuxtools.dataviewers.piechart/.settings/org.eclipse.jdt.core.prefs @@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error @@ -19,6 +19,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore @@ -75,6 +76,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -106,4 +108,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/profiling/org.eclipse.linuxtools.dataviewers.piechart/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.dataviewers.piechart/META-INF/MANIFEST.MF index 2a7436f465..d61033c441 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers.piechart/META-INF/MANIFEST.MF +++ b/profiling/org.eclipse.linuxtools.dataviewers.piechart/META-INF/MANIFEST.MF @@ -2,12 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.linuxtools.dataviewers.piechart -Bundle-Version: 2.0.1.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-Vendor: %bundleProvider Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, - org.swtchart -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 + org.eclipse.swtchart +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.linuxtools.dataviewers.piechart +Export-Package: org.eclipse.linuxtools.dataviewers.piechart, org.eclipse.linuxtools.internal.dataviewers.piechart;x-internal:=true Automatic-Module-Name: org.eclipse.linuxtools.dataviewers.piechart +Import-Package: org.eclipse.swtchart.extensions.charts diff --git a/profiling/org.eclipse.linuxtools.dataviewers.piechart/pom.xml b/profiling/org.eclipse.linuxtools.dataviewers.piechart/pom.xml index b66108616c..1641a461b7 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers.piechart/pom.xml +++ b/profiling/org.eclipse.linuxtools.dataviewers.piechart/pom.xml @@ -15,11 +15,11 @@ <parent> <artifactId>linuxtools-profiling-parent</artifactId> <groupId>org.eclipse.linuxtools.profiling</groupId> - <version>7.4.0-SNAPSHOT</version> + <version>8.6.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.linuxtools.dataviewers.piechart</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>Linux Tools PieChart plug-in</name> diff --git a/profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChart.java b/profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/internal/dataviewers/piechart/PieChart.java index 4ae832febb..dc9f366e99 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChart.java +++ b/profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/internal/dataviewers/piechart/PieChart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2018 IBM Corporation and others. + * Copyright (c) 2012, 2021 IBM Corporation and others. * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 @@ -10,23 +10,24 @@ * Contributors: * IBM Corporation - Renato Stoffalette Joao <rsjoao@br.ibm.com> *******************************************************************************/ -package org.eclipse.linuxtools.dataviewers.piechart; +package org.eclipse.linuxtools.internal.dataviewers.piechart; import java.util.ArrayList; import java.util.List; +import org.eclipse.linuxtools.dataviewers.piechart.IColorsConstants; import org.eclipse.swt.events.PaintListener; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.swtchart.Chart; -import org.swtchart.IAxis; -import org.swtchart.IBarSeries; -import org.swtchart.ISeries; -import org.swtchart.ITitle; +import org.eclipse.swtchart.IAxis; +import org.eclipse.swtchart.IBarSeries; +import org.eclipse.swtchart.ISeries; +import org.eclipse.swtchart.ITitle; +import org.eclipse.swtchart.extensions.charts.InteractiveChart; -public class PieChart extends Chart { +public class PieChart extends InteractiveChart { protected List<RGB> colorList = new ArrayList<>(); private Color[] customColors = null; @@ -38,7 +39,7 @@ public class PieChart extends Chart { for (IAxis axis : getAxisSet().getAxes()) { axis.getTitle().setVisible(false); } - getPlotArea().setVisible(false); + getPlotArea().getControl().setVisible(false); // Make the title draw after the pie-chart itself so we can modify the title // to center over the pie-chart area ITitle title = getTitle(); @@ -61,7 +62,7 @@ public class PieChart extends Chart { @Override public void addPaintListener(PaintListener listener) { - if (!listener.getClass().getName().startsWith("org.swtchart.internal.axis")) { //$NON-NLS-1$ + if (!listener.getClass().getName().startsWith("org.eclipse.swtchart.internal.axis")) { //$NON-NLS-1$ super.addPaintListener(listener); } } @@ -83,7 +84,7 @@ public class PieChart extends Chart { * @param labels The titles of each series. (These are not the same as titles given to pies.) * @param val New values. */ - public void addPieChartSeries(String labels[], double val[][]) { + public void addPieChartSeries(String[] labels, double[][] val) { setSeriesNames(val[0].length); for (ISeries s : this.getSeriesSet().getSeries()) { this.getSeriesSet().deleteSeries(s.getId()); @@ -92,7 +93,7 @@ public class PieChart extends Chart { int size = Math.min(labels.length, val.length); for (int i = 0; i < size; i++) { IBarSeries s = (IBarSeries) this.getSeriesSet().createSeries(ISeries.SeriesType.BAR, labels[i]); - double d[] = new double[val[i].length]; + double[] d = new double[val[i].length]; for (int j = 0; j < val[i].length; j++) { d[j] = val[i][j]; } @@ -157,7 +158,7 @@ public class PieChart extends Chart { */ public double getSlicePercent(int pieIndex, int sliceIndex) { double max = 0; - ISeries series[] = getSeriesSet().getSeries(); + ISeries[] series = getSeriesSet().getSeries(); for (int i = 0; i < series.length; i++) { max += series[i].getXSeries()[pieIndex]; } diff --git a/profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChartPaintListener.java b/profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/internal/dataviewers/piechart/PieChartPaintListener.java index b47f787eb3..09e4ae6376 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChartPaintListener.java +++ b/profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/internal/dataviewers/piechart/PieChartPaintListener.java @@ -10,7 +10,7 @@ * Contributors: * IBM Corporation - Renato Stoffalette Joao <rsjoao@br.ibm.com> *******************************************************************************/ -package org.eclipse.linuxtools.dataviewers.piechart; +package org.eclipse.linuxtools.internal.dataviewers.piechart; import org.eclipse.swt.SWT; import org.eclipse.swt.events.PaintEvent; @@ -22,10 +22,10 @@ import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; -import org.swtchart.IBarSeries; -import org.swtchart.ISeries; -import org.swtchart.ITitle; -import org.swtchart.Range; +import org.eclipse.swtchart.IBarSeries; +import org.eclipse.swtchart.ISeries; +import org.eclipse.swtchart.ITitle; +import org.eclipse.swtchart.Range; public class PieChartPaintListener implements PaintListener { @@ -53,7 +53,7 @@ public class PieChartPaintListener implements PaintListener { */ public PieChartPaintListener(PieChart chart) { this.chart = chart; - this.plotArea = chart.getPlotArea(); + this.plotArea = chart.getPlotArea().getControl(); } @Override diff --git a/profiling/org.eclipse.linuxtools.dataviewers/.classpath b/profiling/org.eclipse.linuxtools.dataviewers/.classpath index 18afde3169..bad53d2e5d 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers/.classpath +++ b/profiling/org.eclipse.linuxtools.dataviewers/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"> <accessrules> <accessrule kind="accessible" pattern="*"/> diff --git a/profiling/org.eclipse.linuxtools.dataviewers/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.dataviewers/.settings/org.eclipse.jdt.core.prefs index c49b94164d..f40c3ed16c 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers/.settings/org.eclipse.jdt.core.prefs +++ b/profiling/org.eclipse.linuxtools.dataviewers/.settings/org.eclipse.jdt.core.prefs @@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -24,6 +24,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore @@ -80,6 +81,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -111,4 +113,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/profiling/org.eclipse.linuxtools.dataviewers/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.dataviewers/META-INF/MANIFEST.MF index 96ebfa0bb5..6fedb465c7 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers/META-INF/MANIFEST.MF +++ b/profiling/org.eclipse.linuxtools.dataviewers/META-INF/MANIFEST.MF @@ -17,6 +17,6 @@ Export-Package: org.eclipse.linuxtools.dataviewers, org.eclipse.linuxtools.dataviewers.actions, org.eclipse.linuxtools.dataviewers.dialogs, org.eclipse.linuxtools.dataviewers.listeners -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Localization: plugin Automatic-Module-Name: org.eclipse.linuxtools.dataviewers diff --git a/profiling/org.eclipse.linuxtools.dataviewers/pom.xml b/profiling/org.eclipse.linuxtools.dataviewers/pom.xml index 58164bd311..cae5801531 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers/pom.xml +++ b/profiling/org.eclipse.linuxtools.dataviewers/pom.xml @@ -15,7 +15,7 @@ <parent> <artifactId>linuxtools-profiling-parent</artifactId> <groupId>org.eclipse.linuxtools.profiling</groupId> - <version>7.4.0-SNAPSHOT</version> + <version>8.6.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.linuxtools.dataviewers</artifactId> diff --git a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCollapseAllTreeAction.java b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCollapseAllTreeAction.java index 2aee7a7234..576d7a671e 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCollapseAllTreeAction.java +++ b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCollapseAllTreeAction.java @@ -13,10 +13,10 @@ package org.eclipse.linuxtools.dataviewers.actions; import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ResourceLocator; import org.eclipse.linuxtools.dataviewers.STDataViewersActivator; import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTTreeViewer; import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersMessages; -import org.eclipse.ui.plugin.AbstractUIPlugin; /** * This action collapse all the tree @@ -33,10 +33,9 @@ public class STCollapseAllTreeAction extends Action { * the stViewer to collapse */ public STCollapseAllTreeAction(AbstractSTTreeViewer stViewer) { - super(STDataViewersMessages.collapseAllAction_title, - AbstractUIPlugin.imageDescriptorFromPlugin(STDataViewersActivator.PLUGIN_ID, - "icons/collapse_all.gif")); //$NON-NLS-1$ - this.stViewer = stViewer; + super(STDataViewersMessages.collapseAllAction_title, ResourceLocator + .imageDescriptorFromBundle(STDataViewersActivator.PLUGIN_ID, "icons/collapse_all.gif").get()); //$NON-NLS-1$ + this.stViewer = stViewer; } @Override diff --git a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCollapseSelectionAction.java b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCollapseSelectionAction.java index 9338259967..b9fc0a6b0b 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCollapseSelectionAction.java +++ b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCollapseSelectionAction.java @@ -15,13 +15,13 @@ package org.eclipse.linuxtools.dataviewers.actions; import java.util.Iterator; import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ResourceLocator; import org.eclipse.jface.viewers.AbstractTreeViewer; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.TreeSelection; import org.eclipse.linuxtools.dataviewers.STDataViewersActivator; import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTTreeViewer; import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersMessages; -import org.eclipse.ui.plugin.AbstractUIPlugin; /** * This action collapse the selected items of the tree @@ -38,9 +38,8 @@ public class STCollapseSelectionAction extends Action { * the stViewer to collapse */ public STCollapseSelectionAction(AbstractSTTreeViewer stViewer) { - super(STDataViewersMessages.collapseSelectionAction_title, - AbstractUIPlugin.imageDescriptorFromPlugin(STDataViewersActivator.PLUGIN_ID, - "icons/collapse_all.gif")); //$NON-NLS-1$ + super(STDataViewersMessages.collapseSelectionAction_title, ResourceLocator + .imageDescriptorFromBundle(STDataViewersActivator.PLUGIN_ID, "icons/collapse_all.gif").get()); //$NON-NLS-1$ this.stViewer = stViewer; } diff --git a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STDataViewersSortAction.java b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STDataViewersSortAction.java index 0abcafba76..0f0713d8d4 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STDataViewersSortAction.java +++ b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STDataViewersSortAction.java @@ -13,13 +13,13 @@ package org.eclipse.linuxtools.dataviewers.actions; import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ResourceLocator; import org.eclipse.jface.window.Window; import org.eclipse.linuxtools.dataviewers.STDataViewersActivator; import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTViewer; import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersMessages; import org.eclipse.linuxtools.dataviewers.dialogs.STDataViewersSortDialog; import org.eclipse.swt.custom.BusyIndicator; -import org.eclipse.ui.plugin.AbstractUIPlugin; /** * This action allows the user to sort the data in the viewer @@ -36,9 +36,8 @@ public class STDataViewersSortAction extends Action { * @param stViewer The AbstractSTViewer to create the action for. */ public STDataViewersSortAction(AbstractSTViewer stViewer) { - super(STDataViewersMessages.sortAction_title, - AbstractUIPlugin.imageDescriptorFromPlugin(STDataViewersActivator.PLUGIN_ID, - "icons/sort.gif")); //$NON-NLS-1$ + super(STDataViewersMessages.sortAction_title, + ResourceLocator.imageDescriptorFromBundle(STDataViewersActivator.PLUGIN_ID, "icons/sort.gif").get()); //$NON-NLS-1$ super.setToolTipText(STDataViewersMessages.sortAction_tooltip); this.stViewer = stViewer; diff --git a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExpandAllTreeAction.java b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExpandAllTreeAction.java index aa459b67ef..3c2226359d 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExpandAllTreeAction.java +++ b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExpandAllTreeAction.java @@ -13,10 +13,10 @@ package org.eclipse.linuxtools.dataviewers.actions; import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ResourceLocator; import org.eclipse.linuxtools.dataviewers.STDataViewersActivator; import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTTreeViewer; import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersMessages; -import org.eclipse.ui.plugin.AbstractUIPlugin; /** * This action expands all the tree @@ -33,10 +33,9 @@ public class STExpandAllTreeAction extends Action { * the stViewer to expand */ public STExpandAllTreeAction(AbstractSTTreeViewer stViewer) { - super(STDataViewersMessages.expandAllAction_title, - AbstractUIPlugin.imageDescriptorFromPlugin(STDataViewersActivator.PLUGIN_ID, - "icons/expand_all.gif")); //$NON-NLS-1$ - this.stViewer = stViewer; + super(STDataViewersMessages.expandAllAction_title, ResourceLocator + .imageDescriptorFromBundle(STDataViewersActivator.PLUGIN_ID, "icons/expand_all.gif").get()); //$NON-NLS-1$ + this.stViewer = stViewer; } @Override diff --git a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExpandSelectionAction.java b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExpandSelectionAction.java index 34a04600bc..15601b2ca5 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExpandSelectionAction.java +++ b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExpandSelectionAction.java @@ -15,13 +15,13 @@ package org.eclipse.linuxtools.dataviewers.actions; import java.util.Iterator; import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ResourceLocator; import org.eclipse.jface.viewers.AbstractTreeViewer; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.TreeSelection; import org.eclipse.linuxtools.dataviewers.STDataViewersActivator; import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTTreeViewer; import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersMessages; -import org.eclipse.ui.plugin.AbstractUIPlugin; /** * This action expands the selected items of the tree @@ -38,9 +38,8 @@ public class STExpandSelectionAction extends Action { * the stViewer to expand */ public STExpandSelectionAction(AbstractSTTreeViewer stViewer) { - super(STDataViewersMessages.expandSelectionAction_title, - AbstractUIPlugin.imageDescriptorFromPlugin(STDataViewersActivator.PLUGIN_ID, - "icons/expand_all.gif")); //$NON-NLS-1$ + super(STDataViewersMessages.expandSelectionAction_title, ResourceLocator + .imageDescriptorFromBundle(STDataViewersActivator.PLUGIN_ID, "icons/expand_all.gif").get()); //$NON-NLS-1$ this.stViewer = stViewer; } diff --git a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExportToCSVAction.java b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExportToCSVAction.java index 6614c25d4f..fd03092b1f 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExportToCSVAction.java +++ b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExportToCSVAction.java @@ -17,13 +17,13 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ResourceLocator; import org.eclipse.jface.window.Window; import org.eclipse.linuxtools.dataviewers.STDataViewersActivator; import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTViewer; import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersCSVExporter; import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersMessages; import org.eclipse.linuxtools.dataviewers.dialogs.STDataViewersExportToCSVDialog; -import org.eclipse.ui.plugin.AbstractUIPlugin; /** * This action export the STViewers data to CSV format file @@ -47,9 +47,8 @@ public class STExportToCSVAction extends Action { * the stViewer to export */ public STExportToCSVAction(AbstractSTViewer stViewer) { - super(STDataViewersMessages.exportToCSVAction_title, - AbstractUIPlugin.imageDescriptorFromPlugin(STDataViewersActivator.PLUGIN_ID, - "icons/export.gif")); //$NON-NLS-1$ + super(STDataViewersMessages.exportToCSVAction_title, + ResourceLocator.imageDescriptorFromBundle(STDataViewersActivator.PLUGIN_ID, "icons/export.gif").get()); //$NON-NLS-1$ this.stViewer = stViewer; this.exporter = new STDataViewersCSVExporter(stViewer); diff --git a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STHideShowColAction.java b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STHideShowColAction.java index a13b07b5d2..cebb4f43f3 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STHideShowColAction.java +++ b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STHideShowColAction.java @@ -13,12 +13,12 @@ package org.eclipse.linuxtools.dataviewers.actions; import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ResourceLocator; import org.eclipse.jface.window.Window; import org.eclipse.linuxtools.dataviewers.STDataViewersActivator; import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTViewer; import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersMessages; import org.eclipse.linuxtools.dataviewers.dialogs.STDataViewersHideShowColumnsDialog; -import org.eclipse.ui.plugin.AbstractUIPlugin; /** * This action allows the user to hide/show some columns. @@ -32,12 +32,11 @@ public class STHideShowColAction extends Action { * * @param stViewer The AbstractSTViewer to create the action for. */ - public STHideShowColAction(AbstractSTViewer stViewer) { - super(STDataViewersMessages.hideshowAction_title, - AbstractUIPlugin.imageDescriptorFromPlugin(STDataViewersActivator.PLUGIN_ID, - "icons/prop_edt.gif")); //$NON-NLS-1$ - this.stViewer = stViewer; - setEnabled(true); + public STHideShowColAction(AbstractSTViewer stViewer) { + super(STDataViewersMessages.hideshowAction_title, ResourceLocator + .imageDescriptorFromBundle(STDataViewersActivator.PLUGIN_ID, "icons/prop_edt.gif").get()); //$NON-NLS-1$ + this.stViewer = stViewer; + setEnabled(true); } @Override diff --git a/profiling/org.eclipse.linuxtools.profiling-feature/feature.xml b/profiling/org.eclipse.linuxtools.profiling-feature/feature.xml index 965078983b..9ac3e704b0 100644 --- a/profiling/org.eclipse.linuxtools.profiling-feature/feature.xml +++ b/profiling/org.eclipse.linuxtools.profiling-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.linuxtools.profiling" label="%featureName" - version="7.4.0.qualifier" + version="8.6.0.qualifier" provider-name="%featureProvider" license-feature="org.eclipse.license" license-feature-version="0.0.0"> diff --git a/profiling/org.eclipse.linuxtools.profiling-feature/p2.inf b/profiling/org.eclipse.linuxtools.profiling-feature/p2.inf index 5246a0c824..60665c654d 100644 --- a/profiling/org.eclipse.linuxtools.profiling-feature/p2.inf +++ b/profiling/org.eclipse.linuxtools.profiling-feature/p2.inf @@ -1,3 +1,5 @@ instructions.configure=\ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); +org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0); \ +org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1); \ +org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:https${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \ +org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:https${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); diff --git a/profiling/org.eclipse.linuxtools.profiling-feature/pom.xml b/profiling/org.eclipse.linuxtools.profiling-feature/pom.xml index 20d177842e..3e8d7d8bc2 100644 --- a/profiling/org.eclipse.linuxtools.profiling-feature/pom.xml +++ b/profiling/org.eclipse.linuxtools.profiling-feature/pom.xml @@ -15,7 +15,7 @@ <parent> <artifactId>linuxtools-profiling-parent</artifactId> <groupId>org.eclipse.linuxtools.profiling</groupId> - <version>7.4.0-SNAPSHOT</version> + <version>8.6.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.linuxtools.profiling</artifactId> @@ -26,14 +26,14 @@ <build> <plugins> <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> <executions> <execution> - <id>source-feature</id> + <id>feature-source</id> <phase>package</phase> <goals> - <goal>source-feature</goal> + <goal>feature-source</goal> </goals> <configuration> <excludes> @@ -49,7 +49,7 @@ <version>${tycho-version}</version> <executions> <execution> - <id>attached-p2-metadata</id> + <id>attach-p2-metadata</id> <phase>package</phase> <goals> <goal>p2-metadata</goal> diff --git a/profiling/org.eclipse.linuxtools.profiling.docs/pom.xml b/profiling/org.eclipse.linuxtools.profiling.docs/pom.xml index ada9572625..d0216d08eb 100644 --- a/profiling/org.eclipse.linuxtools.profiling.docs/pom.xml +++ b/profiling/org.eclipse.linuxtools.profiling.docs/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.eclipse.linuxtools.profiling</groupId> <artifactId>linuxtools-profiling-parent</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>8.6.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.linuxtools.profiling.docs</artifactId> diff --git a/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/.classpath b/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/.classpath index 43b986286a..1db08c6b4c 100644 --- a/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/.classpath +++ b/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="target/classes"/> diff --git a/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/.settings/org.eclipse.jdt.core.prefs index ef45da6816..169586ce81 100644 --- a/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/.settings/org.eclipse.jdt.core.prefs +++ b/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/.settings/org.eclipse.jdt.core.prefs @@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error @@ -19,6 +19,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore @@ -75,6 +76,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -106,4 +108,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/META-INF/MANIFEST.MF index 171fdc64a3..3c1b5a7eaf 100644 --- a/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/META-INF/MANIFEST.MF +++ b/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/META-INF/MANIFEST.MF @@ -11,6 +11,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.remote.core;bundle-version="2.0.0", org.eclipse.remote.ui;bundle-version="2.0.0", org.eclipse.linuxtools.profiling.launch;bundle-version="1.2.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy diff --git a/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/pom.xml b/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/pom.xml index 59519cea09..3b93172895 100644 --- a/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/pom.xml +++ b/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/pom.xml @@ -16,7 +16,7 @@ <parent> <artifactId>linuxtools-profiling-parent</artifactId> <groupId>org.eclipse.linuxtools.profiling</groupId> - <version>7.4.0-SNAPSHOT</version> + <version>8.6.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy</artifactId> diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/.classpath b/profiling/org.eclipse.linuxtools.profiling.launch/.classpath index 43b986286a..1db08c6b4c 100644 --- a/profiling/org.eclipse.linuxtools.profiling.launch/.classpath +++ b/profiling/org.eclipse.linuxtools.profiling.launch/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="target/classes"/> diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.profiling.launch/.settings/org.eclipse.jdt.core.prefs index e26ebfbfe0..fe1be62171 100644 --- a/profiling/org.eclipse.linuxtools.profiling.launch/.settings/org.eclipse.jdt.core.prefs +++ b/profiling/org.eclipse.linuxtools.profiling.launch/.settings/org.eclipse.jdt.core.prefs @@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -23,6 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore @@ -79,6 +80,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -110,4 +112,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.profiling.launch/META-INF/MANIFEST.MF index 469d23ffa1..5689f1f5a4 100644 --- a/profiling/org.eclipse.linuxtools.profiling.launch/META-INF/MANIFEST.MF +++ b/profiling/org.eclipse.linuxtools.profiling.launch/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.swt;bundle-version="3.106.0", org.eclipse.core.expressions Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.eclipse.cdt.debug.core, org.eclipse.cdt.ui, org.eclipse.cdt.ui.newui, diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/plugin.xml b/profiling/org.eclipse.linuxtools.profiling.launch/plugin.xml index 974de45553..1f1376af6a 100644 --- a/profiling/org.eclipse.linuxtools.profiling.launch/plugin.xml +++ b/profiling/org.eclipse.linuxtools.profiling.launch/plugin.xml @@ -456,7 +456,7 @@ id="org.eclipse.linuxtools.profiling.launch.profileApplicationLaunch.mainTab" group="org.eclipse.cdt.launch.applicationProfileLaunchTabGroup" name="%MainTab.name" - class="org.eclipse.cdt.launch.ui.CMainTab"> + class="org.eclipse.cdt.launch.ui.CMainTab2"> <associatedDelegate delegate="org.eclipse.linuxtools.profiling.launch.profilingDelegate"/> </tab> <tab diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/pom.xml b/profiling/org.eclipse.linuxtools.profiling.launch/pom.xml index ac78f52541..1de389a8af 100644 --- a/profiling/org.eclipse.linuxtools.profiling.launch/pom.xml +++ b/profiling/org.eclipse.linuxtools.profiling.launch/pom.xml @@ -15,7 +15,7 @@ <parent> <artifactId>linuxtools-profiling-parent</artifactId> <groupId>org.eclipse.linuxtools.profiling</groupId> - <version>7.4.0-SNAPSHOT</version> + <version>8.6.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.linuxtools.profiling.launch</artifactId> diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/CProfilingOptionsTab.java b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/CProfilingOptionsTab.java index ed2ab8eb3c..dc85e184ff 100644 --- a/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/CProfilingOptionsTab.java +++ b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/CProfilingOptionsTab.java @@ -14,9 +14,9 @@ package org.eclipse.linuxtools.internal.profiling.launch; import java.util.SortedMap; +import org.eclipse.jface.resource.ResourceLocator; import org.eclipse.linuxtools.internal.profiling.launch.provider.launch.ProviderFramework; import org.eclipse.swt.graphics.Image; -import org.eclipse.ui.plugin.AbstractUIPlugin; // Special profiling options tab to use with the org.eclipse.cdt.launch.profilingProvider extension // to extend the Local C/C++ Application configuration to handle profiling. We do not rename @@ -74,8 +74,8 @@ public class CProfilingOptionsTab extends AbstractProfilingOptionsTab { @Override public Image getImage() { if (img == null) - img = AbstractUIPlugin.imageDescriptorFromPlugin(ProfileLaunchPlugin.PLUGIN_ID, - "icons/time_obj.gif").createImage(); //$NON-NLS-1$ + img = ResourceLocator.imageDescriptorFromBundle(ProfileLaunchPlugin.PLUGIN_ID, + "icons/time_obj.gif").get().createImage(); //$NON-NLS-1$ return img; } } diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/ProfileLaunchPlugin.java b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/ProfileLaunchPlugin.java index 62f8f5d741..a4b8548545 100644 --- a/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/ProfileLaunchPlugin.java +++ b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/ProfileLaunchPlugin.java @@ -16,6 +16,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -74,7 +75,7 @@ public class ProfileLaunchPlugin extends AbstractUIPlugin { } public static Shell getActiveWorkbenchShell() { - IWorkbenchWindow window = getDefault().getWorkbench().getActiveWorkbenchWindow(); + IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); if (window != null) { return window.getShell(); } @@ -85,7 +86,7 @@ public class ProfileLaunchPlugin extends AbstractUIPlugin { if (getActiveWorkbenchShell() != null) { return getActiveWorkbenchShell(); } - IWorkbenchWindow[] windows = getDefault().getWorkbench().getWorkbenchWindows(); + IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows(); return windows[0].getShell(); } diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/RemoteProxyCMainTab.java b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/RemoteProxyCMainTab.java index ebbaa00b9b..4b1231f7f5 100644 --- a/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/RemoteProxyCMainTab.java +++ b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/RemoteProxyCMainTab.java @@ -59,6 +59,7 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.TwoPaneElementSelector; @@ -132,15 +133,10 @@ public class RemoteProxyCMainTab extends CAbstractMainTab { Composite comp = new Composite(parent, SWT.NONE); setControl(comp); - ProfileLaunchPlugin - .getDefault() - .getWorkbench() - .getHelpSystem() - .setHelp( - getControl(), - ICDTLaunchHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_MAIN_TAB); + PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), + ICDTLaunchHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_MAIN_TAB); - GridLayout topLayout = new GridLayout(); + GridLayout topLayout = new GridLayout(); comp.setLayout(topLayout); createVerticalSpacer(comp, 1); diff --git a/profiling/org.eclipse.linuxtools.profiling.provider.tests/.classpath b/profiling/org.eclipse.linuxtools.profiling.provider.tests/.classpath index 43b986286a..a621c21ac5 100644 --- a/profiling/org.eclipse.linuxtools.profiling.provider.tests/.classpath +++ b/profiling/org.eclipse.linuxtools.profiling.provider.tests/.classpath @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="src"> + <attributes> + <attribute name="test" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/profiling/org.eclipse.linuxtools.profiling.provider.tests/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.profiling.provider.tests/.settings/org.eclipse.jdt.core.prefs index 59a1463b47..388b95fe1f 100644 --- a/profiling/org.eclipse.linuxtools.profiling.provider.tests/.settings/org.eclipse.jdt.core.prefs +++ b/profiling/org.eclipse.linuxtools.profiling.provider.tests/.settings/org.eclipse.jdt.core.prefs @@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -18,6 +18,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore @@ -61,6 +62,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -92,4 +94,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/profiling/org.eclipse.linuxtools.profiling.provider.tests/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.profiling.provider.tests/META-INF/MANIFEST.MF index 09b5dd0a2d..b92ae51a1e 100644 --- a/profiling/org.eclipse.linuxtools.profiling.provider.tests/META-INF/MANIFEST.MF +++ b/profiling/org.eclipse.linuxtools.profiling.provider.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.linuxtools.profiling.provider.tests;singleton:=true Bundle-Version: 1.2.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Fragment-Host: org.eclipse.linuxtools.profiling.launch Require-Bundle: org.junit;bundle-version="4.0.0", org.hamcrest.core, diff --git a/profiling/org.eclipse.linuxtools.profiling.provider.tests/pom.xml b/profiling/org.eclipse.linuxtools.profiling.provider.tests/pom.xml index 4970bd538d..79706801e1 100644 --- a/profiling/org.eclipse.linuxtools.profiling.provider.tests/pom.xml +++ b/profiling/org.eclipse.linuxtools.profiling.provider.tests/pom.xml @@ -15,7 +15,7 @@ <parent> <artifactId>linuxtools-profiling-parent</artifactId> <groupId>org.eclipse.linuxtools.profiling</groupId> - <version>7.4.0-SNAPSHOT</version> + <version>8.6.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.linuxtools.profiling.provider.tests</artifactId> diff --git a/profiling/org.eclipse.linuxtools.profiling.provider.tests/src/org/eclipse/linuxtools/profiling/provider/tests/AllTests.java b/profiling/org.eclipse.linuxtools.profiling.provider.tests/src/org/eclipse/linuxtools/profiling/provider/tests/AllTests.java deleted file mode 100644 index d3bb9e9d46..0000000000 --- a/profiling/org.eclipse.linuxtools.profiling.provider.tests/src/org/eclipse/linuxtools/profiling/provider/tests/AllTests.java +++ /dev/null @@ -1,23 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012, 2018 Red Hat, Inc. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Red Hat initial API and implementation - *******************************************************************************/ -package org.eclipse.linuxtools.profiling.provider.tests; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -@RunWith(Suite.class) -@SuiteClasses({LaunchTest.class, ExtensionPointTest.class}) -public class AllTests { - -} diff --git a/profiling/org.eclipse.linuxtools.profiling.remote-feature/feature.xml b/profiling/org.eclipse.linuxtools.profiling.remote-feature/feature.xml index 9f1a2c7ae7..aff80d607b 100644 --- a/profiling/org.eclipse.linuxtools.profiling.remote-feature/feature.xml +++ b/profiling/org.eclipse.linuxtools.profiling.remote-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.linuxtools.profiling.remote" label="%featureName" - version="7.4.0.qualifier" + version="8.6.0.qualifier" provider-name="%featureProvider" license-feature="org.eclipse.license" license-feature-version="0.0.0"> diff --git a/profiling/org.eclipse.linuxtools.profiling.remote-feature/p2.inf b/profiling/org.eclipse.linuxtools.profiling.remote-feature/p2.inf index 5246a0c824..60665c654d 100644 --- a/profiling/org.eclipse.linuxtools.profiling.remote-feature/p2.inf +++ b/profiling/org.eclipse.linuxtools.profiling.remote-feature/p2.inf @@ -1,3 +1,5 @@ instructions.configure=\ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); +org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0); \ +org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1); \ +org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:https${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \ +org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:https${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); diff --git a/profiling/org.eclipse.linuxtools.profiling.remote-feature/pom.xml b/profiling/org.eclipse.linuxtools.profiling.remote-feature/pom.xml index 3487d7429f..100ee836f5 100644 --- a/profiling/org.eclipse.linuxtools.profiling.remote-feature/pom.xml +++ b/profiling/org.eclipse.linuxtools.profiling.remote-feature/pom.xml @@ -15,7 +15,7 @@ <parent> <artifactId>linuxtools-profiling-parent</artifactId> <groupId>org.eclipse.linuxtools.profiling</groupId> - <version>7.4.0-SNAPSHOT</version> + <version>8.6.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.linuxtools.profiling.remote</artifactId> @@ -31,7 +31,7 @@ <version>${tycho-version}</version> <executions> <execution> - <id>attached-p2-metadata</id> + <id>attach-p2-metadata</id> <phase>package</phase> <goals> <goal>p2-metadata</goal> diff --git a/profiling/org.eclipse.linuxtools.profiling.tests/.classpath b/profiling/org.eclipse.linuxtools.profiling.tests/.classpath index 43b986286a..a621c21ac5 100644 --- a/profiling/org.eclipse.linuxtools.profiling.tests/.classpath +++ b/profiling/org.eclipse.linuxtools.profiling.tests/.classpath @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="src"> + <attributes> + <attribute name="test" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/profiling/org.eclipse.linuxtools.profiling.tests/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.profiling.tests/.settings/org.eclipse.jdt.core.prefs index 373593c6da..ca17ceef41 100644 --- a/profiling/org.eclipse.linuxtools.profiling.tests/.settings/org.eclipse.jdt.core.prefs +++ b/profiling/org.eclipse.linuxtools.profiling.tests/.settings/org.eclipse.jdt.core.prefs @@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -18,6 +18,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore @@ -61,6 +62,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -92,4 +94,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/profiling/org.eclipse.linuxtools.profiling.tests/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.profiling.tests/META-INF/MANIFEST.MF index f907ad3139..2f52d2aed8 100644 --- a/profiling/org.eclipse.linuxtools.profiling.tests/META-INF/MANIFEST.MF +++ b/profiling/org.eclipse.linuxtools.profiling.tests/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.ui.ide, org.eclipse.remote.core;bundle-version="2.0.0", org.eclipse.remote.jsch.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Export-Package: diff --git a/profiling/org.eclipse.linuxtools.profiling.tests/pom.xml b/profiling/org.eclipse.linuxtools.profiling.tests/pom.xml index 84248fb270..d614231505 100644 --- a/profiling/org.eclipse.linuxtools.profiling.tests/pom.xml +++ b/profiling/org.eclipse.linuxtools.profiling.tests/pom.xml @@ -15,7 +15,7 @@ <parent> <artifactId>linuxtools-profiling-parent</artifactId> <groupId>org.eclipse.linuxtools.profiling</groupId> - <version>7.4.0-SNAPSHOT</version> + <version>8.6.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.linuxtools.profiling.tests</artifactId> diff --git a/profiling/org.eclipse.linuxtools.profiling.ui.capability/.classpath b/profiling/org.eclipse.linuxtools.profiling.ui.capability/.classpath index 323b07b359..8d4e5e8483 100644 --- a/profiling/org.eclipse.linuxtools.profiling.ui.capability/.classpath +++ b/profiling/org.eclipse.linuxtools.profiling.ui.capability/.classpath @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/profiling/org.eclipse.linuxtools.profiling.ui.capability/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.profiling.ui.capability/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c6b9e91814..0000000000 --- a/profiling/org.eclipse.linuxtools.profiling.ui.capability/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,95 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/profiling/org.eclipse.linuxtools.profiling.ui.capability/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.profiling.ui.capability/META-INF/MANIFEST.MF index 3cf34ad576..0a3466b438 100644 --- a/profiling/org.eclipse.linuxtools.profiling.ui.capability/META-INF/MANIFEST.MF +++ b/profiling/org.eclipse.linuxtools.profiling.ui.capability/META-INF/MANIFEST.MF @@ -6,7 +6,6 @@ Bundle-Version: 1.0.0.qualifier Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Automatic-Module-Name: org.eclipse.linuxtools.profiling.ui.capability diff --git a/profiling/org.eclipse.linuxtools.profiling.ui.capability/pom.xml b/profiling/org.eclipse.linuxtools.profiling.ui.capability/pom.xml index 3bfafa5ebc..0c69806e6e 100644 --- a/profiling/org.eclipse.linuxtools.profiling.ui.capability/pom.xml +++ b/profiling/org.eclipse.linuxtools.profiling.ui.capability/pom.xml @@ -15,7 +15,7 @@ <parent> <artifactId>linuxtools-profiling-parent</artifactId> <groupId>org.eclipse.linuxtools.profiling</groupId> - <version>7.4.0-SNAPSHOT</version> + <version>8.6.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.linuxtools.profiling.ui.capability</artifactId> diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/.classpath b/profiling/org.eclipse.linuxtools.profiling.ui/.classpath index 43b986286a..1db08c6b4c 100644 --- a/profiling/org.eclipse.linuxtools.profiling.ui/.classpath +++ b/profiling/org.eclipse.linuxtools.profiling.ui/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="target/classes"/> diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.profiling.ui/.settings/org.eclipse.jdt.core.prefs index 4e96af8453..d4e1a82b6b 100644 --- a/profiling/org.eclipse.linuxtools.profiling.ui/.settings/org.eclipse.jdt.core.prefs +++ b/profiling/org.eclipse.linuxtools.profiling.ui/.settings/org.eclipse.jdt.core.prefs @@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullanalysis=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=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -24,6 +24,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore @@ -80,6 +81,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -111,4 +113,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.profiling.ui/META-INF/MANIFEST.MF index 80a8698d3f..e5be77a81e 100644 --- a/profiling/org.eclipse.linuxtools.profiling.ui/META-INF/MANIFEST.MF +++ b/profiling/org.eclipse.linuxtools.profiling.ui/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.cdt.managedbuilder.core, org.eclipse.cdt.autotools.core, org.eclipse.cdt.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Export-Package: org.eclipse.linuxtools.profiling.ui diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/pom.xml b/profiling/org.eclipse.linuxtools.profiling.ui/pom.xml index 0c8ec569bc..6ef466b176 100644 --- a/profiling/org.eclipse.linuxtools.profiling.ui/pom.xml +++ b/profiling/org.eclipse.linuxtools.profiling.ui/pom.xml @@ -15,7 +15,7 @@ <parent> <artifactId>linuxtools-profiling-parent</artifactId> <groupId>org.eclipse.linuxtools.profiling</groupId> - <version>7.4.0-SNAPSHOT</version> + <version>8.6.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.linuxtools.profiling.ui</artifactId> diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/internal/profiling/ui/ProfileUIPlugin.java b/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/internal/profiling/ui/ProfileUIPlugin.java index 7a09377061..6785570160 100644 --- a/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/internal/profiling/ui/ProfileUIPlugin.java +++ b/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/internal/profiling/ui/ProfileUIPlugin.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2018 Red Hat, Inc. + * Copyright (c) 2008, 2019 Red Hat, Inc. * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 @@ -14,6 +14,7 @@ package org.eclipse.linuxtools.internal.profiling.ui; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -56,7 +57,7 @@ public class ProfileUIPlugin extends AbstractUIPlugin { } public static Shell getActiveWorkbenchShell() { - IWorkbenchWindow window = getDefault().getWorkbench().getActiveWorkbenchWindow(); + IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); if (window != null) { return window.getShell(); } diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/profiling/ui/CProjectBuildHelpers.java b/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/profiling/ui/CProjectBuildHelpers.java index 29d25fc514..12147ce0fc 100644 --- a/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/profiling/ui/CProjectBuildHelpers.java +++ b/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/profiling/ui/CProjectBuildHelpers.java @@ -118,6 +118,9 @@ public class CProjectBuildHelpers { } IConfiguration defaultConfiguration = helperGetActiveConfiguration(project); + if (defaultConfiguration == null) { + return ProjectBuildType.OTHER; + } IBuilder builder = defaultConfiguration.getBuilder(); Boolean projIsManaged = builder.isManagedBuildOn(); diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/profiling/ui/ProfileUIUtils.java b/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/profiling/ui/ProfileUIUtils.java index b3794f8ca9..0dd1508048 100644 --- a/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/profiling/ui/ProfileUIUtils.java +++ b/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/profiling/ui/ProfileUIUtils.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2018 Red Hat, Inc. + * Copyright (c) 2008, 2019 Red Hat, Inc. * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 @@ -48,13 +48,13 @@ import org.eclipse.debug.ui.sourcelookup.ISourceLookupResult; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; -import org.eclipse.linuxtools.internal.profiling.ui.ProfileUIPlugin; import org.eclipse.linuxtools.profiling.launch.IRemoteFileProxy; import org.eclipse.linuxtools.profiling.launch.RemoteProxyManager; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.IDE; import org.eclipse.ui.texteditor.IDocumentProvider; import org.eclipse.ui.texteditor.ITextEditor; @@ -73,7 +73,7 @@ public class ProfileUIUtils { Path p = new Path(path); if (p.toFile().exists()) { - IWorkbenchPage activePage = ProfileUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage(); + IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); IFileStore file = EFS.getLocalFileSystem().getStore(p); IEditorPart editor = IDE.openEditorOnFileStore(activePage, file); @@ -103,7 +103,7 @@ public class ProfileUIUtils { * @since 3.1 */ public static void openEditorAndSelect(String path, int line, IProject project) throws PartInitException, BadLocationException, CoreException { - IWorkbenchPage activePage = ProfileUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage(); + IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); IRemoteFileProxy proxy = null; proxy = RemoteProxyManager.getInstance().getFileProxy(project); IFileStore file = proxy.getResource(path); @@ -135,7 +135,7 @@ public class ProfileUIUtils { */ public static void openEditorAndSelect(IFile file, int line) throws PartInitException, BadLocationException { if (file.exists()) { - IWorkbenchPage activePage = ProfileUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage(); + IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); IEditorPart editor = IDE.openEditor(activePage, file); if (editor instanceof ITextEditor) { @@ -189,7 +189,7 @@ public class ProfileUIUtils { } if (input != null && editorID != null) { // Open the editor - IWorkbenchPage activePage = ProfileUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage(); + IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); IEditorPart editor = IDE.openEditor(activePage, input, editorID); // Select the line @@ -219,7 +219,7 @@ public class ProfileUIUtils { Path p = new Path (path); if (p.toFile().exists()) { - IWorkbenchPage activePage = ProfileUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage(); + IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); IFileStore fileStore = EFS.getLocalFileSystem().getStore(p); IEditorPart editor = IDE.openEditorOnFileStore(activePage, fileStore); diff --git a/profiling/org.eclipse.linuxtools.rdt.proxy.tests/.classpath b/profiling/org.eclipse.linuxtools.rdt.proxy.tests/.classpath index eca7bdba8f..a42a828e04 100644 --- a/profiling/org.eclipse.linuxtools.rdt.proxy.tests/.classpath +++ b/profiling/org.eclipse.linuxtools.rdt.proxy.tests/.classpath @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="src"> + <attributes> + <attribute name="test" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/profiling/org.eclipse.linuxtools.rdt.proxy.tests/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.rdt.proxy.tests/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..7adc0fb9a0 100644 --- a/profiling/org.eclipse.linuxtools.rdt.proxy.tests/.settings/org.eclipse.jdt.core.prefs +++ b/profiling/org.eclipse.linuxtools.rdt.proxy.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/profiling/org.eclipse.linuxtools.rdt.proxy.tests/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.rdt.proxy.tests/META-INF/MANIFEST.MF index 6769d877b5..c13a802785 100644 --- a/profiling/org.eclipse.linuxtools.rdt.proxy.tests/META-INF/MANIFEST.MF +++ b/profiling/org.eclipse.linuxtools.rdt.proxy.tests/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.linuxtools.rdt.proxy.tests Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Linux Tools Fragment-Host: org.eclipse.linuxtools.rdt.proxy;bundle-version="2.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.junit;bundle-version="4.12.0", org.eclipse.linuxtools.remote.proxy.tests;bundle-version="1.0.0", org.eclipse.ptp.rdt.sync.core;bundle-version="5.0.0", diff --git a/profiling/org.eclipse.linuxtools.rdt.proxy.tests/pom.xml b/profiling/org.eclipse.linuxtools.rdt.proxy.tests/pom.xml index 5705237f2b..a1ba17b798 100644 --- a/profiling/org.eclipse.linuxtools.rdt.proxy.tests/pom.xml +++ b/profiling/org.eclipse.linuxtools.rdt.proxy.tests/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>linuxtools-profiling-parent</artifactId> <groupId>org.eclipse.linuxtools.profiling</groupId> - <version>7.4.0-SNAPSHOT</version> + <version>8.6.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.linuxtools.rdt.proxy.tests</artifactId> diff --git a/profiling/org.eclipse.linuxtools.rdt.proxy.tests/src/org/eclipse/linuxtools/rdt/proxy/tests/AllTests.java b/profiling/org.eclipse.linuxtools.rdt.proxy.tests/src/org/eclipse/linuxtools/rdt/proxy/tests/AllTests.java deleted file mode 100644 index 14b31fb96d..0000000000 --- a/profiling/org.eclipse.linuxtools.rdt.proxy.tests/src/org/eclipse/linuxtools/rdt/proxy/tests/AllTests.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2018 Red Hat, Inc and others. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - *******************************************************************************/ -package org.eclipse.linuxtools.rdt.proxy.tests; - -import org.eclipse.linuxtools.rdt.proxy.tests.CommandLauncherProxyTest; -import org.eclipse.linuxtools.rdt.proxy.tests.FileProxyTest; -import org.eclipse.linuxtools.rdt.proxy.tests.RemoteProxyManagerTest; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -@RunWith(Suite.class) -@SuiteClasses({CommandLauncherProxyTest.class, FileProxyTest.class, - RemoteProxyManagerTest.class -}) -public class AllTests { - -} diff --git a/profiling/org.eclipse.linuxtools.rdt.proxy/.classpath b/profiling/org.eclipse.linuxtools.rdt.proxy/.classpath index 43b986286a..1db08c6b4c 100644 --- a/profiling/org.eclipse.linuxtools.rdt.proxy/.classpath +++ b/profiling/org.eclipse.linuxtools.rdt.proxy/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="target/classes"/> diff --git a/profiling/org.eclipse.linuxtools.rdt.proxy/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.rdt.proxy/.settings/org.eclipse.jdt.core.prefs index ecff7d5825..479172bc65 100644 --- a/profiling/org.eclipse.linuxtools.rdt.proxy/.settings/org.eclipse.jdt.core.prefs +++ b/profiling/org.eclipse.linuxtools.rdt.proxy/.settings/org.eclipse.jdt.core.prefs @@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -22,6 +22,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore @@ -65,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -96,4 +98,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/profiling/org.eclipse.linuxtools.rdt.proxy/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.rdt.proxy/META-INF/MANIFEST.MF index 2d88901934..dbb96078f1 100644 --- a/profiling/org.eclipse.linuxtools.rdt.proxy/META-INF/MANIFEST.MF +++ b/profiling/org.eclipse.linuxtools.rdt.proxy/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.resources;bundle-version="3.7.100", org.eclipse.core.filesystem;bundle-version="1.3.100" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Localization: plugin Bundle-Vendor: %provider Import-Package: org.eclipse.cdt.utils.pty diff --git a/profiling/org.eclipse.linuxtools.rdt.proxy/pom.xml b/profiling/org.eclipse.linuxtools.rdt.proxy/pom.xml index 8148a575b9..60f233292c 100644 --- a/profiling/org.eclipse.linuxtools.rdt.proxy/pom.xml +++ b/profiling/org.eclipse.linuxtools.rdt.proxy/pom.xml @@ -15,7 +15,7 @@ <parent> <artifactId>linuxtools-profiling-parent</artifactId> <groupId>org.eclipse.linuxtools.profiling</groupId> - <version>7.4.0-SNAPSHOT</version> + <version>8.6.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.linuxtools.rdt.proxy</artifactId> diff --git a/profiling/org.eclipse.linuxtools.remote.proxy.tests/.classpath b/profiling/org.eclipse.linuxtools.remote.proxy.tests/.classpath index 43b986286a..a621c21ac5 100644 --- a/profiling/org.eclipse.linuxtools.remote.proxy.tests/.classpath +++ b/profiling/org.eclipse.linuxtools.remote.proxy.tests/.classpath @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="src"> + <attributes> + <attribute name="test" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/profiling/org.eclipse.linuxtools.remote.proxy.tests/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.remote.proxy.tests/.settings/org.eclipse.jdt.core.prefs index fc262faca2..e60dd8dd4f 100644 --- a/profiling/org.eclipse.linuxtools.remote.proxy.tests/.settings/org.eclipse.jdt.core.prefs +++ b/profiling/org.eclipse.linuxtools.remote.proxy.tests/.settings/org.eclipse.jdt.core.prefs @@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullanalysis=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=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -23,6 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore @@ -66,6 +67,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -98,4 +100,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/profiling/org.eclipse.linuxtools.remote.proxy.tests/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.remote.proxy.tests/META-INF/MANIFEST.MF index b8f75d5e75..d1b1571f17 100644 --- a/profiling/org.eclipse.linuxtools.remote.proxy.tests/META-INF/MANIFEST.MF +++ b/profiling/org.eclipse.linuxtools.remote.proxy.tests/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.filesystem, org.eclipse.ptp.rdt.sync.core, org.eclipse.ptp.rdt.sync.git.core;bundle-version="2.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.linuxtools.remote.proxy.tests; x-friends:="org.eclipse.linuxtools.tools.launch.core.tests, diff --git a/profiling/org.eclipse.linuxtools.remote.proxy.tests/pom.xml b/profiling/org.eclipse.linuxtools.remote.proxy.tests/pom.xml index 1ef2fe5337..f995cc238d 100644 --- a/profiling/org.eclipse.linuxtools.remote.proxy.tests/pom.xml +++ b/profiling/org.eclipse.linuxtools.remote.proxy.tests/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>linuxtools-profiling-parent</artifactId> <groupId>org.eclipse.linuxtools.profiling</groupId> - <version>7.4.0-SNAPSHOT</version> + <version>8.6.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.linuxtools.remote.proxy.tests</artifactId> diff --git a/profiling/org.eclipse.linuxtools.remote.proxy.tests/src/org/eclipse/linuxtools/remote/proxy/tests/AbstractProxyTest.java b/profiling/org.eclipse.linuxtools.remote.proxy.tests/src/org/eclipse/linuxtools/remote/proxy/tests/AbstractProxyTest.java index d3f5fb4b73..076c63ef0b 100644 --- a/profiling/org.eclipse.linuxtools.remote.proxy.tests/src/org/eclipse/linuxtools/remote/proxy/tests/AbstractProxyTest.java +++ b/profiling/org.eclipse.linuxtools.remote.proxy.tests/src/org/eclipse/linuxtools/remote/proxy/tests/AbstractProxyTest.java @@ -21,7 +21,7 @@ import org.eclipse.ptp.rdt.sync.core.SyncConfigManager; import org.eclipse.ptp.rdt.sync.core.SyncFlag; import org.eclipse.ptp.rdt.sync.core.SyncManager; import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.utils.Platform; +import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.ILaunchConfigurationType; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; diff --git a/profiling/org.eclipse.linuxtools.ssh.proxy/.classpath b/profiling/org.eclipse.linuxtools.ssh.proxy/.classpath index 43b986286a..1db08c6b4c 100644 --- a/profiling/org.eclipse.linuxtools.ssh.proxy/.classpath +++ b/profiling/org.eclipse.linuxtools.ssh.proxy/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="target/classes"/> diff --git a/profiling/org.eclipse.linuxtools.ssh.proxy/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.ssh.proxy/.settings/org.eclipse.jdt.core.prefs index d95d6765af..b4c66793cf 100644 --- a/profiling/org.eclipse.linuxtools.ssh.proxy/.settings/org.eclipse.jdt.core.prefs +++ b/profiling/org.eclipse.linuxtools.ssh.proxy/.settings/org.eclipse.jdt.core.prefs @@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -23,6 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore @@ -79,6 +80,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -110,4 +112,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/profiling/org.eclipse.linuxtools.ssh.proxy/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.ssh.proxy/META-INF/MANIFEST.MF index 0cb264145d..abeb783a0b 100644 --- a/profiling/org.eclipse.linuxtools.ssh.proxy/META-INF/MANIFEST.MF +++ b/profiling/org.eclipse.linuxtools.ssh.proxy/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui, com.jcraft.jsch;bundle-version="0.1.44", org.eclipse.remote.jsch.core Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Localization: plugin Bundle-Vendor: %provider Import-Package: org.eclipse.cdt.utils.pty diff --git a/profiling/org.eclipse.linuxtools.ssh.proxy/pom.xml b/profiling/org.eclipse.linuxtools.ssh.proxy/pom.xml index a1519fe943..8be04c1aa0 100644 --- a/profiling/org.eclipse.linuxtools.ssh.proxy/pom.xml +++ b/profiling/org.eclipse.linuxtools.ssh.proxy/pom.xml @@ -15,7 +15,7 @@ <parent> <artifactId>linuxtools-profiling-parent</artifactId> <groupId>org.eclipse.linuxtools.profiling</groupId> - <version>7.4.0-SNAPSHOT</version> + <version>8.6.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.linuxtools.ssh.proxy</artifactId> diff --git a/profiling/org.eclipse.linuxtools.tools.launch.core.tests/.classpath b/profiling/org.eclipse.linuxtools.tools.launch.core.tests/.classpath index eca7bdba8f..a42a828e04 100644 --- a/profiling/org.eclipse.linuxtools.tools.launch.core.tests/.classpath +++ b/profiling/org.eclipse.linuxtools.tools.launch.core.tests/.classpath @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="src"> + <attributes> + <attribute name="test" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/profiling/org.eclipse.linuxtools.tools.launch.core.tests/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.tools.launch.core.tests/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..7adc0fb9a0 100644 --- a/profiling/org.eclipse.linuxtools.tools.launch.core.tests/.settings/org.eclipse.jdt.core.prefs +++ b/profiling/org.eclipse.linuxtools.tools.launch.core.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/profiling/org.eclipse.linuxtools.tools.launch.core.tests/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.tools.launch.core.tests/META-INF/MANIFEST.MF index fa377303bd..0a06bc06dd 100644 --- a/profiling/org.eclipse.linuxtools.tools.launch.core.tests/META-INF/MANIFEST.MF +++ b/profiling/org.eclipse.linuxtools.tools.launch.core.tests/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources;bundle-version="3.11.0", org.eclipse.linuxtools.profiling.tests;bundle-version="1.1.0", org.eclipse.cdt.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.eclipse.debug.core, org.eclipse.linuxtools.remote.proxy.tests Automatic-Module-Name: org.eclipse.linuxtools.tools.launch.core.tests diff --git a/profiling/org.eclipse.linuxtools.tools.launch.core.tests/pom.xml b/profiling/org.eclipse.linuxtools.tools.launch.core.tests/pom.xml index 025eb73c7c..11b503b00d 100644 --- a/profiling/org.eclipse.linuxtools.tools.launch.core.tests/pom.xml +++ b/profiling/org.eclipse.linuxtools.tools.launch.core.tests/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>linuxtools-profiling-parent</artifactId> <groupId>org.eclipse.linuxtools.profiling</groupId> - <version>7.4.0-SNAPSHOT</version> + <version>8.6.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.linuxtools.tools.launch.core.tests</artifactId> diff --git a/profiling/org.eclipse.linuxtools.tools.launch.core/.classpath b/profiling/org.eclipse.linuxtools.tools.launch.core/.classpath index 43b986286a..1db08c6b4c 100644 --- a/profiling/org.eclipse.linuxtools.tools.launch.core/.classpath +++ b/profiling/org.eclipse.linuxtools.tools.launch.core/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="target/classes"/> diff --git a/profiling/org.eclipse.linuxtools.tools.launch.core/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.tools.launch.core/.settings/org.eclipse.jdt.core.prefs index 23c31dd4af..0a1912d325 100644 --- a/profiling/org.eclipse.linuxtools.tools.launch.core/.settings/org.eclipse.jdt.core.prefs +++ b/profiling/org.eclipse.linuxtools.tools.launch.core/.settings/org.eclipse.jdt.core.prefs @@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullanalysis=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=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -24,6 +24,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore @@ -80,6 +81,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -111,4 +113,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/profiling/org.eclipse.linuxtools.tools.launch.core/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.tools.launch.core/META-INF/MANIFEST.MF index aab2ae789c..d8859e8772 100644 --- a/profiling/org.eclipse.linuxtools.tools.launch.core/META-INF/MANIFEST.MF +++ b/profiling/org.eclipse.linuxtools.tools.launch.core/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.linuxtools.profiling.launch;bundle-version="0.10.0", org.eclipse.core.filesystem;bundle-version="1.3.100", com.jcraft.jsch -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.linuxtools.tools.launch.core,org.eclipse.l inuxtools.tools.launch.core.factory,org.eclipse.linuxtools.tools.laun diff --git a/profiling/org.eclipse.linuxtools.tools.launch.core/pom.xml b/profiling/org.eclipse.linuxtools.tools.launch.core/pom.xml index 9b7865508b..15f859610d 100644 --- a/profiling/org.eclipse.linuxtools.tools.launch.core/pom.xml +++ b/profiling/org.eclipse.linuxtools.tools.launch.core/pom.xml @@ -15,7 +15,7 @@ <parent> <artifactId>linuxtools-profiling-parent</artifactId> <groupId>org.eclipse.linuxtools.profiling</groupId> - <version>7.4.0-SNAPSHOT</version> + <version>8.6.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.linuxtools.tools.launch.core</artifactId> diff --git a/profiling/org.eclipse.linuxtools.tools.launch.ui/.classpath b/profiling/org.eclipse.linuxtools.tools.launch.ui/.classpath index 43b986286a..1db08c6b4c 100644 --- a/profiling/org.eclipse.linuxtools.tools.launch.ui/.classpath +++ b/profiling/org.eclipse.linuxtools.tools.launch.ui/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="target/classes"/> diff --git a/profiling/org.eclipse.linuxtools.tools.launch.ui/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.tools.launch.ui/.settings/org.eclipse.jdt.core.prefs index 89403a7799..649554d9b3 100644 --- a/profiling/org.eclipse.linuxtools.tools.launch.ui/.settings/org.eclipse.jdt.core.prefs +++ b/profiling/org.eclipse.linuxtools.tools.launch.ui/.settings/org.eclipse.jdt.core.prefs @@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -18,6 +18,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore @@ -61,6 +62,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -92,4 +94,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/profiling/org.eclipse.linuxtools.tools.launch.ui/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.tools.launch.ui/META-INF/MANIFEST.MF index 21e2ddf819..50d65b0780 100644 --- a/profiling/org.eclipse.linuxtools.tools.launch.ui/META-INF/MANIFEST.MF +++ b/profiling/org.eclipse.linuxtools.tools.launch.ui/META-INF/MANIFEST.MF @@ -9,6 +9,6 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.109.100", org.eclipse.core.runtime, org.eclipse.core.resources, org.eclipse.linuxtools.tools.launch.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.linuxtools.tools.launch.ui diff --git a/profiling/org.eclipse.linuxtools.tools.launch.ui/pom.xml b/profiling/org.eclipse.linuxtools.tools.launch.ui/pom.xml index 461376b6a4..b1cd3c6901 100644 --- a/profiling/org.eclipse.linuxtools.tools.launch.ui/pom.xml +++ b/profiling/org.eclipse.linuxtools.tools.launch.ui/pom.xml @@ -15,7 +15,7 @@ <parent> <artifactId>linuxtools-profiling-parent</artifactId> <groupId>org.eclipse.linuxtools.profiling</groupId> - <version>7.4.0-SNAPSHOT</version> + <version>8.6.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.linuxtools.tools.launch.ui</artifactId> diff --git a/profiling/pom.xml b/profiling/pom.xml index 8d68960cd0..ef90be2d84 100644 --- a/profiling/pom.xml +++ b/profiling/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.linuxtools</groupId> <artifactId>linuxtools-parent</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>8.6.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.linuxtools.profiling</groupId> |