diff options
author | Alexander Kurtakov | 2018-10-30 20:45:25 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2018-11-02 06:49:39 +0000 |
commit | 136932646392e68535fd158c0ce889b21bf7981e (patch) | |
tree | 96d75446e44676997fdeb4c64370d24d88af92ac | |
parent | f1ebb4ca8f03e0d9118fe5f832da8c6166c9f03b (diff) | |
download | rt.equinox.p2-136932646392e68535fd158c0ce889b21bf7981e.tar.gz rt.equinox.p2-136932646392e68535fd158c0ce889b21bf7981e.tar.xz rt.equinox.p2-136932646392e68535fd158c0ce889b21bf7981e.zip |
Use varargs reflection methods.I20181102-2120I20181102-1800
Updated p2.director formatter settings to use the default Eclipse
profile instead of the not-existing "core" one to prevent extra long
lines.
Change-Id: I4536824d8032f283e110e4aa7758feb7f110b0fc
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
16 files changed, 119 insertions, 57 deletions
diff --git a/bundles/org.eclipse.equinox.p2.director/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.p2.director/.settings/org.eclipse.jdt.core.prefs index 4021718ef..a01c791c7 100644 --- a/bundles/org.eclipse.equinox.p2.director/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.equinox.p2.director/.settings/org.eclipse.jdt.core.prefs @@ -16,6 +16,7 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullable.secondary= 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.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.8 @@ -124,6 +125,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error 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.release=disabled org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 diff --git a/bundles/org.eclipse.equinox.p2.director/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.equinox.p2.director/.settings/org.eclipse.jdt.ui.prefs index 9a640320c..eca5db842 100644 --- a/bundles/org.eclipse.equinox.p2.director/.settings/org.eclipse.jdt.ui.prefs +++ b/bundles/org.eclipse.equinox.p2.director/.settings/org.eclipse.jdt.ui.prefs @@ -11,18 +11,25 @@ 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.correct_indentation=false sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.insert_inferred_type_arguments=false sp_cleanup.make_local_variable_final=false 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=true sp_cleanup.never_use_blocks=false sp_cleanup.never_use_parentheses_in_expressions=true @@ -34,6 +41,9 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class= 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=false sp_cleanup.remove_trailing_whitespaces_all=true sp_cleanup.remove_trailing_whitespaces_ignore_empty=false @@ -47,8 +57,10 @@ 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=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 diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java index 0dc0d9177..160281a80 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java @@ -73,8 +73,8 @@ public class SimplePlanner implements IPlanner { if (DEBUG) { Object[] operands = new Object[0]; try { - Method getOperands = plan.getClass().getMethod("getOperands", new Class[0]); //$NON-NLS-1$ - operands = (Object[]) getOperands.invoke(plan, new Object[0]); + Method getOperands = plan.getClass().getMethod("getOperands"); //$NON-NLS-1$ + operands = (Object[]) getOperands.invoke(plan); } catch (Throwable e) { // ignore } diff --git a/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF index cdc7d1e41..b6984d40f 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.p2.metadata;singleton:=true -Bundle-Version: 2.4.100.qualifier +Bundle-Version: 2.4.200.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.metadata.MetadataActivator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.equinox.p2.metadata/pom.xml b/bundles/org.eclipse.equinox.p2.metadata/pom.xml index cce616b4b..df09130e8 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/pom.xml +++ b/bundles/org.eclipse.equinox.p2.metadata/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.p2.metadata</artifactId> - <version>2.4.100-SNAPSHOT</version> + <version>2.4.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/CoercingComparator.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/CoercingComparator.java index 46bb29c2e..19f8dd549 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/CoercingComparator.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/CoercingComparator.java @@ -103,7 +103,7 @@ public abstract class CoercingComparator<T> { T coerce(Object v) { if (v instanceof String) { try { - return constructor.newInstance(new Object[] {((String) v).trim()}); + return constructor.newInstance(((String) v).trim()); } catch (Exception e) { // } diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/ExpressionFactory.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/ExpressionFactory.java index 566f2bbaf..6608f78c1 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/ExpressionFactory.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/ExpressionFactory.java @@ -15,8 +15,16 @@ package org.eclipse.equinox.internal.p2.metadata.expression; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; -import java.util.*; -import org.eclipse.equinox.p2.metadata.expression.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.eclipse.equinox.p2.metadata.expression.IContextExpression; +import org.eclipse.equinox.p2.metadata.expression.IEvaluationContext; +import org.eclipse.equinox.p2.metadata.expression.IExpression; +import org.eclipse.equinox.p2.metadata.expression.IExpressionFactory; +import org.eclipse.equinox.p2.metadata.expression.IFilterExpression; +import org.eclipse.equinox.p2.metadata.expression.IMatchExpression; import org.eclipse.equinox.p2.query.IQuery; public class ExpressionFactory implements IExpressionFactory, IExpressionConstants { diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/AntMirrorLog.java b/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/AntMirrorLog.java index 0b0a63f42..d58211fa5 100644 --- a/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/AntMirrorLog.java +++ b/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/AntMirrorLog.java @@ -29,7 +29,7 @@ public class AntMirrorLog implements IArtifactMirrorLog { public AntMirrorLog(Object task) throws NoSuchMethodException { this.task = task; try { - log = task.getClass().getMethod("log", new Class[] {String.class, int.class}); //$NON-NLS-1$ + log = task.getClass().getMethod("log", String.class, int.class); //$NON-NLS-1$ } catch (SecurityException e) { exceptionOccurred(null, e); } @@ -67,7 +67,7 @@ public class AntMirrorLog implements IArtifactMirrorLog { */ private void log(String message, int statusSeverity) { try { - log.invoke(task, new Object[] {message, Integer.valueOf(mapLogLevels(statusSeverity))}); + log.invoke(task, message, Integer.valueOf(mapLogLevels(statusSeverity))); } catch (IllegalArgumentException e) { exceptionOccurred(message, e); } catch (IllegalAccessException e) { @@ -96,16 +96,16 @@ public class AntMirrorLog implements IArtifactMirrorLog { */ private int mapLogLevels(int iStatusLevel) { switch (iStatusLevel) { - case IStatus.ERROR : - return 0; - case IStatus.OK : - return 2; - case IStatus.INFO : - return 2; - case IStatus.WARNING : - return 1; - default : - return 1; + case IStatus.ERROR: + return 0; + case IStatus.OK: + return 2; + case IStatus.INFO: + return 2; + case IStatus.WARNING: + return 1; + default: + return 1; } } } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestArtifactRepository.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestArtifactRepository.java index 1cad972a3..fbf56c796 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestArtifactRepository.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestArtifactRepository.java @@ -13,19 +13,30 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.lang.reflect.Method; import java.net.URI; import java.net.URISyntaxException; -import java.util.*; -import org.eclipse.core.runtime.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.MultiStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.SubMonitor; import org.eclipse.equinox.internal.p2.artifact.repository.ArtifactRequest; import org.eclipse.equinox.internal.p2.repository.Transport; import org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepHandler; import org.eclipse.equinox.p2.core.IProvisioningAgent; import org.eclipse.equinox.p2.metadata.IArtifactKey; -import org.eclipse.equinox.p2.query.*; +import org.eclipse.equinox.p2.query.IQuery; +import org.eclipse.equinox.p2.query.IQueryResult; +import org.eclipse.equinox.p2.query.IQueryable; import org.eclipse.equinox.p2.repository.IRepository; import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor; import org.eclipse.equinox.p2.repository.artifact.IArtifactRequest; @@ -100,9 +111,9 @@ public class TestArtifactRepository extends AbstractArtifactRepository { public boolean addToRepositoryManager() { try { - Method method = AbstractRepositoryManager.class.getDeclaredMethod("addRepository", new Class[] {IRepository.class, boolean.class, String.class}); + Method method = AbstractRepositoryManager.class.getDeclaredMethod("addRepository", IRepository.class, boolean.class, String.class); method.setAccessible(true); - method.invoke(AbstractProvisioningTest.getArtifactRepositoryManager(), new Object[] {this, false, ""}); + method.invoke(AbstractProvisioningTest.getArtifactRepositoryManager(), this, false, ""); return true; } catch (Exception e) { return false; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/Bug252308.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/Bug252308.java index 918abfec1..336946456 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/Bug252308.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/Bug252308.java @@ -13,10 +13,16 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.artifact.repository; -import java.io.*; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; import java.lang.reflect.Method; import java.util.Map; -import org.eclipse.core.runtime.*; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.MultiStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.artifact.repository.MirrorRequest; import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactDescriptor; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; @@ -41,18 +47,18 @@ public class Bug252308 extends AbstractProvisioningTest { @Override protected void setUp() throws Exception { super.setUp(); - extractRootCause = MirrorRequest.class.getDeclaredMethod("extractRootCause", new Class[] {IStatus.class}); + extractRootCause = MirrorRequest.class.getDeclaredMethod("extractRootCause", IStatus.class); extractRootCause.setAccessible(true); - transferSingle = MirrorRequest.class.getDeclaredMethod("transferSingle", new Class[] {IArtifactDescriptor.class, IArtifactDescriptor.class, IProgressMonitor.class}); + transferSingle = MirrorRequest.class.getDeclaredMethod("transferSingle", IArtifactDescriptor.class, IArtifactDescriptor.class, IProgressMonitor.class); transferSingle.setAccessible(true); } private IStatus extractRootCause(IStatus status) throws Exception { - return (IStatus) extractRootCause.invoke(null, new Object[] {status}); + return (IStatus) extractRootCause.invoke(null, status); } private IStatus transferSingle(MirrorRequest request, IArtifactDescriptor destinationDescriptor, IArtifactDescriptor sourceDescriptor, IProgressMonitor monitor) throws Exception { - return (IStatus) transferSingle.invoke(request, new Object[] {destinationDescriptor, sourceDescriptor, monitor}); + return (IStatus) transferSingle.invoke(request, destinationDescriptor, sourceDescriptor, monitor); } public void testExtractRootCauseNullStatus() throws Exception { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/SimpleArtifactRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/SimpleArtifactRepositoryTest.java index d9efcdce5..f3bd0ee5d 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/SimpleArtifactRepositoryTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/SimpleArtifactRepositoryTest.java @@ -16,24 +16,40 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.artifact.repository; -import java.io.*; -import java.lang.reflect.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.net.URI; import java.net.URISyntaxException; -import java.util.*; -import org.eclipse.core.runtime.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository; import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepositoryFactory; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepHandler; import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.metadata.*; +import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.p2.metadata.Version; +import org.eclipse.equinox.p2.metadata.VersionRange; import org.eclipse.equinox.p2.query.IQueryResult; import org.eclipse.equinox.p2.query.IQueryable; import org.eclipse.equinox.p2.repository.IRepository; import org.eclipse.equinox.p2.repository.IRepositoryManager; -import org.eclipse.equinox.p2.repository.artifact.*; +import org.eclipse.equinox.p2.repository.artifact.ArtifactDescriptorQuery; +import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor; +import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository; +import org.eclipse.equinox.p2.repository.artifact.IArtifactRepositoryManager; +import org.eclipse.equinox.p2.repository.artifact.IProcessingStepDescriptor; import org.eclipse.equinox.p2.repository.artifact.spi.ArtifactDescriptor; import org.eclipse.equinox.p2.repository.artifact.spi.ProcessingStepDescriptor; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; @@ -479,6 +495,6 @@ public class SimpleArtifactRepositoryTest extends AbstractProvisioningTest { } private int getIntVal(Method m, Object repo) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException { - return ((Integer) m.invoke(repo, new Object[] {})).intValue(); + return ((Integer) m.invoke(repo)).intValue(); } } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/embeddedequinox/EmbeddedEquinox.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/embeddedequinox/EmbeddedEquinox.java index bc930b87a..a5912a01e 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/embeddedequinox/EmbeddedEquinox.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/embeddedequinox/EmbeddedEquinox.java @@ -47,10 +47,10 @@ public class EmbeddedEquinox { eclipseStarterClazz = frameworkLoader.loadClass("org.eclipse.core.runtime.adaptor.EclipseStarter"); Method setInitialProperties = eclipseStarterClazz.getMethod("setInitialProperties", Map.class); //$NON-NLS-1$ - setInitialProperties.invoke(null, new Object[] {frameworkProperties}); + setInitialProperties.invoke(null, frameworkProperties); Method runMethod = eclipseStarterClazz.getMethod("startup", String[].class, Runnable.class); //$NON-NLS-1$ - context = (BundleContext) runMethod.invoke(null, new Object[] {frameworkArgs, null}); + context = (BundleContext) runMethod.invoke(null, frameworkArgs, null); } catch (Throwable t) { if (t instanceof RuntimeException) throw (RuntimeException) t; @@ -61,8 +61,8 @@ public class EmbeddedEquinox { public void shutdown() { try { - Method shutdownMethod = eclipseStarterClazz.getMethod("shutdown", (Class[]) null); //$NON-NLS-1$ - shutdownMethod.invoke((Object[]) null, (Object[]) null); + Method shutdownMethod = eclipseStarterClazz.getMethod("shutdown"); //$NON-NLS-1$ + shutdownMethod.invoke((Object[]) null); } catch (Throwable t) { if (t instanceof RuntimeException) diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileRegistryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileRegistryTest.java index 87276970d..7b446c282 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileRegistryTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileRegistryTest.java @@ -13,12 +13,19 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.engine; -import java.io.*; +import java.io.File; +import java.io.FileFilter; +import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.eclipse.core.runtime.FileLocator; -import org.eclipse.equinox.internal.p2.engine.*; +import org.eclipse.equinox.internal.p2.engine.EngineActivator; +import org.eclipse.equinox.internal.p2.engine.Profile; +import org.eclipse.equinox.internal.p2.engine.SimpleProfileRegistry; import org.eclipse.equinox.p2.core.IAgentLocation; import org.eclipse.equinox.p2.core.ProvisionException; import org.eclipse.equinox.p2.engine.IProfile; @@ -305,11 +312,11 @@ public class ProfileRegistryTest extends AbstractProvisioningTest { simpleRgy.lockProfile(simpleProfile); simpleRgy.unlockProfile(simpleProfile); // Create a lock file to confirm locking - + File lockDirectory = new File(getResourceAsBundleRelFile("testData/engineTest/SimpleRegistry/"), SIMPLE_PROFILE + ".profile"); File lockFile = new File(lockDirectory, ".lock"); assertTrue("Lock file does not exist", lockFile.exists()); - + ProfileLock profileLock = new ProfileLock(lockDirectory); boolean locked = profileLock.lock(); try { @@ -547,9 +554,9 @@ public class ProfileRegistryTest extends AbstractProvisioningTest { profile.addInstallableUnit(engineIU); Method saveMethod; try { - saveMethod = registry.getClass().getDeclaredMethod("saveProfile", new Class[] {Profile.class}); + saveMethod = registry.getClass().getDeclaredMethod("saveProfile", Profile.class); saveMethod.setAccessible(true); - saveMethod.invoke(profileRegistry, new Object[] {profile}); + saveMethod.invoke(profileRegistry, profile); } catch (SecurityException e) { fail(); } catch (NoSuchMethodException e) { @@ -589,9 +596,9 @@ public class ProfileRegistryTest extends AbstractProvisioningTest { profile.addInstallableUnit(engineIU); Method saveMethod; try { - saveMethod = registry.getClass().getDeclaredMethod("saveProfile", new Class[] {Profile.class}); + saveMethod = registry.getClass().getDeclaredMethod("saveProfile", Profile.class); saveMethod.setAccessible(true); - saveMethod.invoke(profileRegistry, new Object[] {profile}); + saveMethod.invoke(profileRegistry, profile); } catch (SecurityException e) { fail("1.0", e); } catch (NoSuchMethodException e) { @@ -627,9 +634,9 @@ public class ProfileRegistryTest extends AbstractProvisioningTest { profile.addInstallableUnit(engineIU); Method saveMethod; try { - saveMethod = registry.getClass().getDeclaredMethod("saveProfile", new Class[] {Profile.class}); + saveMethod = registry.getClass().getDeclaredMethod("saveProfile", Profile.class); saveMethod.setAccessible(true); - saveMethod.invoke(profileRegistry, new Object[] {profile}); + saveMethod.invoke(profileRegistry, profile); } catch (SecurityException e) { fail(); } catch (NoSuchMethodException e) { diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/META-INF/MANIFEST.MF index a95726512..e28b223d4 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.equinox.p2.ui.sdk.scheduler;singleton:=true -Bundle-Version: 1.4.100.qualifier +Bundle-Version: 1.4.200.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.ui.sdk.scheduler.AutomaticUpdatePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml index b726a16ba..0175a216a 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml +++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.p2.ui.sdk.scheduler</artifactId> - <version>1.4.100-SNAPSHOT</version> + <version>1.4.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdater.java b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdater.java index 237266be2..a5150327d 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdater.java +++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdater.java @@ -211,9 +211,9 @@ public class AutomaticUpdater implements IUpdateListener { // IWorkbenchWindow does not define getStatusLineManager(), yet // WorkbenchWindow does try { - Method method = activeWindow.getClass().getDeclaredMethod("getStatusLineManager", new Class[0]); //$NON-NLS-1$ + Method method = activeWindow.getClass().getDeclaredMethod("getStatusLineManager"); //$NON-NLS-1$ try { - Object statusLine = method.invoke(activeWindow, new Object[0]); + Object statusLine = method.invoke(activeWindow); if (statusLine instanceof IStatusLineManager) { statusLineManager = (IStatusLineManager) statusLine; return statusLineManager; |