diff options
author | Alexander Kurtakov | 2018-04-18 15:49:34 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2018-04-18 15:49:34 +0000 |
commit | 1a99f645367958e4efe7a8f2b752df856f102785 (patch) | |
tree | 9497107dba1c112f1ca3ee89dfd6e14f25213a36 | |
parent | 682d99fd94354d758c9f8d6f8cc5b1e3997e4489 (diff) | |
download | rt.equinox.bundles-1a99f645367958e4efe7a8f2b752df856f102785.tar.gz rt.equinox.bundles-1a99f645367958e4efe7a8f2b752df856f102785.tar.xz rt.equinox.bundles-1a99f645367958e4efe7a8f2b752df856f102785.zip |
Bug 533774 - Move o.e.equinox.util to Java 7
Keep it in sync with rest of equinox. Some warning fixes.
Change-Id: Iefdebfc3341d9ef9cf56d9526eedfe1992c68d30
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
8 files changed, 22 insertions, 18 deletions
diff --git a/bundles/org.eclipse.equinox.util/.classpath b/bundles/org.eclipse.equinox.util/.classpath index 47d99aa20..098194ca4 100644 --- a/bundles/org.eclipse.equinox.util/.classpath +++ b/bundles/org.eclipse.equinox.util/.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/OSGi%Minimum-1.1"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/bundles/org.eclipse.equinox.util/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.util/.settings/org.eclipse.jdt.core.prefs index 8cc7b8487..c79ad8a4b 100644 --- a/bundles/org.eclipse.equinox.util/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.equinox.util/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,3 @@ -#Thu Feb 14 08:29:20 CST 2008 eclipse.preferences.version=1 org.eclipse.jdt.core.builder.cleanOutputFolder=clean org.eclipse.jdt.core.builder.duplicateResourceTask=warning @@ -7,24 +6,24 @@ org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.3 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.deprecation=warning org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=error org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fieldHiding=warning org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning @@ -71,7 +70,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=en org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.source=1.7 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/bundles/org.eclipse.equinox.util/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.util/META-INF/MANIFEST.MF index beca65f3c..23866c9db 100644 --- a/bundles/org.eclipse.equinox.util/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.util/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.equinox.util Bundle-Name: %bundleName -Bundle-Version: 1.0.600.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Vendor: %bundleVendor Bundle-Activator: org.eclipse.equinox.internal.util.UtilActivator Bundle-Description: The Equinox Util Bundle contains services to facilitate bundle developers in their programming, and to lighten resource usage at runtime. @@ -23,7 +23,7 @@ Export-Package: org.eclipse.equinox.internal.util.security;x-internal:=true, org.eclipse.equinox.internal.util.threadpool;version="1.0";x-friends:="org.eclipse.equinox.ds", org.eclipse.equinox.internal.util.timer;version="1.0";x-friends:="org.eclipse.equinox.ds,org.eclipse.equinox.ip" -Bundle-RequiredExecutionEnvironment: OSGi/Minimum-1.1 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Automatic-Module-Name: org.eclipse.equinox.util diff --git a/bundles/org.eclipse.equinox.util/pom.xml b/bundles/org.eclipse.equinox.util/pom.xml index 0c6cef300..d62b98036 100644 --- a/bundles/org.eclipse.equinox.util/pom.xml +++ b/bundles/org.eclipse.equinox.util/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.util</artifactId> - <version>1.0.600-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.util/src/org/eclipse/equinox/internal/util/UtilActivator.java b/bundles/org.eclipse.equinox.util/src/org/eclipse/equinox/internal/util/UtilActivator.java index 96f989dd3..b48c68834 100644 --- a/bundles/org.eclipse.equinox.util/src/org/eclipse/equinox/internal/util/UtilActivator.java +++ b/bundles/org.eclipse.equinox.util/src/org/eclipse/equinox/internal/util/UtilActivator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1997, 2008 by ProSyst Software GmbH + * Copyright (c) 1997, 2018 by ProSyst Software GmbH * http://www.prosyst.com * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -11,6 +11,7 @@ *******************************************************************************/ package org.eclipse.equinox.internal.util; +import org.eclipse.equinox.internal.util.impl.tpt.ServiceFactoryImpl; import org.eclipse.equinox.internal.util.impl.tpt.threadpool.ThreadPoolFactoryImpl; import org.eclipse.equinox.internal.util.impl.tpt.timer.TimerFactory; import org.eclipse.equinox.internal.util.ref.Log; @@ -103,7 +104,7 @@ public class UtilActivator implements BundleActivator { log.debug(0, 2001, String.valueOf(time[0] - time[1]), null, false, true); } - String bundleName = ThreadPoolFactoryImpl.getName(bc.getBundle()); + String bundleName = ServiceFactoryImpl.getName(bc.getBundle()); thMan = new ThreadPoolFactoryImpl(bundleName, log); if (startup) timeLog(3); /* 3 = "Creating Thread Pool service took " */ diff --git a/bundles/org.eclipse.equinox.util/src/org/eclipse/equinox/internal/util/impl/tpt/threadpool/ThreadPoolFactoryImpl.java b/bundles/org.eclipse.equinox.util/src/org/eclipse/equinox/internal/util/impl/tpt/threadpool/ThreadPoolFactoryImpl.java index a0f4c0525..a7c15a998 100644 --- a/bundles/org.eclipse.equinox.util/src/org/eclipse/equinox/internal/util/impl/tpt/threadpool/ThreadPoolFactoryImpl.java +++ b/bundles/org.eclipse.equinox.util/src/org/eclipse/equinox/internal/util/impl/tpt/threadpool/ThreadPoolFactoryImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1997, 2008 by ProSyst Software GmbH + * Copyright (c) 1997, 2018 by ProSyst Software GmbH * http://www.prosyst.com * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -31,7 +31,7 @@ public class ThreadPoolFactoryImpl extends ServiceFactoryImpl implements ThreadP private int limit; private int used = 0; private Job queue; - private static int defaultPercent;; + private static int defaultPercent; public ThreadPoolFactoryImpl(String bundleName, Log log) { diff --git a/bundles/org.eclipse.equinox.util/src/org/eclipse/equinox/internal/util/impl/tpt/timer/TimerFactory.java b/bundles/org.eclipse.equinox.util/src/org/eclipse/equinox/internal/util/impl/tpt/timer/TimerFactory.java index 9f7436650..dcd710aa0 100644 --- a/bundles/org.eclipse.equinox.util/src/org/eclipse/equinox/internal/util/impl/tpt/timer/TimerFactory.java +++ b/bundles/org.eclipse.equinox.util/src/org/eclipse/equinox/internal/util/impl/tpt/timer/TimerFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1997, 2008 by ProSyst Software GmbH + * Copyright (c) 1997, 2018 by ProSyst Software GmbH * http://www.prosyst.com * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -42,18 +42,22 @@ public class TimerFactory extends ServiceFactoryImpl implements Timer { return new TimerFactory(bundleName); } + @Deprecated public void notifyAfterMillis(TimerListener listener, long timePeriod, int event) throws IllegalArgumentException { addNotifyListener(listener, Thread.NORM_PRIORITY, Timer.ONE_SHOT_TIMER, timePeriod, event); } + @Deprecated public void notifyAfterMillis(TimerListener listener, int priority, long timePeriod, int event) throws IllegalArgumentException { addNotifyListener(listener, priority, Timer.ONE_SHOT_TIMER, timePeriod, event); } + @Deprecated public void notifyAfter(TimerListener listener, int timePeriod, int event) throws IllegalArgumentException { addNotifyListener(listener, Thread.NORM_PRIORITY, Timer.ONE_SHOT_TIMER, timePeriod * 1000, event); } + @Deprecated public void notifyAfter(TimerListener listener, int priority, int timePeriod, int event) throws IllegalArgumentException { addNotifyListener(listener, priority, Timer.ONE_SHOT_TIMER, timePeriod * 1000, event); } diff --git a/bundles/org.eclipse.equinox.util/src/org/eclipse/equinox/internal/util/pool/ObjectPool.java b/bundles/org.eclipse.equinox.util/src/org/eclipse/equinox/internal/util/pool/ObjectPool.java index b7f74fd3c..08f262684 100644 --- a/bundles/org.eclipse.equinox.util/src/org/eclipse/equinox/internal/util/pool/ObjectPool.java +++ b/bundles/org.eclipse.equinox.util/src/org/eclipse/equinox/internal/util/pool/ObjectPool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1997, 2008 by ProSyst Software GmbH + * Copyright (c) 1997, 2018 by ProSyst Software GmbH * http://www.prosyst.com * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -73,7 +73,7 @@ public class ObjectPool { this.oc = oc; if (template != null) { try { - template.getConstructor(new Class[0]); + template.getConstructor(); this.template = template; } catch (NoSuchMethodException nsm) { throw new IllegalArgumentException(template + " don't have default constructor!"); |