diff -Nru eclipse-jdt-ui-4.12/debian/build.xml eclipse-jdt-ui-4.15/debian/build.xml --- eclipse-jdt-ui-4.12/debian/build.xml 2019-07-17 11:32:57.000000000 +0000 +++ eclipse-jdt-ui-4.15/debian/build.xml 2020-05-07 11:52:58.000000000 +0000 @@ -26,6 +26,7 @@

+ diff -Nru eclipse-jdt-ui-4.12/debian/changelog eclipse-jdt-ui-4.15/debian/changelog --- eclipse-jdt-ui-4.12/debian/changelog 2019-08-06 07:14:34.000000000 +0000 +++ eclipse-jdt-ui-4.15/debian/changelog 2020-05-07 21:39:22.000000000 +0000 @@ -1,3 +1,14 @@ +eclipse-jdt-ui (4.15-1) unstable; urgency=medium + + * New upstream release + - Depend on libeclipse-jdt-core-java (>= 3.20) + - Depend on libeclipse-jface-text-java (>= 3.16) + - Updated the bundle dependencies + * Standards-Version updated to 4.5.0 + * Switch to debhelper level 12 + + -- Emmanuel Bourg Thu, 07 May 2020 23:39:22 +0200 + eclipse-jdt-ui (4.12-1) unstable; urgency=medium * New upstream release diff -Nru eclipse-jdt-ui-4.12/debian/compat eclipse-jdt-ui-4.15/debian/compat --- eclipse-jdt-ui-4.12/debian/compat 2019-07-17 11:32:57.000000000 +0000 +++ eclipse-jdt-ui-4.15/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru eclipse-jdt-ui-4.12/debian/control eclipse-jdt-ui-4.15/debian/control --- eclipse-jdt-ui-4.12/debian/control 2019-08-06 07:14:20.000000000 +0000 +++ eclipse-jdt-ui-4.15/debian/control 2020-05-07 11:56:11.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers Uploaders: Emmanuel Bourg Build-Depends: - debhelper (>= 11), + debhelper-compat (= 12), default-jdk, ant, junit, @@ -23,10 +23,10 @@ libeclipse-debug-core-java, libeclipse-debug-ui-java, libeclipse-help-java, - libeclipse-jdt-core-java (>= 3.18), + libeclipse-jdt-core-java (>= 3.20), libeclipse-jdt-launching-java (>= 3.11), libeclipse-jface-java (>= 3.14), - libeclipse-jface-text-java (>= 3.15), + libeclipse-jface-text-java (>= 3.16), libeclipse-search-java, libeclipse-team-core-java, libeclipse-team-ui-java, @@ -48,7 +48,7 @@ libicu4j-java, libswt-gtk-4-java, eclipse-debian-helper -Standards-Version: 4.4.0 +Standards-Version: 4.5.0 Vcs-Git: https://salsa.debian.org/java-team/eclipse-jdt-ui.git Vcs-Browser: https://salsa.debian.org/java-team/eclipse-jdt-ui Homepage: https://www.eclipse.org/jdt/ui/ @@ -105,13 +105,14 @@ Depends: ${misc:Depends}, ${bundle:Depends}, + libeclipse-core-contenttype-java, libeclipse-core-expressions-java, libeclipse-core-filebuffers-java, libeclipse-core-filesystem-java, libeclipse-core-jobs-java, libeclipse-core-resources-java, libeclipse-core-runtime-java, - libeclipse-jdt-core-java (>= 3.18), + libeclipse-jdt-core-java (>= 3.20), libeclipse-jdt-launching-java, libeclipse-text-java (>= 3.8), libequinox-common-java, @@ -274,7 +275,7 @@ libeclipse-jdt-core-java (>= 3.16), libeclipse-jdt-launching-java (>= 3.11), libeclipse-jface-java (>= 3.14), - libeclipse-jface-text-java (>= 3.15), + libeclipse-jface-text-java (>= 3.16), libeclipse-search-java, libeclipse-team-core-java, libeclipse-team-ui-java, diff -Nru eclipse-jdt-ui-4.12/org.eclipse.jdt.astview/build.properties eclipse-jdt-ui-4.15/org.eclipse.jdt.astview/build.properties --- eclipse-jdt-ui-4.12/org.eclipse.jdt.astview/build.properties 2019-06-01 21:39:59.000000000 +0000 +++ eclipse-jdt-ui-4.15/org.eclipse.jdt.astview/build.properties 2020-02-26 15:31:57.000000000 +0000 @@ -20,5 +20,5 @@ source.. = src/ output.. = bin/ -jre.compilation.profile = JavaSE-1.7 +jre.compilation.profile = JavaSE-1.8 javacDefaultEncoding.. = UTF-8 diff -Nru eclipse-jdt-ui-4.12/org.eclipse.jdt.astview/META-INF/MANIFEST.MF eclipse-jdt-ui-4.15/org.eclipse.jdt.astview/META-INF/MANIFEST.MF --- eclipse-jdt-ui-4.12/org.eclipse.jdt.astview/META-INF/MANIFEST.MF 2019-06-01 21:39:59.000000000 +0000 +++ eclipse-jdt-ui-4.15/org.eclipse.jdt.astview/META-INF/MANIFEST.MF 2020-02-26 15:31:57.000000000 +0000 @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.astview; singleton:=true -Bundle-Version: 1.4.0.qualifier +Bundle-Version: 1.4.300.qualifier Eclipse-SourceReferences: scm:git:git://git.eclipse.org/gitroot/jdt/eclipse.jdt.ui.git;path="org.eclipse.jdt.astview";tag=R4_4 Bundle-Activator: org.eclipse.jdt.astview.ASTViewPlugin Bundle-Vendor: %providerName diff -Nru eclipse-jdt-ui-4.12/org.eclipse.jdt.astview/pom.xml eclipse-jdt-ui-4.15/org.eclipse.jdt.astview/pom.xml --- eclipse-jdt-ui-4.12/org.eclipse.jdt.astview/pom.xml 2019-06-01 21:39:59.000000000 +0000 +++ eclipse-jdt-ui-4.15/org.eclipse.jdt.astview/pom.xml 2020-02-26 15:31:57.000000000 +0000 @@ -14,10 +14,10 @@ eclipse.jdt.ui eclipse.jdt.ui - 4.12.0-SNAPSHOT + 4.15.0-SNAPSHOT org.eclipse.jdt org.eclipse.jdt.astview - 1.4.0-SNAPSHOT + 1.4.300-SNAPSHOT eclipse-plugin diff -Nru eclipse-jdt-ui-4.12/org.eclipse.jdt.astview/.settings/org.eclipse.jdt.ui.prefs eclipse-jdt-ui-4.15/org.eclipse.jdt.astview/.settings/org.eclipse.jdt.ui.prefs --- eclipse-jdt-ui-4.12/org.eclipse.jdt.astview/.settings/org.eclipse.jdt.ui.prefs 2019-06-01 21:39:59.000000000 +0000 +++ eclipse-jdt-ui-4.15/org.eclipse.jdt.astview/.settings/org.eclipse.jdt.ui.prefs 2020-02-26 15:31:57.000000000 +0000 @@ -1,4 +1,5 @@ eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_JDT UI Code Style Conventions formatter_settings_version=12 org.eclipse.jdt.ui.exception.name=e @@ -9,3 +10,69 @@ org.eclipse.jdt.ui.ondemandthreshold=99 org.eclipse.jdt.ui.overrideannotation=true org.eclipse.jdt.ui.staticondemandthreshold=99 +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=false +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=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=false +sp_cleanup.format_source_code_changes_only=false +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.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=false +sp_cleanup.remove_redundant_semicolons=false +sp_cleanup.remove_redundant_type_arguments=false +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=false +sp_cleanup.remove_unnecessary_casts=false +sp_cleanup.remove_unnecessary_nls_tags=false +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=false +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 diff -Nru eclipse-jdt-ui-4.12/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/ASTViewPlugin.java eclipse-jdt-ui-4.15/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/ASTViewPlugin.java --- eclipse-jdt-ui-4.12/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/ASTViewPlugin.java 2019-06-01 21:39:59.000000000 +0000 +++ eclipse-jdt-ui-4.15/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/ASTViewPlugin.java 2020-02-26 15:31:57.000000000 +0000 @@ -1,13 +1,13 @@ /******************************************************************************* * Copyright (c) 2000, 2005 IBM Corporation and others. * - * This program and the accompanying materials + * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -27,7 +27,7 @@ public ASTViewPlugin() { fgDefault= this; } - + public static String getPluginId() { return "org.eclipse.jdt.astview"; //$NON-NLS-1$ } @@ -38,15 +38,15 @@ public static ASTViewPlugin getDefault() { return fgDefault; } - + public static void log(IStatus status) { getDefault().getLog().log(status); } - + public static void logErrorMessage(String message) { log(new Status(IStatus.ERROR, getPluginId(), IStatus.ERROR, message, null)); } - + public static void logErrorStatus(String message, IStatus status) { if (status == null) { logErrorMessage(message); @@ -56,9 +56,9 @@ multi.add(status); log(multi); } - + public static void log(String message, Throwable e) { log(new Status(IStatus.ERROR, getPluginId(), IStatus.ERROR, message, e)); } - + } diff -Nru eclipse-jdt-ui-4.12/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/EditorUtility.java eclipse-jdt-ui-4.15/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/EditorUtility.java --- eclipse-jdt-ui-4.12/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/EditorUtility.java 2019-06-01 21:39:59.000000000 +0000 +++ eclipse-jdt-ui-4.15/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/EditorUtility.java 2020-02-26 15:31:57.000000000 +0000 @@ -1,13 +1,13 @@ /******************************************************************************* * Copyright (c) 2000, 2007 IBM Corporation and others. * - * This program and the accompanying materials + * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -18,6 +18,8 @@ import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; + import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.jdt.core.IJavaElement; @@ -34,7 +36,7 @@ } public static IEditorPart getActiveEditor() { - IWorkbenchWindow window= ASTViewPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow(); + IWorkbenchWindow window= PlatformUI.getWorkbench().getActiveWorkbenchWindow(); if (window != null) { IWorkbenchPage page= window.getActivePage(); if (page != null) { @@ -43,7 +45,7 @@ } return null; } - + public static ITypeRoot getJavaInput(IEditorPart part) { IEditorInput editorInput= part.getEditorInput(); if (editorInput != null) { @@ -52,7 +54,7 @@ return (ITypeRoot) input; } } - return null; + return null; } public static void selectInEditor(ITextEditor editor, int offset, int length) { diff -Nru eclipse-jdt-ui-4.12/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/TreeInfoCollector.java eclipse-jdt-ui-4.15/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/TreeInfoCollector.java --- eclipse-jdt-ui-4.12/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/TreeInfoCollector.java 2019-06-01 21:39:59.000000000 +0000 +++ eclipse-jdt-ui-4.15/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/TreeInfoCollector.java 2020-02-26 15:31:57.000000000 +0000 @@ -1,7 +1,7 @@ /******************************************************************************* * Copyright (c) 2000, 2013 IBM Corporation and others. * - * This program and the accompanying materials + * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ @@ -21,18 +21,18 @@ * */ public class TreeInfoCollector { - + public static class NodeCounter extends ASTVisitor { public int numberOfNodes= 0; - + @Override public void preVisit(ASTNode node) { numberOfNodes++; } } - - + + private final CompilationUnit fRoot; public TreeInfoCollector(CompilationUnit root) { @@ -42,12 +42,12 @@ public int getSize() { return fRoot.subtreeBytes(); } - + public int getNumberOfNodes() { NodeCounter counter= new NodeCounter(); fRoot.accept(counter); return counter.numberOfNodes; } - + } diff -Nru eclipse-jdt-ui-4.12/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTAttribute.java eclipse-jdt-ui-4.15/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTAttribute.java --- eclipse-jdt-ui-4.12/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTAttribute.java 2019-06-01 21:39:59.000000000 +0000 +++ eclipse-jdt-ui-4.15/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTAttribute.java 2020-02-26 15:31:57.000000000 +0000 @@ -1,13 +1,13 @@ /******************************************************************************* * Copyright (c) 2000, 2005 IBM Corporation and others. * - * This program and the accompanying materials + * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -21,14 +21,14 @@ * */ public abstract class ASTAttribute { - + protected static final Object[] EMPTY= new Object[0]; public abstract Object getParent(); public abstract Object[] getChildren(); public abstract String getLabel(); public abstract Image getImage(); - + public ASTNode getParentASTNode() { Object parent= getParent(); while (parent instanceof ASTAttribute) { @@ -39,5 +39,5 @@ } return null; } - + } diff -Nru eclipse-jdt-ui-4.12/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewContentProvider.java eclipse-jdt-ui-4.15/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewContentProvider.java --- eclipse-jdt-ui-4.12/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewContentProvider.java 2019-06-01 21:39:59.000000000 +0000 +++ eclipse-jdt-ui-4.15/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewContentProvider.java 2020-02-26 15:31:57.000000000 +0000 @@ -1,7 +1,7 @@ /******************************************************************************* * Copyright (c) 2000, 2017 IBM Corporation and others. * - * This program and the accompanying materials + * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ @@ -62,16 +62,16 @@ @Override public void inputChanged(Viewer v, Object oldInput, Object newInput) { } - + @Override public void dispose() { } - + @Override public Object[] getElements(Object parent) { return getChildren(parent); } - + @Override public Object getParent(Object child) { if (child instanceof ASTNode) { @@ -96,7 +96,7 @@ } return new Object[0]; } - + private Object[] getNodeChildren(ASTNode node) { ArrayList

Java Model

DOM AST