Move o.e.dltk.python.debug to Java 8. Bump BREE and enable Save actions to clean up the code. Change-Id: Ia654e5b0145f1290f18b03be5a16b943c8508d26 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/plugins/org.eclipse.dltk.python.debug/.classpath b/plugins/org.eclipse.dltk.python.debug/.classpath index ce73933..eca7bdb 100644 --- a/plugins/org.eclipse.dltk.python.debug/.classpath +++ b/plugins/org.eclipse.dltk.python.debug/.classpath
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <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="src" path="src"/> <classpathentry kind="output" path="bin"/> </classpath>
diff --git a/plugins/org.eclipse.dltk.python.debug/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.dltk.python.debug/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..0c68a61 --- /dev/null +++ b/plugins/org.eclipse.dltk.python.debug/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@ +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.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.eclipse.dltk.python.debug/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.dltk.python.debug/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000..43df84b --- /dev/null +++ b/plugins/org.eclipse.dltk.python.debug/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,59 @@ +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=false +sp_cleanup.convert_to_enhanced_for_loop=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.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.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_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_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_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
diff --git a/plugins/org.eclipse.dltk.python.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.python.debug/META-INF/MANIFEST.MF index c734bba..d9b517e 100644 --- a/plugins/org.eclipse.dltk.python.debug/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.dltk.python.debug/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Vendor: %pluginProvider Require-Bundle: org.eclipse.core.runtime, org.eclipse.dltk.debug -Eclipse-LazyStart: true +Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.dltk.python.internal.debug Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/debug/PythonTypeFactory.java b/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/debug/PythonTypeFactory.java index becaf2d..4c98861 100644 --- a/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/debug/PythonTypeFactory.java +++ b/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/debug/PythonTypeFactory.java
@@ -6,7 +6,8 @@ public class PythonTypeFactory implements IScriptTypeFactory { - public IScriptType buildType(String type) + @Override + public IScriptType buildType(String type) { // TODO: implement the right way :) return new AtomicScriptType(type);
diff --git a/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/internal/debug/PythonDebugPlugin.java b/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/internal/debug/PythonDebugPlugin.java index 775e86d..e2ceffd 100644 --- a/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/internal/debug/PythonDebugPlugin.java +++ b/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/internal/debug/PythonDebugPlugin.java
@@ -1,11 +1,10 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2016 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * - *******************************************************************************/ package org.eclipse.dltk.python.internal.debug; @@ -30,13 +29,15 @@ public PythonDebugPlugin() { } + @Override public void start(BundleContext context) throws Exception { super.start(context); plugin = this; } + @Override public void stop(BundleContext context) throws Exception { - try { + try { savePluginPreferences(); } finally { plugin = null; @@ -46,7 +47,7 @@ /** * Returns the shared instance - * + * * @return the shared instance */ public static PythonDebugPlugin getDefault() {
diff --git a/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/internal/debug/PythonDebugPreferenceInitializer.java b/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/internal/debug/PythonDebugPreferenceInitializer.java index 70dccd3..8753e31 100644 --- a/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/internal/debug/PythonDebugPreferenceInitializer.java +++ b/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/internal/debug/PythonDebugPreferenceInitializer.java
@@ -7,6 +7,7 @@ public class PythonDebugPreferenceInitializer extends AbstractPreferenceInitializer { + @Override public void initializeDefaultPreferences() { Preferences store = PythonDebugPlugin.getDefault() .getPluginPreferences();
diff --git a/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/internal/debug/PythonTypeFactory.java b/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/internal/debug/PythonTypeFactory.java index 958419e..1cbfab0 100644 --- a/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/internal/debug/PythonTypeFactory.java +++ b/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/internal/debug/PythonTypeFactory.java
@@ -9,11 +9,12 @@ public class PythonTypeFactory implements IScriptTypeFactory { private static final String[] atomicTypes = { }; - + public PythonTypeFactory() { - + } + @Override public IScriptType buildType(String type) { for (int i = 0; i < atomicTypes.length; ++i) { if (atomicTypes[i].equals(type)) {