aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundles/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.core.runtime/pom.xml2
-rw-r--r--bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java114
4 files changed, 81 insertions, 45 deletions
diff --git a/bundles/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
index fde9b5568..68d5a2db4 100644
--- a/bundles/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
@@ -27,6 +27,7 @@ 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.APILeak=warning
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -58,7 +59,7 @@ org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
@@ -101,12 +102,16 @@ org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
@@ -127,6 +132,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_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
diff --git a/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF
index cc87e961e..b41dba6ee 100644
--- a/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-Version: 3.14.0.qualifier
+Bundle-Version: 3.14.100.qualifier
Bundle-SymbolicName: org.eclipse.core.runtime; singleton:=true
Bundle-Vendor: %providerName
Bundle-Activator: org.eclipse.core.internal.runtime.PlatformActivator
diff --git a/bundles/org.eclipse.core.runtime/pom.xml b/bundles/org.eclipse.core.runtime/pom.xml
index 0d835762a..2b7b0b36c 100644
--- a/bundles/org.eclipse.core.runtime/pom.xml
+++ b/bundles/org.eclipse.core.runtime/pom.xml
@@ -19,7 +19,7 @@
</parent>
<groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.runtime</artifactId>
- <version>3.14.0-SNAPSHOT</version>
+ <version>3.14.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
diff --git a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
index 7810deded..0435d87b0 100644
--- a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
+++ b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 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
@@ -27,7 +27,6 @@ import org.eclipse.osgi.service.debug.DebugOptions;
import org.eclipse.osgi.service.environment.EnvironmentInfo;
import org.eclipse.osgi.service.resolver.PlatformAdmin;
import org.osgi.framework.Bundle;
-import org.osgi.service.packageadmin.PackageAdmin;
/**
* The central class of the Eclipse Platform Runtime. This class cannot
@@ -212,8 +211,9 @@ public final class Platform {
* Note this constant has been moved from the deprecated
* org.eclipse.core.boot.BootLoader class and its value has not changed.
* </p>
+ *
* @since 3.0
- * * @deprecated not supported anymore
+ * @deprecated not supported anymore
*/
@Deprecated
public static final String OS_AIX = "aix";//$NON-NLS-1$
@@ -300,8 +300,12 @@ public final class Platform {
* Note this constant has been moved from the deprecated
* org.eclipse.core.boot.BootLoader class and its value has not changed.
* </p>
+ *
* @since 3.0
+ *
+ * @deprecated not supported anymore
*/
+ @Deprecated
public static final String ARCH_PA_RISC = "PA_RISC";//$NON-NLS-1$
/**
@@ -311,8 +315,12 @@ public final class Platform {
* Note this constant has been moved from the deprecated
* org.eclipse.core.boot.BootLoader class and its value has not changed.
* </p>
+ *
* @since 3.0
+ *
+ * @deprecated not supported anymore
*/
+ @Deprecated
public static final String ARCH_PPC = "ppc";//$NON-NLS-1$
/**
@@ -322,8 +330,12 @@ public final class Platform {
* Note this constant has been moved from the deprecated
* org.eclipse.core.boot.BootLoader class and its value has not changed.
* </p>
+ *
* @since 3.0
+ *
+ * @deprecated not supported anymore
*/
+ @Deprecated
public static final String ARCH_SPARC = "sparc";//$NON-NLS-1$
/**
@@ -350,7 +362,10 @@ public final class Platform {
* IA64-based architecture.
*
* @since 3.0
+ *
+ * @deprecated not supported anymore
*/
+ @Deprecated
public static final String ARCH_IA64 = "ia64"; //$NON-NLS-1$
/**
@@ -358,7 +373,10 @@ public final class Platform {
* IA64 32bit-based architecture.
*
* @since 3.1
+ *
+ * @deprecated not supported anymore
*/
+ @Deprecated
public static final String ARCH_IA64_32 = "ia64_32";//$NON-NLS-1$
/**
@@ -1329,12 +1347,15 @@ public final class Platform {
/**
* Checks if the specified bundle is a fragment bundle.
* <p>
- * Clients are also able to acquire the {@link PackageAdmin} service
- * to query if the given bundle is a fragment by asking for the bundle type
- * and checking against constants on the service interface.
+ * Clients are also able to acquire the
+ * {@link org.osgi.service.packageadmin.PackageAdmin} service to query if the
+ * given bundle is a fragment by asking for the bundle type and checking against
+ * constants on the service interface.
* </p>
+ *
* @param bundle the bundle to query
- * @return true if the specified bundle is a fragment bundle; otherwise false is returned.
+ * @return true if the specified bundle is a fragment bundle; otherwise false is
+ * returned.
* @since 3.0
*/
public static boolean isFragment(Bundle bundle) {
@@ -1342,16 +1363,19 @@ public final class Platform {
}
/**
- * Returns an array of attached fragment bundles for the specified bundle. If the
- * specified bundle is a fragment then <tt>null</tt> is returned. If no fragments are
- * attached to the specified bundle then <tt>null</tt> is returned.
+ * Returns an array of attached fragment bundles for the specified bundle. If
+ * the specified bundle is a fragment then <tt>null</tt> is returned. If no
+ * fragments are attached to the specified bundle then <tt>null</tt> is
+ * returned.
* <p>
- * Clients are also able to acquire the {@link PackageAdmin} service and query
- * it for the fragments of the given bundle.
+ * Clients are also able to acquire the
+ * {@link org.osgi.service.packageadmin.PackageAdmin} service and query it for
+ * the fragments of the given bundle.
* </p>
+ *
* @param bundle the bundle to get the attached fragment bundles for.
* @return an array of fragment bundles or <tt>null</tt> if the bundle does not
- * have any attached fragment bundles.
+ * have any attached fragment bundles.
* @since 3.0
*/
public static Bundle[] getFragments(Bundle bundle) {
@@ -1360,18 +1384,20 @@ public final class Platform {
/**
* Returns the resolved bundle with the specified symbolic name that has the
- * highest version. If no resolved bundles are installed that have the
- * specified symbolic name then null is returned.
+ * highest version. If no resolved bundles are installed that have the specified
+ * symbolic name then null is returned.
* <p>
- * Clients are also able to acquire the {@link PackageAdmin} service and query
- * it for the bundle with the specified symbolic name. Clients can ask the
- * service for all bundles with that particular name and then determine the
- * one with the highest version. Note that clients may want to filter
- * the results based on the state of the bundles.
+ * Clients are also able to acquire the
+ * {@link org.osgi.service.packageadmin.PackageAdmin} service and query it for
+ * the bundle with the specified symbolic name. Clients can ask the service for
+ * all bundles with that particular name and then determine the one with the
+ * highest version. Note that clients may want to filter the results based on
+ * the state of the bundles.
* </p>
+ *
* @param symbolicName the symbolic name of the bundle to be returned.
- * @return the bundle that has the specified symbolic name with the
- * highest version, or <tt>null</tt> if no bundle is found.
+ * @return the bundle that has the specified symbolic name with the highest
+ * version, or <tt>null</tt> if no bundle is found.
* @since 3.0
*/
public static Bundle getBundle(String symbolicName) {
@@ -1379,23 +1405,25 @@ public final class Platform {
}
/**
- * Returns all bundles with the specified symbolic name. If no resolved bundles
- * with the specified symbolic name can be found, <tt>null</tt> is returned.
- * If the version argument is not null then only the Bundles that have
- * the specified symbolic name and a version greater than or equal to the
- * specified version are returned. The returned bundles are ordered in
- * descending bundle version order.
+ * Returns all bundles with the specified symbolic name. If no resolved bundles
+ * with the specified symbolic name can be found, <tt>null</tt> is returned. If
+ * the version argument is not null then only the Bundles that have the
+ * specified symbolic name and a version greater than or equal to the specified
+ * version are returned. The returned bundles are ordered in descending bundle
+ * version order.
* <p>
- * Clients are also able to acquire the {@link PackageAdmin} service and query
- * it for all bundle versions with the given symbolic name, after turning the
- * specific version into a version range. Note that clients may want to filter
- * the results based on the state of the bundles.
+ * Clients are also able to acquire the
+ * {@link org.osgi.service.packageadmin.PackageAdmin} service and query it for
+ * all bundle versions with the given symbolic name, after turning the specific
+ * version into a version range. Note that clients may want to filter the
+ * results based on the state of the bundles.
* </p>
+ *
* @param symbolicName the symbolic name of the bundles that are to be returned.
- * @param version the version that the return bundle versions must match,
- * or <tt>null</tt> if no version matching is to be done.
- * @return the array of Bundles with the specified name that match the
- * specified version and match rule, or <tt>null</tt> if no bundles are found.
+ * @param version the version that the return bundle versions must match,
+ * or <tt>null</tt> if no version matching is to be done.
+ * @return the array of Bundles with the specified name that match the specified
+ * version and match rule, or <tt>null</tt> if no bundles are found.
*/
public static Bundle[] getBundles(String symbolicName, String version) {
return InternalPlatform.getDefault().getBundles(symbolicName, version);
@@ -1403,15 +1431,17 @@ public final class Platform {
/**
* Returns an array of host bundles that the specified fragment bundle is
- * attached to or <tt>null</tt> if the specified bundle is not attached to a host.
- * If the bundle is not a fragment bundle then <tt>null</tt> is returned.
+ * attached to or <tt>null</tt> if the specified bundle is not attached to a
+ * host. If the bundle is not a fragment bundle then <tt>null</tt> is returned.
* <p>
- * Clients are also able to acquire the {@link PackageAdmin} service and query
- * it for the hosts for the given bundle.
+ * Clients are also able to acquire the
+ * {@link org.osgi.service.packageadmin.PackageAdmin} service and query it for
+ * the hosts for the given bundle.
* </p>
+ *
* @param bundle the bundle to get the host bundles for.
- * @return an array of host bundles or null if the bundle does not have any
- * host bundles.
+ * @return an array of host bundles or null if the bundle does not have any host
+ * bundles.
* @since 3.0
*/
public static Bundle[] getHosts(Bundle bundle) {