CONTRIBUTING

+# Contributing to Eclipse Platform
+
+Thanks for your interest in this project.
+
+## Project description
+
+Eclipse Platform defines the set of frameworks and common services that
+collectively make up infrastructure required to support the use of Eclipse as a
+component model, as a Rich Client Platform (RCP) and as a comprehensive tool
+integration platform. These services and frameworks include a standard workbench
+user interface model and portable native widget toolkit, a project model for
+managing resources, automatic resource delta management for incremental
+compilers and builders, language-independent debug infrastructure, and
+infrastructure for distributed multi-user versioned resource management.
+
+* https://projects.eclipse.org/projects/eclipse.platform
+
+## Developer resources
+
+Information regarding source code management, builds, coding standards, and
+more.
+
+* https://projects.eclipse.org/projects/eclipse.platform/developer
+
+The project maintains the following source code repositories
+
+* http://git.eclipse.org/c/platform/eclipse.platform.common.git
+* http://git.eclipse.org/c/platform/eclipse.platform.debug.git
+* http://git.eclipse.org/c/platform/eclipse.platform.git
+* http://git.eclipse.org/c/platform/eclipse.platform.releng.aggregator.git
+* http://git.eclipse.org/c/platform/eclipse.platform.releng.buildtools.git
+* http://git.eclipse.org/c/platform/eclipse.platform.releng.git
+* http://git.eclipse.org/c/platform/eclipse.platform.resources.git
+* http://git.eclipse.org/c/platform/eclipse.platform.runtime.git
+* http://git.eclipse.org/c/platform/eclipse.platform.swt.git
+* http://git.eclipse.org/c/platform/eclipse.platform.swt.binaries.git
+* http://git.eclipse.org/c/platform/eclipse.platform.team.git
+* http://git.eclipse.org/c/platform/eclipse.platform.text.git
+* http://git.eclipse.org/c/platform/eclipse.platform.ua.git
+* http://git.eclipse.org/c/platform/eclipse.platform.ui.git
+* http://git.eclipse.org/c/platform/eclipse.platform.ui.tools.git
+
+This project uses Bugzilla to track ongoing development and issues.
+
+* Search for issues: https://eclipse.org/bugs/buglist.cgi?product=Platform
+* Create a new report: https://eclipse.org/bugs/enter_bug.cgi?product=Platform
+
+Be sure to search for existing bugs before you create another one. Remember that
+contributions are always welcome!
+
+## Eclipse Contributor Agreement
+
+Before your contribution can be accepted by the project team contributors must
+electronically sign the Eclipse Contributor Agreement (ECA).
+
+* http://www.eclipse.org/legal/ECA.php
+
+Commits that are provided by non-committers must have a Signed-off-by field in
+the footer indicating that the author is aware of the terms by which the
+contribution has been provided to the project. The non-committer must
+additionally have an Eclipse Foundation account and must have a signed Eclipse
+Contributor Agreement (ECA) on file.
+
+For more information, please see the Eclipse Committer Handbook:
+https://www.eclipse.org/projects/handbook/#resources-commit
+
+## Contact
+
+Contact the project developers via the project's "dev" list.
+
+* https://dev.eclipse.org/mailman/listinfo/platform-dev
\ No newline at end of file

LICENSE

+Eclipse Public License - v 2.0
+
+    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+    PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+    OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+  a) in the case of the initial Contributor, the initial content
+     Distributed under this Agreement, and
+
+  b) in the case of each subsequent Contributor:
+     i) changes to the Program, and
+     ii) additions to the Program;
+  where such changes and/or additions to the Program originate from
+  and are Distributed by that particular Contributor. A Contribution
+  "originates" from a Contributor if it was added to the Program by
+  such Contributor itself or anyone acting on such Contributor's behalf.
+  Contributions do not include changes or additions to the Program that
+  are not Modified Works.
+
+"Contributor" means any person or entity that Distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which
+are necessarily infringed by the use or sale of its Contribution alone
+or when combined with the Program.
+
+"Program" means the Contributions Distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement
+or any Secondary License (as applicable), including Contributors.
+
+"Derivative Works" shall mean any work, whether in Source Code or other
+form, that is based on (or derived from) the Program and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship.
+
+"Modified Works" shall mean any work in Source Code or other form that
+results from an addition to, deletion from, or modification of the
+contents of the Program, including, for purposes of clarity any new file
+in Source Code form that contains any contents of the Program. Modified
+Works shall not include works that contain only declarations,
+interfaces, types, classes, structures, or files of the Program solely
+in each case in order to link to, bind by name, or subclass the Program
+or Modified Works thereof.
+
+"Distribute" means the acts of a) distributing or b) making available
+in any manner that enables the transfer of a copy.
+
+"Source Code" means the form of a Program preferred for making
+modifications, including but not limited to software source code,
+documentation source, and configuration files.
+
+"Secondary License" means either the GNU General Public License,
+Version 2.0, or any later versions of that license, including any
+exceptions or additional permissions as identified by the initial
+Contributor.
+
+2. GRANT OF RIGHTS
+
+  a) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free copyright
+  license to reproduce, prepare Derivative Works of, publicly display,
+  publicly perform, Distribute and sublicense the Contribution of such
+  Contributor, if any, and such Derivative Works.
+
+  b) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free patent
+  license under Licensed Patents to make, use, sell, offer to sell,
+  import and otherwise transfer the Contribution of such Contributor,
+  if any, in Source Code or other form. This patent license shall
+  apply to the combination of the Contribution and the Program if, at
+  the time the Contribution is added by the Contributor, such addition
+  of the Contribution causes such combination to be covered by the
+  Licensed Patents. The patent license shall not apply to any other
+  combinations which include the Contribution. No hardware per se is
+  licensed hereunder.
+
+  c) Recipient understands that although each Contributor grants the
+  licenses to its Contributions set forth herein, no assurances are
+  provided by any Contributor that the Program does not infringe the
+  patent or other intellectual property rights of any other entity.
+  Each Contributor disclaims any liability to Recipient for claims
+  brought by any other entity based on infringement of intellectual
+  property rights or otherwise. As a condition to exercising the
+  rights and licenses granted hereunder, each Recipient hereby
+  assumes sole responsibility to secure any other intellectual
+  property rights needed, if any. For example, if a third party
+  patent license is required to allow Recipient to Distribute the
+  Program, it is Recipient's responsibility to acquire that license
+  before distributing the Program.
+
+  d) Each Contributor represents that to its knowledge it has
+  sufficient copyright rights in its Contribution, if any, to grant
+  the copyright license set forth in this Agreement.
+
+  e) Notwithstanding the terms of any Secondary License, no
+  Contributor makes additional grants to any Recipient (other than
+  those set forth in this Agreement) as a result of such Recipient's
+  receipt of the Program under the terms of a Secondary License
+  (if permitted under the terms of Section 3).
+
+3. REQUIREMENTS
+
+3.1 If a Contributor Distributes the Program in any form, then:
+
+  a) the Program must also be made available as Source Code, in
+  accordance with section 3.2, and the Contributor must accompany
+  the Program with a statement that the Source Code for the Program
+  is available under this Agreement, and informs Recipients how to
+  obtain it in a reasonable manner on or through a medium customarily
+  used for software exchange; and
+
+  b) the Contributor may Distribute the Program under a license
+  different than this Agreement, provided that such license:
+     i) effectively disclaims on behalf of all other Contributors all
+     warranties and conditions, express and implied, including
+     warranties or conditions of title and non-infringement, and
+     implied warranties or conditions of merchantability and fitness
+     for a particular purpose;
+
+     ii) effectively excludes on behalf of all other Contributors all
+     liability for damages, including direct, indirect, special,
+     incidental and consequential damages, such as lost profits;
+
+     iii) does not attempt to limit or alter the recipients' rights
+     in the Source Code under section 3.2; and
+
+     iv) requires any subsequent distribution of the Program by any
+     party to be under a license that satisfies the requirements
+     of this section 3.
+
+3.2 When the Program is Distributed as Source Code:
+
+  a) it must be made available under this Agreement, or if the
+  Program (i) is combined with other material in a separate file or
+  files made available under a Secondary License, and (ii) the initial
+  Contributor attached to the Source Code the notice described in
+  Exhibit A of this Agreement, then the Program may be made available
+  under the terms of such Secondary Licenses, and
+
+  b) a copy of this Agreement must be included with each copy of
+  the Program.
+
+3.3 Contributors may not remove or alter any copyright, patent,
+trademark, attribution notices, disclaimers of warranty, or limitations
+of liability ("notices") contained within the Program from any copy of
+the Program which they Distribute, provided that Contributors may add
+their own appropriate notices.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities
+with respect to end users, business partners and the like. While this
+license is intended to facilitate the commercial use of the Program,
+the Contributor who includes the Program in a commercial product
+offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes
+the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and indemnify every
+other Contributor ("Indemnified Contributor") against any losses,
+damages and costs (collectively "Losses") arising from claims, lawsuits
+and other legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such
+Commercial Contributor in connection with its distribution of the Program
+in a commercial product offering. The obligations in this section do not
+apply to any claims or Losses relating to any actual or alleged
+intellectual property infringement. In order to qualify, an Indemnified
+Contributor must: a) promptly notify the Commercial Contributor in
+writing of such claim, and b) allow the Commercial Contributor to control,
+and cooperate with the Commercial Contributor in, the defense and any
+related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those performance
+claims and warranties, and if a court requires any other Contributor to
+pay any damages as a result, the Commercial Contributor must pay
+those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
+TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+PURPOSE. Each Recipient is solely responsible for determining the
+appropriateness of using and distributing the Program and assumes all
+risks associated with its exercise of rights under this Agreement,
+including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs
+or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further
+action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other software
+or hardware) infringes such Recipient's patent(s), then such Recipient's
+rights granted under Section 2(b) shall terminate as of the date such
+litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of
+time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use
+and distribution of the Program as soon as reasonably practicable.
+However, Recipient's obligations under this Agreement and any licenses
+granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement,
+but in order to avoid inconsistency the Agreement is copyrighted and
+may only be modified in the following manner. The Agreement Steward
+reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement
+Steward has the right to modify this Agreement. The Eclipse Foundation
+is the initial Agreement Steward. The Eclipse Foundation may assign the
+responsibility to serve as the Agreement Steward to a suitable separate
+entity. Each new version of the Agreement will be given a distinguishing
+version number. The Program (including Contributions) may always be
+Distributed subject to the version of the Agreement under which it was
+received. In addition, after a new version of the Agreement is published,
+Contributor may elect to Distribute the Program (including its
+Contributions) under the new version.
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+receives no rights or licenses to the intellectual property of any
+Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted
+under this Agreement are reserved. Nothing in this Agreement is intended
+to be enforceable by any entity that is not a Contributor or Recipient.
+No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+
+"This Source Code may also be made available under the following 
+Secondary Licenses when the conditions for such availability set forth 
+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+version(s), and exceptions or additional permissions here}."
+
+  Simply including a copy of this Agreement, including this Exhibit A
+  is not sufficient to license the Source Code under Secondary Licenses.
+
+  If it is not possible or desirable to put the notice in a particular
+  file, then You may include the notice in a location (such as a LICENSE
+  file in a relevant directory) where a recipient would be likely to
+  look for such a notice.
+
+  You may add additional accurate notices of copyright ownership.
\ No newline at end of file

NOTICE

+# Notices for Eclipse Platform
+
+This content is produced and maintained by the Eclipse Platform project.
+
+* Project home: https://projects.eclipse.org/projects/eclipse.platform
+
+## Trademarks
+
+Eclipse Platform is a trademark of the Eclipse Foundation.
+
+## Copyright
+
+All content is the property of the respective authors or their employers. For
+more information regarding authorship of content, please consult the listed
+source code repository logs.
+
+## Declared Project Licenses
+
+This program and the accompanying materials are made available under the terms
+of the Eclipse Public License v. 2.0 which is available at
+http://www.eclipse.org/legal/epl-2.0.
+
+SPDX-License-Identifier: EPL-2.0
+
+## Source Code
+
+The project maintains the following source code repositories:
+
+* http://git.eclipse.org/c/platform/eclipse.platform.common.git
+* http://git.eclipse.org/c/platform/eclipse.platform.debug.git
+* http://git.eclipse.org/c/platform/eclipse.platform.git
+* http://git.eclipse.org/c/platform/eclipse.platform.releng.aggregator.git
+* http://git.eclipse.org/c/platform/eclipse.platform.releng.buildtools.git
+* http://git.eclipse.org/c/platform/eclipse.platform.releng.git
+* http://git.eclipse.org/c/platform/eclipse.platform.resources.git
+* http://git.eclipse.org/c/platform/eclipse.platform.runtime.git
+* http://git.eclipse.org/c/platform/eclipse.platform.swt.git
+* http://git.eclipse.org/c/platform/eclipse.platform.swt.binaries.git
+* http://git.eclipse.org/c/platform/eclipse.platform.team.git
+* http://git.eclipse.org/c/platform/eclipse.platform.text.git
+* http://git.eclipse.org/c/platform/eclipse.platform.ua.git
+* http://git.eclipse.org/c/platform/eclipse.platform.ui.git
+* http://git.eclipse.org/c/platform/eclipse.platform.ui.tools.git
\ No newline at end of file

bundles/org.eclipse.core.contenttype/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.core.contenttype; singleton:=true
-Bundle-Version: 3.7.100.qualifier
+Bundle-Version: 3.7.200.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.equinox.preferences;bundle-version="[3.2.0,4.0.0)",

bundles/org.eclipse.core.contenttype/pom.xml

@@ -14,11 +14,11 @@
   <parent>
     <artifactId>eclipse.platform.runtime</artifactId>
     <groupId>eclipse.platform.runtime</groupId>
-    <version>4.9.0-SNAPSHOT</version>
+    <version>4.10.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.core</groupId>
   <artifactId>org.eclipse.core.contenttype</artifactId>
-  <version>3.7.100-SNAPSHOT</version>
+  <version>3.7.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>

bundles/org.eclipse.core.contenttype/schema/contentTypes.exsd

@@ -255,7 +255,7 @@ a file association extends an existing content type by associating new file name
          <attribute name="name" type="string" use="required">
             <annotation>
                <documentation>
-                  the name of the property. If the property is being overriden and has been originally defined in a different namespace, a fully qualified property name must be used
+                  the name of the property. If the property is being overridden and has been originally defined in a different namespace, a fully qualified property name must be used
                </documentation>
             </annotation>
          </attribute>

bundles/org.eclipse.core.expressions/pom.xml

@@ -14,7 +14,7 @@
   <parent>
     <artifactId>eclipse.platform.runtime</artifactId>
     <groupId>eclipse.platform.runtime</groupId>
-    <version>4.9.0-SNAPSHOT</version>
+    <version>4.10.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.core</groupId>

bundles/org.eclipse.core.jobs/.options

@@ -6,8 +6,6 @@
 
 # Prints debug information on running background jobs
 org.eclipse.core.jobs/jobs=false
-# Includes current date and time in job debug information
-org.eclipse.core.jobs/jobs/timing=false
 # Prints debug information when scheduling rules begin and end, and for mismatched beginRule/endRule pairs
 org.eclipse.core.jobs/jobs/beginend=false
 # Pedantic assertion checking on locks and deadlock reporting

bundles/org.eclipse.core.jobs/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.core.jobs; singleton:=true
-Bundle-Version: 3.10.100.qualifier
+Bundle-Version: 3.10.200.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.core.internal.jobs;x-internal:=true,

bundles/org.eclipse.core.jobs/pom.xml

@@ -15,12 +15,12 @@
   <parent>
     <artifactId>eclipse.platform.runtime</artifactId>
     <groupId>eclipse.platform.runtime</groupId>
-    <version>4.9.0-SNAPSHOT</version>
+    <version>4.10.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.core</groupId>
   <artifactId>org.eclipse.core.jobs</artifactId>
-  <version>3.10.100-SNAPSHOT</version>
+  <version>3.10.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <properties>
     <code.ignoredWarnings>-warn:-deprecation,raw,unchecked</code.ignoredWarnings>

bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobManager.java

@@ -22,14 +22,11 @@
  *******************************************************************************/
 package org.eclipse.core.internal.jobs;
 
-//don't use ICU because this is used for debugging only (see bug 135785)
-import java.text.*;
 import java.util.*;
 import org.eclipse.core.internal.runtime.RuntimeLog;
 import org.eclipse.core.runtime.*;
 import org.eclipse.core.runtime.jobs.*;
-import org.eclipse.osgi.service.debug.DebugOptions;
-import org.eclipse.osgi.service.debug.DebugOptionsListener;
+import org.eclipse.osgi.service.debug.*;
 import org.eclipse.osgi.util.NLS;
 
 /**
@@ -73,19 +70,17 @@ public class JobManager implements IJobManager, DebugOptionsListener {
 	private static final String OPTION_DEBUG_YIELDING = PI_JOBS + "/jobs/yielding"; //$NON-NLS-1$
 	private static final String OPTION_DEBUG_YIELDING_DETAILED = PI_JOBS + "/jobs/yielding/detailed"; //$NON-NLS-1$
 	private static final String OPTION_DEBUG_JOBS = PI_JOBS + "/jobs"; //$NON-NLS-1$
-	private static final String OPTION_DEBUG_JOBS_TIMING = PI_JOBS + "/jobs/timing"; //$NON-NLS-1$
 	private static final String OPTION_LOCKS = PI_JOBS + "/jobs/locks"; //$NON-NLS-1$
 	private static final String OPTION_SHUTDOWN = PI_JOBS + "/jobs/shutdown"; //$NON-NLS-1$
 
+	static DebugTrace DEBUG_TRACE;
 	static boolean DEBUG = false;
 	static boolean DEBUG_BEGIN_END = false;
 	static boolean DEBUG_YIELDING = false;
 	static boolean DEBUG_YIELDING_DETAILED = false;
 	static boolean DEBUG_DEADLOCK = false;
 	static boolean DEBUG_LOCKS = false;
-	static boolean DEBUG_TIMING = false;
 	static boolean DEBUG_SHUTDOWN = false;
-	private static DateFormat DEBUG_FORMAT;
 
 	/**
 	 * The singleton job manager instance. It must be a singleton because
@@ -204,16 +199,7 @@ public class JobManager implements IJobManager, DebugOptionsListener {
 	private final InternalWorker internalWorker;
 
 	public static void debug(String msg) {
-		StringBuffer msgBuf = new StringBuffer(msg.length() + 40);
-		if (DEBUG_TIMING) {
-			//lazy initialize to avoid overhead when not debugging
-			if (DEBUG_FORMAT == null)
-				DEBUG_FORMAT = new SimpleDateFormat("HH:mm:ss.SSS"); //$NON-NLS-1$
-			DEBUG_FORMAT.format(new Date(), msgBuf, new FieldPosition(0));
-			msgBuf.append('-');
-		}
-		msgBuf.append('[').append(Thread.currentThread()).append(']').append(msg);
-		System.out.println(msgBuf.toString());
+		DEBUG_TRACE.trace(null, msg);
 	}
 
 	/**
@@ -1139,13 +1125,13 @@ public class JobManager implements IJobManager, DebugOptionsListener {
 
 	@Override
 	public void optionsChanged(DebugOptions options) {
+		DEBUG_TRACE = options.newDebugTrace(PI_JOBS);
 		DEBUG = options.getBooleanOption(OPTION_DEBUG_JOBS, false);
 		DEBUG_BEGIN_END = options.getBooleanOption(OPTION_DEBUG_BEGIN_END, false);
 		DEBUG_YIELDING = options.getBooleanOption(OPTION_DEBUG_YIELDING, false);
 		DEBUG_YIELDING_DETAILED = options.getBooleanOption(OPTION_DEBUG_YIELDING_DETAILED, false);
 		DEBUG_DEADLOCK = options.getBooleanOption(OPTION_DEADLOCK_ERROR, false);
 		DEBUG_LOCKS = options.getBooleanOption(OPTION_LOCKS, false);
-		DEBUG_TIMING = options.getBooleanOption(OPTION_DEBUG_JOBS_TIMING, false);
 		DEBUG_SHUTDOWN = options.getBooleanOption(OPTION_SHUTDOWN, false);
 	}
 

bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF

 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-Version: 3.15.0.qualifier
+Bundle-Version: 3.15.100.qualifier
 Bundle-SymbolicName: org.eclipse.core.runtime; singleton:=true
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.core.internal.runtime.PlatformActivator

bundles/org.eclipse.core.runtime/pom.xml

@@ -14,12 +14,12 @@
   <parent>
     <artifactId>eclipse.platform.runtime</artifactId>
     <groupId>eclipse.platform.runtime</groupId>
-    <version>4.9.0-SNAPSHOT</version>
+    <version>4.10.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.core</groupId>
   <artifactId>org.eclipse.core.runtime</artifactId>
-  <version>3.15.0-SNAPSHOT</version>
+  <version>3.15.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>

bundles/org.eclipse.core.runtime/schema/contentTypes.exsd

@@ -6,6 +6,11 @@
          <meta.schema plugin="org.eclipse.core.runtime" id="contentTypes" name="Content Types"/>
       </appinfo>
       <documentation>
+               &lt;p&gt;
+&lt;b&gt;WARNING: This extension point is DEPRECATED.&lt;/b&gt;&lt;br&gt;
+Do not use this extension point, it will be removed in future versions of this product.
+Instead, use the extension point &lt;a href=&quot;org.eclipse.core.contenttype.contentTypes.html&quot;&gt;org.eclipse.core.contenttype.contentTypes&lt;/a&gt;
+&lt;/p&gt;
 The content types extension point allows plug-ins to contribute to the platform content type catalog. There are two forms of contributions: &lt;cite&gt;content types&lt;/cite&gt; and &lt;cite&gt;file associations&lt;/cite&gt;.
 &lt;ul&gt;
 &lt;li&gt;
@@ -238,7 +243,7 @@ a file association extends an existing content type by associating new file name
          <attribute name="name" type="string" use="required">
             <annotation>
                <documentation>
-                  the name of the property. If the property is being overriden and has been originally defined in a different namespace, a fully qualified property name must be used
+                  the name of the property. If the property is being overridden and has been originally defined in a different namespace, a fully qualified property name must be used
                </documentation>
             </annotation>
          </attribute>
@@ -266,7 +271,7 @@ a file association extends an existing content type by associating new file name
          <meta.section type="examples"/>
       </appinfo>
       <documentation>
-         Following is an example of a XML-based content type declaration using &lt;code&gt;org.eclipse.core.runtime.content.XMLRootElementContentDescriber2&lt;/code&gt;, 
+         Following is an example of an XML-based content type declaration using &lt;code&gt;org.eclipse.core.runtime.content.XMLRootElementContentDescriber2&lt;/code&gt;, 
 a built-in describer: 
 &lt;p&gt;
 &lt;pre&gt;

bundles/org.eclipse.core.tools/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.core.tools; singleton:=true
-Bundle-Version: 1.7.200.qualifier
+Bundle-Version: 1.7.400.qualifier
 Bundle-Activator: org.eclipse.core.tools.CoreToolsPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,7 +13,6 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.1.0,4.0.0)";resolu
  org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",
  org.eclipse.jface.text,
  org.eclipse.ui,
- org.eclipse.ui.workbench.texteditor,
  org.eclipse.ui.views,
  org.eclipse.jdt.core,
  org.eclipse.jdt.ui;bundle-version="[3.5.0,4.0.0)",

bundles/org.eclipse.core.tools/pom.xml

@@ -14,12 +14,12 @@
   <parent>
     <artifactId>eclipse.platform.runtime</artifactId>
     <groupId>eclipse.platform.runtime</groupId>
-    <version>4.9.0-SNAPSHOT</version>
+    <version>4.10.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.core</groupId>
   <artifactId>org.eclipse.core.tools</artifactId>
-  <version>1.7.200-SNAPSHOT</version>
+  <version>1.7.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>

bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ClearTextAction.java

@@ -15,8 +15,8 @@ package org.eclipse.core.tools;
 
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IWorkbenchCommandConstants;
 import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
 
 /**
  * Generic "clear contents" action. Sets action's text, tool tip text and icon.
@@ -41,7 +41,7 @@ public class ClearTextAction extends GlobalAction {
 		// the delete key is not captured by the workbench
 		// then we need to provide an action definition id
 		// so clients can register this action in their key binding services
-		this.setActionDefinitionId(IWorkbenchActionDefinitionIds.DELETE);
+		this.setActionDefinitionId(IWorkbenchCommandConstants.EDIT_DELETE);
 		this.setImageDescriptor(CoreToolsPlugin.createImageDescriptor("clear.gif")); //$NON-NLS-1$
 	}
 

bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CollapseAllAction.java

@@ -33,9 +33,6 @@ public class CollapseAllAction extends Action implements IAction {
 		this.setImageDescriptor(CoreToolsPlugin.createImageDescriptor(imageName));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
 	@Override
 	public void run() {
 		viewer.collapseAll();

bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CopyStructuredSelectionAction.java

@@ -25,9 +25,6 @@ import org.eclipse.jface.viewers.IStructuredSelection;
  */
 public class CopyStructuredSelectionAction extends AbstractCopySelectionAction {
 
-	/**
-	 * @see org.eclipse.core.tools.AbstractCopySelectionAction#AbstractCopySelectionAction(ISelectionProvider)
-	 */
 	public CopyStructuredSelectionAction(ISelectionProvider selectionProvider) {
 		super(selectionProvider);
 	}
@@ -40,14 +37,13 @@ public class CopyStructuredSelectionAction extends AbstractCopySelectionAction {
 	 *
 	 * @return a string containing the currently selected elements separated by
 	 * line terminators
-	 * @see org.eclipse.core.tools.AbstractCopySelectionAction#getContents()
 	 */
 	@Override
 	public String getContents() {
 		// retrieves the selected contents from the selection provider
 		IStructuredSelection selection = (IStructuredSelection) selectionProvider.getSelection();
 		StringBuilder content = new StringBuilder();
-		for (Iterator selectionIter = selection.iterator(); selectionIter.hasNext();) {
+		for (Iterator<?> selectionIter = selection.iterator(); selectionIter.hasNext();) {
 			content.append(selectionIter.next());
 			content.append('\n');
 		}

bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/DeepSize.java

@@ -61,14 +61,14 @@ public class DeepSize {
 	public static final int ARRAY_HEADER_SIZE = 12;
 
 	public static final int HEADER_SIZE = 8;
-	static final HashSet ignoreSet = new HashSet();
+	static final HashSet<ObjectWrapper> ignoreSet = new HashSet<>();
 	public static final int OBJECT_HEADER_SIZE = HEADER_SIZE;
 	public static final int POINTER_SIZE = 4;
 	int byteSize;
-	final Map counts = new HashMap();
+	final Map<Class<?>, Integer> counts = new HashMap<>();
 
-	Set ignoreTypeNames = null;
-	final Map sizes = new HashMap();
+	Set<String> ignoreTypeNames = null;
+	final Map<Object, Integer> sizes = new HashMap<>();
 
 	/**
 	 * Adds an object to the ignore set. Returns true if the object
@@ -82,7 +82,7 @@ public class DeepSize {
 		ignoreSet.clear();
 	}
 
-	private void count(Class c, int size) {
+	private void count(Class<?> c, int size) {
 		Object accumulatedSizes = sizes.get(c);
 		int existingSize = (accumulatedSizes == null) ? 0 : ((Integer) accumulatedSizes).intValue();
 		sizes.put(c, Integer.valueOf(existingSize + size));
@@ -96,12 +96,12 @@ public class DeepSize {
 		byteSize += sizeOf(o);
 	}
 
-	public Map getCounts() {
+	public Map<Class<?>, Integer> getCounts() {
 		return counts;
 	}
 
-	Set getDefaultIgnoreTypeNames() {
-		Set ignored = new HashSet();
+	Set<String> getDefaultIgnoreTypeNames() {
+		Set<String> ignored = new HashSet<>();
 		String[] ignore = {"org.eclipse.core.runtime.Plugin", "java.lang.ClassLoader", "org.eclipse.team.internal.ccvs.core.CVSTeamProvider", "org.eclipse.core.internal.events.BuilderPersistentInfo", "org.eclipse.core.internal.resources.Workspace", "org.eclipse.core.internal.events.EventStats", "java.net.URL"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-6$
 		for (String element : ignore) {
 			ignored.add(element);
@@ -122,7 +122,7 @@ public class DeepSize {
 		return byteSize;
 	}
 
-	public Map getSizes() {
+	public Map<Object, Integer> getSizes() {
 		return sizes;
 	}
 
@@ -135,20 +135,15 @@ public class DeepSize {
 	 */
 	public void printSizeReport() {
 		System.out.println("*** Begin DeepSize report ***"); //$NON-NLS-1$
-		for (Iterator it = sizes.keySet().iterator(); it.hasNext();) {
-			Class clazz = (Class) it.next();
-			int size = ((Integer) sizes.get(clazz)).intValue();
-			System.out.println('\t' + clazz.getName() + " size: " + size); //$NON-NLS-1$
+		for (Object clazz : sizes.keySet()) {
+			int size = sizes.get(clazz).intValue();
+			System.out.println('\t' + clazz.getClass().getName() + " size: " + size); //$NON-NLS-1$
 			System.out.println("Total size of all objects: " + getSize()); //$NON-NLS-1$
 		}
 		System.out.println("*** End DeepSize report ***"); //$NON-NLS-1$
 	}
 
-	void setIgnoreTypeNames(Set ignore) {
-		ignoreTypeNames = ignore;
-	}
-
-	private boolean shouldIgnoreType(Class clazz) {
+	private boolean shouldIgnoreType(Class<?> clazz) {
 		if (ignoreTypeNames == null) {
 			ignoreTypeNames = getDefaultIgnoreTypeNames();
 		}
@@ -165,16 +160,16 @@ public class DeepSize {
 			return 0;
 		if (ignore(o))
 			return 0;
-		Class clazz = o.getClass();
+		Class<?> clazz = o.getClass();
 		if (shouldIgnoreType(clazz))
 			return 0;
 		return clazz.isArray() ? sizeOfArray(clazz, o) : sizeOfObject(clazz, o);
 	}
 
-	private int sizeOfArray(Class type, Object array) {
+	private int sizeOfArray(Class<?> type, Object array) {
 
 		int size = ARRAY_HEADER_SIZE;
-		Class componentType = type.getComponentType();
+		Class<?> componentType = type.getComponentType();
 		if (componentType.isPrimitive()) {
 
 			if (componentType == char.class) {
@@ -211,17 +206,17 @@ public class DeepSize {
 
 	}
 
-	private int sizeOfObject(Class type, Object o) {
+	private int sizeOfObject(Class<?> type, Object o) {
 
 		int internalSize = 0; // size of referenced objects
 		int shallowSize = OBJECT_HEADER_SIZE;
-		Class clazz = type;
+		Class<?> clazz = type;
 		while (clazz != null) {
 			Field[] fields = clazz.getDeclaredFields();
 			for (Field field : fields) {
 				Field f = field;
 				if (!isStaticField(f)) {
-					Class fieldType = f.getType();
+					Class<?> fieldType = f.getType();
 					if (fieldType.isPrimitive()) {
 						shallowSize += sizeOfPrimitiveField(fieldType);
 					} else {
@@ -237,7 +232,7 @@ public class DeepSize {
 
 	}
 
-	private int sizeOfPrimitiveField(Class type) {
+	private int sizeOfPrimitiveField(Class<?> type) {
 		if (type == long.class || type == double.class)
 			return 8;
 		return 4;