diff options
author | Alexander Kurtakov | 2020-07-14 13:25:51 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2020-07-14 13:25:51 +0000 |
commit | 771b127cedee9dc58390fd64e211671c2a458830 (patch) | |
tree | d19dce29e621d933b1f5570faf74b249d1ad67a6 | |
parent | e0007a1ce82881c97735abccd24c137ba32dc86f (diff) | |
download | rt.equinox.framework-771b127cedee9dc58390fd64e211671c2a458830.tar.gz rt.equinox.framework-771b127cedee9dc58390fd64e211671c2a458830.tar.xz rt.equinox.framework-771b127cedee9dc58390fd64e211671c2a458830.zip |
Remove redundant type arguments.Y20200727-0310Y20200725-1200Y20200722-1200Y20200722-0040Y20200721-0610Y20200721-0450Y20200718-1200Y20200716-0820Y20200715-1200I20200726-1800I20200724-1800I20200724-0600I20200723-1800I20200723-1030I20200723-0620I20200722-1800I20200722-1140I20200722-0610I20200721-1800I20200721-1400I20200721-0950I20200721-0610I20200721-0130I20200720-1800I20200720-0850I20200720-0020I20200719-2010I20200718-1800I20200717-1800I20200716-1800I20200715-1800I20200714-1800
And enable save actions so this is auto done in the future.
Change-Id: Ib36fb320fd0857838ebc83c314267a5da63f3e29
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
3 files changed, 55 insertions, 9 deletions
diff --git a/bundles/org.eclipse.osgi.compatibility.state/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.osgi.compatibility.state/.settings/org.eclipse.jdt.ui.prefs index f7a344cd2..8a2a58592 100644 --- a/bundles/org.eclipse.osgi.compatibility.state/.settings/org.eclipse.jdt.ui.prefs +++ b/bundles/org.eclipse.osgi.compatibility.state/.settings/org.eclipse.jdt.ui.prefs @@ -10,33 +10,48 @@ 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=false 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.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=false sp_cleanup.make_parameters_final=false sp_cleanup.make_private_fields_final=true -sp_cleanup.make_variable_declarations_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.on_save_use_additional_actions=false +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=true sp_cleanup.remove_trailing_whitespaces=false 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=true sp_cleanup.remove_unnecessary_nls_tags=false sp_cleanup.remove_unused_imports=false @@ -45,12 +60,19 @@ 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=false 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/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateBuilder.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateBuilder.java index 391f738af..65e441261 100644 --- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateBuilder.java +++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateBuilder.java @@ -743,7 +743,7 @@ public class StateBuilder { Map<String, Object> mapAttrs = getAttributes(element, new String[0]); if (profileIndex != null) mapAttrs.put(ExportPackageDescriptionImpl.EQUINOX_EE, profileIndex); - Dictionary<String, Object> attrs = mapAttrs == null ? new Hashtable<String, Object>() : new Hashtable<>(mapAttrs); + Dictionary<String, Object> attrs = mapAttrs == null ? new Hashtable<>() : new Hashtable<>(mapAttrs); desc.setAttributes(attrs); Map<String, String> directives = new HashMap<>(); Enumeration<String> keys = element.getDirectiveKeys(); @@ -776,7 +776,7 @@ public class StateBuilder { throw new BundleException("A bundle is not allowed to define a capability in the " + IdentityNamespace.IDENTITY_NAMESPACE + " name space."); //$NON-NLS-1$ //$NON-NLS-2$ } Map<String, Object> mapAttrs = getAttributes(equinoxCapability, new String[] {Constants.VERSION_ATTRIBUTE}); - Dictionary<String, Object> attrs = mapAttrs == null ? new Hashtable<String, Object>() : new Hashtable<>(mapAttrs); + Dictionary<String, Object> attrs = mapAttrs == null ? new Hashtable<>() : new Hashtable<>(mapAttrs); attrs.put(desc.getType(), name); String versionString = equinoxCapability.getAttribute(Constants.VERSION_ATTRIBUTE); if (versionString != null) diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateObjectFactoryImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateObjectFactoryImpl.java index c3f095acb..e7b26ea87 100644 --- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateObjectFactoryImpl.java +++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateObjectFactoryImpl.java @@ -13,14 +13,38 @@ *******************************************************************************/ package org.eclipse.osgi.internal.resolver; -import java.io.*; -import java.util.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Dictionary; +import java.util.Hashtable; +import java.util.List; +import java.util.Map; import org.eclipse.osgi.internal.module.ResolverImpl; -import org.eclipse.osgi.service.resolver.*; +import org.eclipse.osgi.service.resolver.BundleDescription; +import org.eclipse.osgi.service.resolver.BundleSpecification; +import org.eclipse.osgi.service.resolver.DisabledInfo; +import org.eclipse.osgi.service.resolver.ExportPackageDescription; +import org.eclipse.osgi.service.resolver.GenericDescription; +import org.eclipse.osgi.service.resolver.GenericSpecification; +import org.eclipse.osgi.service.resolver.HostSpecification; +import org.eclipse.osgi.service.resolver.ImportPackageSpecification; +import org.eclipse.osgi.service.resolver.NativeCodeDescription; +import org.eclipse.osgi.service.resolver.NativeCodeSpecification; +import org.eclipse.osgi.service.resolver.State; +import org.eclipse.osgi.service.resolver.StateObjectFactory; import org.eclipse.osgi.service.resolver.VersionRange; import org.eclipse.osgi.storagemanager.StorageManager; import org.eclipse.osgi.util.ManifestElement; -import org.osgi.framework.*; +import org.osgi.framework.BundleException; +import org.osgi.framework.Constants; +import org.osgi.framework.InvalidSyntaxException; +import org.osgi.framework.Version; public class StateObjectFactoryImpl implements StateObjectFactory { @@ -333,7 +357,7 @@ public class StateObjectFactoryImpl implements StateObjectFactory { private GenericDescription createGenericDescription(String name, String type, Version version, Map<String, ?> attributes, Map<String, String> directives, BundleDescription supplier) { GenericDescriptionImpl result = new GenericDescriptionImpl(); result.setType(type); - Dictionary<String, Object> attrs = attributes == null ? new Hashtable<String, Object>() : new Hashtable<>(attributes); + Dictionary<String, Object> attrs = attributes == null ? new Hashtable<>() : new Hashtable<>(attributes); if (version != null) { Object versionObj = attrs.get(Constants.VERSION_ATTRIBUTE); if (!(versionObj instanceof Version) && version != null) |