diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.contenttype/META-INF/MANIFEST.MF eclipse-platform-runtime-4.10/bundles/org.eclipse.core.contenttype/META-INF/MANIFEST.MF --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.contenttype/META-INF/MANIFEST.MF 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.contenttype/META-INF/MANIFEST.MF 2018-11-14 15:10:45.000000000 +0000 @@ -2,7 +2,7 @@ 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)", diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.contenttype/pom.xml eclipse-platform-runtime-4.10/bundles/org.eclipse.core.contenttype/pom.xml --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.contenttype/pom.xml 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.contenttype/pom.xml 2018-11-14 15:10:45.000000000 +0000 @@ -14,11 +14,11 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.9.0-SNAPSHOT + 4.10.0-SNAPSHOT ../../ org.eclipse.core org.eclipse.core.contenttype - 3.7.100-SNAPSHOT + 3.7.200-SNAPSHOT eclipse-plugin diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.contenttype/schema/contentTypes.exsd eclipse-platform-runtime-4.10/bundles/org.eclipse.core.contenttype/schema/contentTypes.exsd --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.contenttype/schema/contentTypes.exsd 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.contenttype/schema/contentTypes.exsd 2018-11-14 15:10:45.000000000 +0000 @@ -255,7 +255,7 @@ - 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 diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.expressions/pom.xml eclipse-platform-runtime-4.10/bundles/org.eclipse.core.expressions/pom.xml --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.expressions/pom.xml 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.expressions/pom.xml 2018-11-14 15:10:45.000000000 +0000 @@ -14,7 +14,7 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.9.0-SNAPSHOT + 4.10.0-SNAPSHOT ../../ org.eclipse.core diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.jobs/META-INF/MANIFEST.MF eclipse-platform-runtime-4.10/bundles/org.eclipse.core.jobs/META-INF/MANIFEST.MF --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.jobs/META-INF/MANIFEST.MF 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.jobs/META-INF/MANIFEST.MF 2018-11-14 15:10:45.000000000 +0000 @@ -2,7 +2,7 @@ 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, diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.jobs/.options eclipse-platform-runtime-4.10/bundles/org.eclipse.core.jobs/.options --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.jobs/.options 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.jobs/.options 2018-11-14 15:10:45.000000000 +0000 @@ -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 diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.jobs/pom.xml eclipse-platform-runtime-4.10/bundles/org.eclipse.core.jobs/pom.xml --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.jobs/pom.xml 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.jobs/pom.xml 2018-11-14 15:10:45.000000000 +0000 @@ -5,7 +5,7 @@ are made available under the terms of the Eclipse Distribution License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/org/documents/edl-v10.php - + Contributors: Igor Fedorenko - initial implementation Lars Vogel - Bug 432078 @@ -15,12 +15,12 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.9.0-SNAPSHOT + 4.10.0-SNAPSHOT ../../ org.eclipse.core org.eclipse.core.jobs - 3.10.100-SNAPSHOT + 3.10.200-SNAPSHOT eclipse-plugin -warn:-deprecation,raw,unchecked diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobManager.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobManager.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobManager.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobManager.java 2018-11-14 15:10:45.000000000 +0000 @@ -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 @@ 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 @@ 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 @@ @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); } diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF eclipse-platform-runtime-4.10/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF 2018-11-14 15:10:45.000000000 +0000 @@ -1,7 +1,7 @@ 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 diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.runtime/pom.xml eclipse-platform-runtime-4.10/bundles/org.eclipse.core.runtime/pom.xml --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.runtime/pom.xml 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.runtime/pom.xml 2018-11-14 15:10:45.000000000 +0000 @@ -14,12 +14,12 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.9.0-SNAPSHOT + 4.10.0-SNAPSHOT ../../ org.eclipse.core org.eclipse.core.runtime - 3.15.0-SNAPSHOT + 3.15.100-SNAPSHOT eclipse-plugin diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.runtime/schema/contentTypes.exsd eclipse-platform-runtime-4.10/bundles/org.eclipse.core.runtime/schema/contentTypes.exsd --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.runtime/schema/contentTypes.exsd 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.runtime/schema/contentTypes.exsd 2018-11-14 15:10:45.000000000 +0000 @@ -6,7 +6,12 @@ - The content types extension point allows plug-ins to contribute to the platform content type catalog. There are two forms of contributions: <cite>content types</cite> and <cite>file associations</cite>. + <p> +<b>WARNING: This extension point is DEPRECATED.</b><br> +Do not use this extension point, it will be removed in future versions of this product. +Instead, use the extension point <a href="org.eclipse.core.contenttype.contentTypes.html">org.eclipse.core.contenttype.contentTypes</a> +</p> +The content types extension point allows plug-ins to contribute to the platform content type catalog. There are two forms of contributions: <cite>content types</cite> and <cite>file associations</cite>. <ul> <li> a content type represents a file format and its naming conventions. Content types can be defined from scratch, or can inherit from existing ones, specializing them. Also, a content type can be made into an alias for another content type (see the <code>alias-for</code> attribute). When this feature is used: @@ -238,7 +243,7 @@ - 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 @@ -266,7 +271,7 @@ - Following is an example of a XML-based content type declaration using <code>org.eclipse.core.runtime.content.XMLRootElementContentDescriber2</code>, + Following is an example of an XML-based content type declaration using <code>org.eclipse.core.runtime.content.XMLRootElementContentDescriber2</code>, a built-in describer: <p> <pre> diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/META-INF/MANIFEST.MF eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/META-INF/MANIFEST.MF --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/META-INF/MANIFEST.MF 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/META-INF/MANIFEST.MF 2018-11-14 15:10:45.000000000 +0000 @@ -2,7 +2,7 @@ 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 @@ 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)", diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/pom.xml eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/pom.xml --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/pom.xml 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/pom.xml 2018-11-14 15:10:45.000000000 +0000 @@ -14,12 +14,12 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.9.0-SNAPSHOT + 4.10.0-SNAPSHOT ../../ org.eclipse.core org.eclipse.core.tools - 1.7.200-SNAPSHOT + 1.7.400-SNAPSHOT eclipse-plugin diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ClearTextAction.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ClearTextAction.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ClearTextAction.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ClearTextAction.java 2018-11-14 15:10:45.000000000 +0000 @@ -15,8 +15,8 @@ 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 @@ // 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$ } diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CollapseAllAction.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CollapseAllAction.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CollapseAllAction.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CollapseAllAction.java 2018-11-14 15:10:45.000000000 +0000 @@ -33,9 +33,6 @@ this.setImageDescriptor(CoreToolsPlugin.createImageDescriptor(imageName)); } - /* (non-Javadoc) - * @see org.eclipse.jface.action.IAction#run() - */ @Override public void run() { viewer.collapseAll(); diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CopyStructuredSelectionAction.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CopyStructuredSelectionAction.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CopyStructuredSelectionAction.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CopyStructuredSelectionAction.java 2018-11-14 15:10:45.000000000 +0000 @@ -25,9 +25,6 @@ */ public class CopyStructuredSelectionAction extends AbstractCopySelectionAction { - /** - * @see org.eclipse.core.tools.AbstractCopySelectionAction#AbstractCopySelectionAction(ISelectionProvider) - */ public CopyStructuredSelectionAction(ISelectionProvider selectionProvider) { super(selectionProvider); } @@ -40,14 +37,13 @@ * * @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'); } diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/DeepSize.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/DeepSize.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/DeepSize.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/DeepSize.java 2018-11-14 15:10:45.000000000 +0000 @@ -61,14 +61,14 @@ public static final int ARRAY_HEADER_SIZE = 12; public static final int HEADER_SIZE = 8; - static final HashSet ignoreSet = new HashSet(); + static final HashSet 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, Integer> counts = new HashMap<>(); - Set ignoreTypeNames = null; - final Map sizes = new HashMap(); + Set ignoreTypeNames = null; + final Map sizes = new HashMap<>(); /** * Adds an object to the ignore set. Returns true if the object @@ -82,7 +82,7 @@ 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 @@ byteSize += sizeOf(o); } - public Map getCounts() { + public Map, Integer> getCounts() { return counts; } - Set getDefaultIgnoreTypeNames() { - Set ignored = new HashSet(); + Set getDefaultIgnoreTypeNames() { + Set 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 @@ return byteSize; } - public Map getSizes() { + public Map getSizes() { return sizes; } @@ -135,20 +135,15 @@ */ 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 @@ 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 @@ } - 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 @@ } - private int sizeOfPrimitiveField(Class type) { + private int sizeOfPrimitiveField(Class type) { if (type == long.class || type == double.class) return 8; return 4; diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumperFactory.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumperFactory.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumperFactory.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumperFactory.java 2018-11-14 15:10:45.000000000 +0000 @@ -14,7 +14,6 @@ package org.eclipse.core.tools.metadata; import java.io.File; -import java.util.Enumeration; import java.util.Properties; import org.eclipse.core.runtime.*; import org.eclipse.core.tools.CoreToolsPlugin; @@ -112,8 +111,7 @@ private String getListOfDumperClass(Properties cfg) { StringBuilder buf = new StringBuilder("\r\nList of files who have a dumper class"); - for (Enumeration e = cfg.keys(); e.hasMoreElements();) { - String element = (String) e.nextElement(); + for (String element : cfg.stringPropertyNames()) { buf.append("\r\n"); buf.append(element); } diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpTool.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpTool.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpTool.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpTool.java 2018-11-14 15:10:45.000000000 +0000 @@ -13,7 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tools.metadata; -import java.io.*; +import java.io.File; +import java.io.FileFilter; import java.util.*; import org.eclipse.core.runtime.*; import org.eclipse.equinox.app.IApplication; @@ -69,7 +70,7 @@ DumperFactory factory = DumperFactory.getInstance(); String[] registeredFileNames = factory.getRegisteredFileNames(); this.fileFilter = new MetadataFileFilter(registeredFileNames); - this.directoryFilter = new DirectoryFilter(); + this.directoryFilter = pathname -> pathname.isDirectory(); System.out.println("DumpTool started..."); System.out.println("Analyzing: "+fileName); @@ -115,12 +116,12 @@ } private String[] extractFiles(String directory) { - List fileNames = new ArrayList(); + List fileNames = new ArrayList<>(); extractInfo(new File(directory), fileNames, new NullProgressMonitor()); String[] result = new String[fileNames.size()]; if (fileNames.size()>0){ - result = (String[])fileNames.toArray(new String[fileNames.size()]); + result = fileNames.toArray(new String[fileNames.size()]); } return result; } @@ -137,7 +138,7 @@ * @return true if the provided dir (or at least one of its sub dirs) * contains files with one of the registered types, false otherwise */ - void extractInfo(File dir, List fileList, IProgressMonitor monitor) { + void extractInfo(File dir, List fileList, IProgressMonitor monitor) { if (monitor.isCanceled()) return; @@ -165,21 +166,6 @@ } } - /** - * Filters directories entries. - * - * @see java.io.FileFilter - */ - private class DirectoryFilter implements FileFilter { - /** - * @see java.io.FileFilter#accept(java.io.File) - */ - @Override - public boolean accept(File file) { - return file.isDirectory(); - } - } - @Override public void stop() { // Does not do anything diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/MessageBundleRefactoring.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/MessageBundleRefactoring.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/MessageBundleRefactoring.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/MessageBundleRefactoring.java 2018-11-14 15:10:45.000000000 +0000 @@ -81,12 +81,14 @@ try { ITextFileBufferManager manager = FileBuffers.getTextFileBufferManager(); try { - manager.connect(fPropertiesFile.getFullPath(), null); - manager.connect(fAccessorClass.getCompilationUnit().getCorrespondingResource().getFullPath(), null); + manager.connect(fPropertiesFile.getFullPath(), LocationKind.NORMALIZE, null); + manager.connect(fAccessorClass.getCompilationUnit().getCorrespondingResource().getFullPath(), + LocationKind.NORMALIZE, null); fChange.addAll(new PropertyFileConverter().convertFile(fAccessorClass, fPropertiesFile)); } finally { - manager.disconnect(fPropertiesFile.getFullPath(), null); - manager.disconnect(fAccessorClass.getCompilationUnit().getCorrespondingResource().getFullPath(), null); + manager.disconnect(fPropertiesFile.getFullPath(), LocationKind.NORMALIZE, null); + manager.disconnect(fAccessorClass.getCompilationUnit().getCorrespondingResource().getFullPath(), + LocationKind.NORMALIZE, null); } } catch (IOException e) { throw new CoreException(new Status(IStatus.ERROR, CoreToolsPlugin.PI_TOOLS, IStatus.ERROR, e.getMessage(), e)); diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/NLSFileChange.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/NLSFileChange.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/NLSFileChange.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/NLSFileChange.java 2018-11-14 15:10:45.000000000 +0000 @@ -40,9 +40,6 @@ this.contents = text; } - /* (non-Javadoc) - * @see org.eclipse.ltk.core.refactoring.TextFileChange#commit(org.eclipse.jface.text.IDocument, org.eclipse.core.runtime.IProgressMonitor) - */ @Override protected void commit(IDocument document, IProgressMonitor monitor) throws CoreException { if (contents == null) { @@ -62,9 +59,6 @@ file.setContents(input, IResource.FORCE, null); } - /* (non-Javadoc) - * @see Change#getModifiedElement() - */ @Override public Object getModifiedElement() { return file; diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/PropertyFileConverter.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/PropertyFileConverter.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/PropertyFileConverter.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/PropertyFileConverter.java 2018-11-14 15:10:45.000000000 +0000 @@ -28,7 +28,7 @@ */ public class PropertyFileConverter { - private static final HashSet keywords = new HashSet(); + private static final HashSet keywords = new HashSet<>(); static { keywords.add("abstract"); //$NON-NLS-1$ @@ -120,7 +120,7 @@ /* * Remove the properties in the specified list from the file. */ - public Change trim(IFile propertiesFile, List toDelete) throws IOException, CoreException { + public Change trim(IFile propertiesFile, List toDelete) throws IOException, CoreException { if (toDelete == null || toDelete.isEmpty()) return null; BufferedReader reader = new BufferedReader(new InputStreamReader(propertiesFile.getContents())); diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/RemoveUnusedMessages.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/RemoveUnusedMessages.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/RemoveUnusedMessages.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/RemoveUnusedMessages.java 2018-11-14 15:10:45.000000000 +0000 @@ -69,7 +69,7 @@ // Search for references IField[] fields = accessorClass.getFields(); - ArrayList toDelete = new ArrayList(); + ArrayList toDelete = new ArrayList<>(); // 10 units of work for modifying the properties file and AST monitor.beginTask("Searching for references.", fields.length + 10); try { @@ -123,7 +123,7 @@ return result; } - private void processAST(final CompilationUnit root, final ASTRewrite rewriter, final List toDelete) { + private void processAST(final CompilationUnit root, final ASTRewrite rewriter, final List toDelete) { ASTVisitor visitor = new ASTVisitor() { @Override public boolean visit(VariableDeclarationFragment node) { @@ -137,16 +137,18 @@ root.accept(visitor); } - private void processPropertiesFile(List list) throws CoreException { + private void processPropertiesFile(List list) throws CoreException { try { ITextFileBufferManager manager = FileBuffers.getTextFileBufferManager(); try { - manager.connect(propertiesFile.getFullPath(), null); - manager.connect(accessorClass.getCompilationUnit().getCorrespondingResource().getFullPath(), null); + manager.connect(propertiesFile.getFullPath(), LocationKind.NORMALIZE, null); + manager.connect(accessorClass.getCompilationUnit().getCorrespondingResource().getFullPath(), + LocationKind.NORMALIZE, null); change.add(new PropertyFileConverter().trim(propertiesFile, list)); } finally { - manager.disconnect(propertiesFile.getFullPath(), null); - manager.disconnect(accessorClass.getCompilationUnit().getCorrespondingResource().getFullPath(), null); + manager.disconnect(propertiesFile.getFullPath(), LocationKind.NORMALIZE, null); + manager.disconnect(accessorClass.getCompilationUnit().getCorrespondingResource().getFullPath(), + LocationKind.NORMALIZE, null); } } catch (IOException e) { throw new CoreException(new Status(IStatus.ERROR, CoreToolsPlugin.PI_TOOLS, IStatus.ERROR, e.getMessage(), e)); diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ContentTypePropertySource.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ContentTypePropertySource.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ContentTypePropertySource.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ContentTypePropertySource.java 2018-11-14 15:10:45.000000000 +0000 @@ -129,9 +129,9 @@ } @Override - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { if (adapter == IPropertySource.class) - return this; + return adapter.cast(this); return null; } } \ No newline at end of file diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ContentTypeView.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ContentTypeView.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ContentTypeView.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ContentTypeView.java 2018-11-14 15:10:45.000000000 +0000 @@ -42,7 +42,7 @@ return true; } - private TreeContentProviderNode addContentType(IContentType type, Set visited) { + private TreeContentProviderNode addContentType(IContentType type, Set visited) { ContentTypePropertySource wrapped = new ContentTypePropertySource(type); if (!visited.add(wrapped)) return getNodeFor(wrapped); @@ -64,7 +64,7 @@ @Override protected void rebuild(Viewer viewer, Object input) { IContentType[] allTypes = ContentTypeManager.getInstance().getAllContentTypes(); - Set visited = new HashSet(allTypes.length); + Set visited = new HashSet<>(allTypes.length); for (IContentType allType : allTypes) addContentType(allType, visited); } diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EclipsePreferencesView.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EclipsePreferencesView.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EclipsePreferencesView.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EclipsePreferencesView.java 2018-11-14 15:10:45.000000000 +0000 @@ -64,7 +64,7 @@ @Override public Object[] getChildren(Object parent) { - ArrayList result = new ArrayList(); + ArrayList result = new ArrayList<>(); if (parent instanceof IEclipsePreferences) { IEclipsePreferences node = (IEclipsePreferences) parent; try { @@ -126,7 +126,7 @@ viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL); viewer.setContentProvider(new ViewContentProvider()); viewer.setLabelProvider(new ViewLabelProvider()); - viewer.setSorter(new ViewerSorter()); + viewer.setComparator(new ViewerComparator()); viewer.setInput(getViewSite()); getViewSite().setSelectionProvider(viewer); IActionBars bars = getViewSite().getActionBars(); diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EventsSorter.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EventsSorter.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EventsSorter.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EventsSorter.java 2018-11-14 15:10:45.000000000 +0000 @@ -19,9 +19,9 @@ import org.eclipse.core.runtime.PerformanceStats; import org.eclipse.core.tools.ISorter; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.viewers.ViewerSorter; +import org.eclipse.jface.viewers.ViewerComparator; -public class EventsSorter extends ViewerSorter implements ISorter { +public class EventsSorter extends ViewerComparator implements ISorter { protected boolean reversed = false; protected int columnNumber; @@ -65,9 +65,6 @@ reversed = newReversed; } - /* - * Overrides method from ViewerSorter - */ @Override public void sort(final Viewer viewer, Object[] elements) { Comparator comparator = new Comparator() { diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EventsView.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EventsView.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EventsView.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EventsView.java 2018-11-14 15:10:45.000000000 +0000 @@ -25,8 +25,6 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.*; import org.eclipse.ui.IActionBars; -import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.part.WorkbenchPart; /** * Stats View @@ -50,41 +48,31 @@ public class EventsView extends TableWithTotalView { class EventsViewContentProvider implements ITreeContentProvider { - /** - * @see org.eclipse.jface.viewers.IContentProvider#dispose() - */ @Override public void dispose() { // do nothing } - /** @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) */ @Override public Object[] getChildren(Object parentElement) { return new Object[0]; } - /** @see IStructuredContentProvider#getElements(Object) */ @Override public Object[] getElements(Object input) { return PerformanceStats.getAllStats(); } - /** @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) */ @Override public Object getParent(Object element) { return null; } - /** @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) */ @Override public boolean hasChildren(Object element) { return false; } - /** - * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) - */ @Override public void inputChanged(Viewer aViewer, Object oldInput, Object newInput) { // do nothing @@ -96,17 +84,11 @@ */ class EventsViewLabelProvider extends LabelProvider implements ITableLabelProvider, IColorProvider { - /** - * @see ITableLabelProvider#getColumnImage(Object, int) - */ @Override public Image getColumnImage(Object arg0, int arg1) { return null; } - /** - * @see ITableLabelProvider#getColumnText(Object, int) - */ @Override public String getColumnText(Object element, int columnIndex) { if (!(element instanceof PerformanceStats)) { @@ -156,29 +138,20 @@ display.asyncExec(runnable); } - /** - * @see PerformanceStats.PerformanceListener#eventsOccurred(PerformanceStats[]) - */ @Override public void eventsOccurred(final PerformanceStats[] event) { - asyncExec(new Runnable() { - @Override - public void run() { - if (!getViewer().getControl().isDisposed()) - getViewer().refresh(); - } + asyncExec(() -> { + if (!getViewer().getControl().isDisposed()) + getViewer().refresh(); }); } @Override public void eventFailed(final PerformanceStats event, final long duration) { - asyncExec(new Runnable() { - @Override - public void run() { - String msg = "Performance event failure: " + event.getEvent() + " blame: " + event.getBlameString() + " context: " + event.getContext() + " duration: " + duration; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - getViewSite().getActionBars().getStatusLineManager().setErrorMessage(msg); - // MessageDialog.openError(getSite().getShell(), "Performance failure", msg); - } + asyncExec(() -> { + String msg = "Performance event failure: " + event.getEvent() + " blame: " + event.getBlameString() + " context: " + event.getContext() + " duration: " + duration; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + getViewSite().getActionBars().getStatusLineManager().setErrorMessage(msg); + // MessageDialog.openError(getSite().getShell(), "Performance failure", msg); }); } } @@ -205,9 +178,6 @@ private Action resetAction; private final StatsListener statsListener = new StatsListener(); - /** - * @see org.eclipse.core.tools.TableWithTotalView#computeTotalLine(java.util.Iterator) - */ @Override protected String[] computeTotalLine(Iterator iter) { String[] totals = new String[getColumnHeaders().length]; @@ -230,9 +200,6 @@ return totals; } - /** - * @see org.eclipse.core.tools.TableWithTotalView#createActions() - */ @Override protected void createActions() { resetAction = new Action("Reset") { //$NON-NLS-1$ @@ -253,9 +220,6 @@ bars.updateActionBars(); } - /** - * @see org.eclipse.core.tools.TableWithTotalView#createContextMenu() - */ @Override protected void createContextMenu() { // creates a context menu with actions and adds it to the viewer control @@ -266,9 +230,6 @@ viewer.getControl().setMenu(menu); } - /** - * @see IWorkbenchPart#createPartControl - */ @Override public void createPartControl(Composite parent) { super.createPartControl(parent); @@ -276,67 +237,43 @@ viewer.setInput(""); //$NON-NLS-1$ } - /** - * @see org.eclipse.core.tools.TableWithTotalView#createToolbar() - */ @Override protected void createToolbar() { IToolBarManager mgr = getViewSite().getActionBars().getToolBarManager(); mgr.add(resetAction); } - /** - * @see WorkbenchPart#dispose() - */ @Override public void dispose() { super.dispose(); PerformanceStats.removeListener(statsListener); } - /** - * @see org.eclipse.core.tools.TableWithTotalView#getColumnHeaders() - */ @Override protected String[] getColumnHeaders() { return columnHeaders; } - /** - * @see org.eclipse.core.tools.TableWithTotalView#getColumnLayout() - */ @Override protected ColumnLayoutData[] getColumnLayout() { return columnLayouts; } - /** - * @see org.eclipse.core.tools.TableWithTotalView#getContentProvider() - */ @Override protected ITreeContentProvider getContentProvider() { return new EventsViewContentProvider(); } - /** - * @see org.eclipse.core.tools.TableWithTotalView#getLabelProvider() - */ @Override protected ITableLabelProvider getLabelProvider() { return new EventsViewLabelProvider(); } - /** - * @see org.eclipse.core.tools.TableWithTotalView#getSorter(int) - */ @Override - protected ViewerSorter getSorter(int column) { + protected ViewerComparator getSorter(int column) { return new EventsSorter(column); } - /** - * @see org.eclipse.core.tools.TableWithTotalView#getStatusLineMessage(Object) - */ @Override protected String getStatusLineMessage(Object element) { if (!(element instanceof PerformanceStats)) diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginDependencyGraphNode.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginDependencyGraphNode.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginDependencyGraphNode.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginDependencyGraphNode.java 2018-11-14 15:10:45.000000000 +0000 @@ -13,7 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tools.runtime; -import java.util.*; +import java.util.HashSet; +import java.util.Set; import org.eclipse.core.tools.Messages; import org.eclipse.osgi.service.resolver.BundleDescription; import org.eclipse.osgi.util.NLS; @@ -29,8 +30,8 @@ public class PluginDependencyGraphNode { private BundleDescription descriptor = null; - private Set children = new HashSet(); - private Set ancestors = new HashSet(); + private Set children = new HashSet<>(); + private Set ancestors = new HashSet<>(); /** * Constructor for this class. Each node is associated with a plug-in so @@ -79,8 +80,7 @@ writeln(buffer, 1, Messages.depend_noParentPlugins); } else { writeln(buffer, 1, Messages.depend_requiredBy); - for (Iterator i = ancestors.iterator(); i.hasNext();) { - PluginDependencyGraphNode ancestor = (PluginDependencyGraphNode) i.next(); + for (PluginDependencyGraphNode ancestor : ancestors) { writeln(buffer, 2, ancestor.getId()); } } @@ -90,8 +90,7 @@ writeln(buffer, 1, Messages.depend_noChildrenPlugins); } else { writeln(buffer, 1, Messages.depend_requires); - for (Iterator i = children.iterator(); i.hasNext();) { - PluginDependencyGraphNode child = (PluginDependencyGraphNode) i.next(); + for (PluginDependencyGraphNode child : children) { writeln(buffer, 2, child.getId()); } } diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginListView.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginListView.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginListView.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginListView.java 2018-11-14 15:10:45.000000000 +0000 @@ -37,26 +37,17 @@ * Class which provides the text labels for the view. */ class PluginListLabelProvider extends LabelProvider implements ITableLabelProvider { - /** - * @see ITableLabelProvider#getColumnImage(Object, int) - */ @Override public Image getColumnImage(Object arg0, int arg1) { return null; } - /** - * @see ITableLabelProvider#getColumnText(Object, int) - */ @Override public String getColumnText(Object element, int columnIndex) { return element == null ? Messages.depend_badPluginId : ((BundleDescription) element).getSymbolicName(); } } - /** - * @see IStructuredContentProvider#getElements(Object) - */ @Override public Object[] getElements(Object arg0) { if (bundles == null) { @@ -64,15 +55,12 @@ // we have to use a comparator here because plug-in // descriptors cannot be compared against each other // in a tree set. - Comparator comparator = new Comparator() { - @Override - public int compare(Object obj1, Object obj2) { - String id1 = ((BundleDescription) obj1).getSymbolicName(); - String id2 = ((BundleDescription) obj2).getSymbolicName(); - return id1.compareTo(id2); - } + Comparator comparator = (obj1, obj2) -> { + String id1 = obj1.getSymbolicName(); + String id2 = obj2.getSymbolicName(); + return id1.compareTo(id2); }; - Set set = new TreeSet(comparator); + Set set = new TreeSet<>(comparator); BundleContext context = CoreToolsPlugin.getDefault().getContext(); Bundle[] allBundles = context.getBundles(); State state = Platform.getPlatformAdmin().getState(false); @@ -83,25 +71,16 @@ return bundles; } - /** - * @see IContentProvider#dispose() - */ @Override public void dispose() { bundles = null; } - /** - * @see IContentProvider#inputChanged(Viewer, Object, Object) - */ @Override public void inputChanged(Viewer arg0, Object arg1, Object arg2) { // do nothing } - /** - * @see org.eclipse.ui.IWorkbenchPart#createPartControl(Composite) - */ @Override public void createPartControl(Composite parent) { // Create viewer. diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PreferenceStatsView.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PreferenceStatsView.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PreferenceStatsView.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PreferenceStatsView.java 2018-11-14 15:10:45.000000000 +0000 @@ -15,8 +15,10 @@ import java.util.*; import org.eclipse.core.internal.preferences.EclipsePreferences; -import org.eclipse.core.runtime.*; -import org.eclipse.core.runtime.preferences.*; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.QualifiedName; +import org.eclipse.core.runtime.preferences.IEclipsePreferences; +import org.eclipse.core.runtime.preferences.IPreferenceNodeVisitor; import org.eclipse.core.tools.*; import org.eclipse.jface.action.*; import org.eclipse.jface.text.*; @@ -52,7 +54,7 @@ // size of the tree int treeSize; // list of node with key/value pairs - Set nonEmptyNodes; + Set nonEmptyNodes; // root node IEclipsePreferences rootNode = Platform.getPreferencesService().getRootNode(); @@ -76,15 +78,15 @@ reset(); } - void reset() { + private void reset() { nodeCount = 0; kvCount = 0; emptyNodes = 0; treeSize = 0; - nonEmptyNodes = new TreeSet(); + nonEmptyNodes = new TreeSet<>(); } - int basicSizeof(IEclipsePreferences node) { + private int basicSizeof(IEclipsePreferences node) { if (node instanceof EclipsePreferences) return basicSizeof((EclipsePreferences) node); @@ -105,77 +107,11 @@ return count; } - int calculateOldSize() { - int count = 0; - IPluginRegistry registry = Platform.getPluginRegistry(); - if (registry == null) - return count; - IPluginDescriptor[] descriptors = registry.getPluginDescriptors(); - if (descriptors == null) - return count; - for (IPluginDescriptor desc : descriptors) { - // if (desc.isPluginActivated()) - count += calculateOldSizeFor(desc.getUniqueIdentifier()); - } - return count; - } - - int calculateOldSizeFor(String pluginID) { - int count = 0; - // 12 for the object header + 4 for each field - count += 12; - - // dirty boolean - count += 4; - - // listener list - // TODO - count += 4; - - // Properties properties - count += 4; - IEclipsePreferences node = InstanceScope.INSTANCE.getNode(pluginID); - if (node != null) { - // add the key/value pairs - // TODO rough estimate - try { - String[] keys = node.keys(); - for (String key : keys) { - count += sizeof(key); - String value = node.get(key, null); - count += sizeof(value); - } - } catch (BackingStoreException e) { - e.printStackTrace(); - } - } - - // Properties defaults - count += 4; - node = DefaultScope.INSTANCE.getNode(pluginID); - if (node != null) { - // add the key/value pairs - // TODO rough estimate - try { - String[] keys = node.keys(); - for (String key : keys) { - count += sizeof(key); - String value = node.get(key, null); - count += sizeof(value); - } - } catch (BackingStoreException e) { - e.printStackTrace(); - } - } - - return count; - } - /* * 12 for the object header * 4 for each slot */ - int basicSizeof(EclipsePreferences node) { + private int basicSizeof(EclipsePreferences node) { int count = 12; // name @@ -230,7 +166,7 @@ return count; } - int basicSizeof(Map map) { + private int basicSizeof(Map map) { if (map == null) return 0; @@ -249,7 +185,7 @@ * All sizeof tests should go through this central method to weed out * duplicates. */ - int sizeof(Object object) { + private int sizeof(Object object) { if (object == null)//|| DeepSize.ignore(object)) return 0; if (object instanceof String) @@ -270,50 +206,43 @@ return 0; } - void visitTree() throws BackingStoreException { + private void visitTree() throws BackingStoreException { // count the number of nodes in the preferences tree reset(); - IPreferenceNodeVisitor visitor = new IPreferenceNodeVisitor() { - @Override - public boolean visit(IEclipsePreferences node) { - try { - treeSize += sizeof(node); - nodeCount++; - int keys = node.keys().length; - kvCount += keys; - if (keys == 0) - emptyNodes++; - else - nonEmptyNodes.add(node.absolutePath() + " (" + keys + ")"); //$NON-NLS-1$//$NON-NLS-2$ - } catch (BackingStoreException e) { - e.printStackTrace(); - } - return true; + IPreferenceNodeVisitor visitor = node -> { + try { + treeSize += sizeof(node); + nodeCount++; + int keys = node.keys().length; + kvCount += keys; + if (keys == 0) + emptyNodes++; + else + nonEmptyNodes.add(node.absolutePath() + " (" + keys + ")"); //$NON-NLS-1$//$NON-NLS-2$ + } catch (BackingStoreException e) { + e.printStackTrace(); } + return true; }; rootNode.accept(visitor); } void updateTextView() { final StringBuilder buffer = new StringBuilder(); - buffer.append("Size of Eclipse 2.1 preference objects: " + prettyPrint(calculateOldSize()) + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ buffer.append("Total node count: " + prettyPrint(nodeCount) + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ buffer.append("Nodes without keys: " + prettyPrint(emptyNodes) + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ buffer.append("Key/value pairs: " + prettyPrint(kvCount) + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ buffer.append("Total size of tree: " + prettyPrint(treeSize) + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ buffer.append("Nodes with key/value pairs:\n"); //$NON-NLS-1$ - for (Iterator i = nonEmptyNodes.iterator(); i.hasNext();) - buffer.append("\t" + i.next() + "\n"); //$NON-NLS-1$//$NON-NLS-2$ + for (String string : nonEmptyNodes) + buffer.append("\t" + string + "\n"); //$NON-NLS-1$//$NON-NLS-2$ //post changes to UI thread - viewer.getControl().getDisplay().asyncExec(new Runnable() { - @Override - public void run() { - if (!viewer.getControl().isDisposed()) { - IDocument doc = viewer.getDocument(); - doc.set(buffer.toString()); - viewer.setDocument(doc); - } + viewer.getControl().getDisplay().asyncExec(() -> { + if (!viewer.getControl().isDisposed()) { + IDocument doc = viewer.getDocument(); + doc.set(buffer.toString()); + viewer.setDocument(doc); } }); } @@ -354,9 +283,6 @@ } } - /** - * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite) - */ @Override public void createPartControl(Composite parent) { @@ -406,9 +332,6 @@ updateAction.run(); } - /** - * @see org.eclipse.ui.IWorkbenchPart#dispose() - */ @Override public void dispose() { super.dispose(); diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/StackTraceView.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/StackTraceView.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/StackTraceView.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/StackTraceView.java 2018-11-14 15:10:45.000000000 +0000 @@ -26,7 +26,7 @@ } @Override - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { return null; } diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchResultPage.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchResultPage.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchResultPage.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchResultPage.java 2018-11-14 15:10:45.000000000 +0000 @@ -28,12 +28,9 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.part.IShowInTargetList; -/** - * - */ public class FindUnusedSearchResultPage extends AbstractTextSearchViewPage implements ISearchResultPage, IAdaptable { - public class DecoratorIgnoringViewerSorter extends ViewerSorter { + public class DecoratorIgnoringViewerSorter extends ViewerComparator { private Collator collator; @@ -50,11 +47,11 @@ name1 = "";//$NON-NLS-1$ if (name2 == null) name2 = "";//$NON-NLS-1$ - return getCollator().compare(name1, name2); + return getComparator().compare(name1, name2); } @Override - public final Collator getCollator() { + public final Collator getComparator() { if (collator == null) { collator = Collator.getInstance(); } @@ -115,14 +112,9 @@ } } - public static final IShowInTargetList SHOW_IN_TARGET_LIST = new IShowInTargetList() { - @Override - public String[] getShowInTargetIds() { - return SHOW_IN_TARGETS; - } - }; + static final String[] SHOW_IN_TARGETS = new String[] { JavaUI.ID_PACKAGES, IPageLayout.ID_RES_NAV }; - static final String[] SHOW_IN_TARGETS = new String[] {JavaUI.ID_PACKAGES, IPageLayout.ID_RES_NAV}; + public static final IShowInTargetList SHOW_IN_TARGET_LIST = () -> SHOW_IN_TARGETS; private static final int SORT_BY_NAME = 0; private static final int SORT_BY_PATH = 1; @@ -139,38 +131,26 @@ super(AbstractTextSearchViewPage.FLAG_LAYOUT_FLAT); } - /* - * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#clear() - */ @Override protected void clear() { if (contentProvider != null) contentProvider.clear(); } - /* - * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#configureTableViewer(org.eclipse.jface.viewers.TableViewer) - */ @Override protected void configureTableViewer(TableViewer aViewer) { this.viewer = aViewer; contentProvider = new TableContentProvider(); aViewer.setContentProvider(contentProvider); setSortOrder(SORT_BY_PATH); - aViewer.setSorter(new DecoratorIgnoringViewerSorter()); + aViewer.setComparator(new DecoratorIgnoringViewerSorter()); } - /* - * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#configureTreeViewer(org.eclipse.jface.viewers.TreeViewer) - */ @Override protected void configureTreeViewer(TreeViewer aViewer) { throw new IllegalStateException("Doesn't support tree mode."); } - /* - * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#elementsChanged(java.lang.Object[]) - */ @Override protected void elementsChanged(Object[] objects) { if (contentProvider != null) @@ -188,13 +168,10 @@ mgr.appendToGroup(IContextMenuConstants.GROUP_VIEWER_SETUP, sortMenu); } - /* (non-Javadoc) - * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) - */ @Override - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { if (IShowInTargetList.class.equals(adapter)) { - return SHOW_IN_TARGET_LIST; + return adapter.cast(SHOW_IN_TARGET_LIST); } return null; } diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableSelectionProviderDecorator.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableSelectionProviderDecorator.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableSelectionProviderDecorator.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableSelectionProviderDecorator.java 2018-11-14 15:10:45.000000000 +0000 @@ -39,9 +39,6 @@ this.selectionProvider = selectionProvider; } - /** - * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) - */ @Override public void addSelectionChangedListener(ISelectionChangedListener listener) { selectionProvider.addSelectionChangedListener(listener); @@ -71,7 +68,7 @@ StringBuilder copyText = new StringBuilder(); copyText.append(headerPluginStats()); copyText.append('\n'); - for (Iterator selectionIter = structuredSelection.iterator(); selectionIter.hasNext();) { + for (Iterator selectionIter = structuredSelection.iterator(); selectionIter.hasNext();) { Object obj = selectionIter.next(); if (obj instanceof PerformanceStats) { copyText.append(prettyPluginStats((PerformanceStats) obj)); diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableWithTotalView.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableWithTotalView.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableWithTotalView.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableWithTotalView.java 2018-11-14 15:10:45.000000000 +0000 @@ -71,7 +71,7 @@ // If so, set flatness and get a new sorter if (oldSorter == null || !threeState || column != oldSorter.getColumnNumber()) { flat = column != 0; // default for column 0 is NOT flat - viewer.setSorter(getSorter(column)); + viewer.setComparator(getSorter(column)); } else { // Not changing sorters so we have to cycle through states for the columns // Three state sort for column 0. !flat/!reverse -> flat/!reverse -> flat/reverse @@ -161,7 +161,7 @@ protected abstract ITableLabelProvider getLabelProvider(); - protected abstract ViewerSorter getSorter(int column); + protected abstract ViewerComparator getSorter(int column); protected abstract String getStatusLineMessage(Object element); @@ -180,7 +180,7 @@ viewer = new TableViewer(tableTree); viewer.setContentProvider(getContentProvider()); viewer.setLabelProvider(getLabelProvider()); - viewer.setSorter(getSorter(0)); + viewer.setComparator(getSorter(0)); viewer.addSelectionChangedListener(getTableListener()); createCommonActions(); @@ -203,7 +203,7 @@ result += "\n\n"; //$NON-NLS-1$ ITableLabelProvider labelProvider = (ITableLabelProvider) viewer.getLabelProvider(); - for (Iterator iterator = selection.iterator(); iterator.hasNext();) { + for (Iterator iterator = selection.iterator(); iterator.hasNext();) { Object selectedItem = iterator.next(); for (int i = 0; i < columnHeaders.length; i++) result += labelProvider.getColumnText(selectedItem, i) + ","; //$NON-NLS-1$ diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeContentProviderNode.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeContentProviderNode.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeContentProviderNode.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeContentProviderNode.java 2018-11-14 15:10:45.000000000 +0000 @@ -20,7 +20,7 @@ * Represents a node (possibly containing children) in a tree content * provider model. Every node has a name and optionally a value. */ -public class TreeContentProviderNode implements Comparable, IAdaptable { +public class TreeContentProviderNode implements Comparable, IAdaptable { /** * A list containing this node's children. @@ -80,7 +80,7 @@ public void addChild(Object child) { // lazilly instantiates the children's list if (this.children == null) { - this.children = new ArrayList(); + this.children = new ArrayList<>(); } this.children.add(child); if (child instanceof TreeContentProviderNode) { @@ -162,9 +162,8 @@ * @see java.lang.Comparable#compareTo(java.lang.Object) */ @Override - public int compareTo(Object other) { - TreeContentProviderNode otherNode = (TreeContentProviderNode) other; - return this.name.compareTo(otherNode.name); + public int compareTo(TreeContentProviderNode other) { + return this.name.compareTo(other.name); } /** @@ -180,7 +179,7 @@ return; if (children == null) return; - for (Iterator childrenIter = children.iterator(); childrenIter.hasNext();) { + for (Iterator childrenIter = children.iterator(); childrenIter.hasNext();) { Object child = childrenIter.next(); // child nodes don't need to be TreeContentProviderNodes if (child instanceof TreeContentProviderNode) @@ -207,7 +206,7 @@ return this; if (children == null || children.isEmpty()) return null; - for (Iterator i = children.iterator(); i.hasNext();) { + for (Iterator i = children.iterator(); i.hasNext();) { TreeContentProviderNode found = ((TreeContentProviderNode) i.next()).findNode(obj); if (found != null) return found; @@ -216,7 +215,7 @@ } @Override - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { return value instanceof IAdaptable ? ((IAdaptable) value).getAdapter(adapter) : null; } diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeSelectionProviderDecorator.java eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeSelectionProviderDecorator.java --- eclipse-platform-runtime-4.9/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeSelectionProviderDecorator.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeSelectionProviderDecorator.java 2018-11-14 15:10:45.000000000 +0000 @@ -42,9 +42,6 @@ this.selectionProvider = selectionProvider; } - /** - * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) - */ @Override public void addSelectionChangedListener(ISelectionChangedListener listener) { selectionProvider.addSelectionChangedListener(listener); @@ -59,7 +56,6 @@ * * @return the current selection, ordered in the same sequence they appear in * the tree - * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection() */ @Override public ISelection getSelection() { @@ -87,16 +83,13 @@ // uses a visitor to traverse the whole tree // when a visited node is the selected list, it is moved to the ordered list - anyNode.getRoot().accept(new ITreeNodeVisitor() { - @Override - public boolean visit(TreeContentProviderNode node) { - int elementIndex = selectedElements.indexOf(node); + anyNode.getRoot().accept(node -> { + int elementIndex = selectedElements.indexOf(node); - if (selectedElements.contains(node)) - orderedElements.add(selectedElements.remove(elementIndex)); + if (selectedElements.contains(node)) + orderedElements.add(selectedElements.remove(elementIndex)); - return true; - } + return true; }); // any remaining elements in the list (probably they are not tree nodes) @@ -112,7 +105,7 @@ * @return the first element that is a tree node or null, if none is found. */ private TreeContentProviderNode findNodeElement(List elements) { - for (Iterator iter = elements.iterator(); iter.hasNext();) { + for (Iterator iter = elements.iterator(); iter.hasNext();) { Object element = iter.next(); if (element instanceof TreeContentProviderNode) return (TreeContentProviderNode) element; @@ -121,17 +114,11 @@ return null; } - /** - * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) - */ @Override public void removeSelectionChangedListener(ISelectionChangedListener listener) { selectionProvider.removeSelectionChangedListener(listener); } - /** - * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection) - */ @Override public void setSelection(ISelection selection) { selectionProvider.setSelection(selection); diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.e4.core.contexts/pom.xml eclipse-platform-runtime-4.10/bundles/org.eclipse.e4.core.contexts/pom.xml --- eclipse-platform-runtime-4.9/bundles/org.eclipse.e4.core.contexts/pom.xml 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.e4.core.contexts/pom.xml 2018-11-14 15:10:45.000000000 +0000 @@ -14,7 +14,7 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.9.0-SNAPSHOT + 4.10.0-SNAPSHOT ../../ org.eclipse.e4 diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.e4.core.di/pom.xml eclipse-platform-runtime-4.10/bundles/org.eclipse.e4.core.di/pom.xml --- eclipse-platform-runtime-4.9/bundles/org.eclipse.e4.core.di/pom.xml 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.e4.core.di/pom.xml 2018-11-14 15:10:45.000000000 +0000 @@ -14,7 +14,7 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.9.0-SNAPSHOT + 4.10.0-SNAPSHOT ../../ org.eclipse.e4 diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.e4.core.di.annotations/pom.xml eclipse-platform-runtime-4.10/bundles/org.eclipse.e4.core.di.annotations/pom.xml --- eclipse-platform-runtime-4.9/bundles/org.eclipse.e4.core.di.annotations/pom.xml 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.e4.core.di.annotations/pom.xml 2018-11-14 15:10:45.000000000 +0000 @@ -14,7 +14,7 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.9.0-SNAPSHOT + 4.10.0-SNAPSHOT ../../ org.eclipse.e4 diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.e4.core.di.extensions/pom.xml eclipse-platform-runtime-4.10/bundles/org.eclipse.e4.core.di.extensions/pom.xml --- eclipse-platform-runtime-4.9/bundles/org.eclipse.e4.core.di.extensions/pom.xml 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.e4.core.di.extensions/pom.xml 2018-11-14 15:10:45.000000000 +0000 @@ -14,7 +14,7 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.9.0-SNAPSHOT + 4.10.0-SNAPSHOT ../../ org.eclipse.e4 diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.e4.core.di.extensions.supplier/pom.xml eclipse-platform-runtime-4.10/bundles/org.eclipse.e4.core.di.extensions.supplier/pom.xml --- eclipse-platform-runtime-4.9/bundles/org.eclipse.e4.core.di.extensions.supplier/pom.xml 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.e4.core.di.extensions.supplier/pom.xml 2018-11-14 15:10:45.000000000 +0000 @@ -14,7 +14,7 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.9.0-SNAPSHOT + 4.10.0-SNAPSHOT ../../ org.eclipse.e4 diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.e4.core.services/build.properties eclipse-platform-runtime-4.10/bundles/org.eclipse.e4.core.services/build.properties --- eclipse-platform-runtime-4.9/bundles/org.eclipse.e4.core.services/build.properties 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.e4.core.services/build.properties 2018-11-14 15:10:45.000000000 +0000 @@ -1,7 +1,6 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ - plugin.xml,\ .options,\ about.html,\ plugin.properties,\ diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF eclipse-platform-runtime-4.10/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF --- eclipse-platform-runtime-4.9/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF 2018-11-14 15:10:45.000000000 +0000 @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-Version: 2.1.200.qualifier +Bundle-Version: 2.1.300.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.annotation, diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.e4.core.services/plugin.xml eclipse-platform-runtime-4.10/bundles/org.eclipse.e4.core.services/plugin.xml --- eclipse-platform-runtime-4.9/bundles/org.eclipse.e4.core.services/plugin.xml 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.e4.core.services/plugin.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ - - - - - diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.e4.core.services/pom.xml eclipse-platform-runtime-4.10/bundles/org.eclipse.e4.core.services/pom.xml --- eclipse-platform-runtime-4.9/bundles/org.eclipse.e4.core.services/pom.xml 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.e4.core.services/pom.xml 2018-11-14 15:10:45.000000000 +0000 @@ -14,11 +14,11 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.9.0-SNAPSHOT + 4.10.0-SNAPSHOT ../../ org.eclipse.e4 org.eclipse.e4.core.services - 2.1.200-SNAPSHOT + 2.1.300-SNAPSHOT eclipse-plugin diff -Nru eclipse-platform-runtime-4.9/bundles/org.eclipse.e4.core.services/schema/org.eclipse.e4.languages.exsd eclipse-platform-runtime-4.10/bundles/org.eclipse.e4.core.services/schema/org.eclipse.e4.languages.exsd --- eclipse-platform-runtime-4.9/bundles/org.eclipse.e4.core.services/schema/org.eclipse.e4.languages.exsd 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/bundles/org.eclipse.e4.core.services/schema/org.eclipse.e4.languages.exsd 1970-01-01 00:00:00.000000000 +0000 @@ -1,109 +0,0 @@ - - - - - - - - - [Enter description of this extension point.] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [Enter the first release in which this extension point appears.] - - - - - - - - - [Enter extension point usage example here.] - - - - - - - - - [Enter API information here.] - - - - - - - - - [Enter information about supplied implementation of this extension point.] - - - - - diff -Nru eclipse-platform-runtime-4.9/CONTRIBUTING eclipse-platform-runtime-4.10/CONTRIBUTING --- eclipse-platform-runtime-4.9/CONTRIBUTING 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-platform-runtime-4.10/CONTRIBUTING 2018-11-14 15:10:45.000000000 +0000 @@ -0,0 +1,71 @@ +# 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 diff -Nru eclipse-platform-runtime-4.9/debian/changelog eclipse-platform-runtime-4.10/debian/changelog --- eclipse-platform-runtime-4.9/debian/changelog 2018-12-03 09:50:34.000000000 +0000 +++ eclipse-platform-runtime-4.10/debian/changelog 2018-12-28 08:34:05.000000000 +0000 @@ -1,3 +1,10 @@ +eclipse-platform-runtime (4.10-1) unstable; urgency=medium + + * New upstream release + * The license changed to EPL-2.0 + + -- Emmanuel Bourg Fri, 28 Dec 2018 09:34:05 +0100 + eclipse-platform-runtime (4.9-1) unstable; urgency=medium * New upstream release diff -Nru eclipse-platform-runtime-4.9/debian/copyright eclipse-platform-runtime-4.10/debian/copyright --- eclipse-platform-runtime-4.9/debian/copyright 2018-12-03 09:44:24.000000000 +0000 +++ eclipse-platform-runtime-4.10/debian/copyright 2018-12-28 08:31:33.000000000 +0000 @@ -17,7 +17,7 @@ 2014-2016, vogella GmbH 2016, Red Hat Inc. 2017, salesforce.com -License: EPL-1.0 +License: EPL-2.0 Files: debian/* Copyright: 2018, Emmanuel Bourg @@ -27,170 +27,216 @@ On Debian systems, the full text of the Apache-2.0 license can be found in the file '/usr/share/common-licenses/Apache-2.0' -License: EPL-1.0 - Eclipse Public License - v 1.0 +License: EPL-2.0 + 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. + 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 code and documentation - distributed under this Agreement, and - b) in the case of each subsequent Contributor: + a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and . - i) changes to the Program, 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. . - 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 - additions to the Program which: (i) are separate modules of software - distributed in conjunction with the Program under their own license - agreement, and (ii) are not derivative works of the Program. - . - "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 + "Program" means the Contributions Distributed in accordance with this Agreement. . - "Recipient" means anyone who receives the Program under this Agreement, - including all Contributors. + "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, in source code and object code form. - . - 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 and - object code 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. + 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 . - A Contributor may choose to distribute the Program in object code form under - its own license agreement, provided that: - . - a) it complies with the terms and conditions of this Agreement; and - . - b) its license agreement: - . - i) effectively disclaims on behalf of all 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; + 3.1 If a Contributor Distributes the Program in any form, then: . - ii) effectively excludes on behalf of all Contributors all liability for - damages, including direct, indirect, special, incidental and consequential - damages, such as lost profits; - . - iii) states that any provisions which differ from this Agreement are offered - by that Contributor alone and not by any other party; and - . - iv) states that source code for the Program is available from such - Contributor, and informs licensees how to obtain it in a reasonable manner on - or through a medium customarily used for software exchange. - . - When the Program is made available in source code form: - . - a) it must be made available under this Agreement; and - . - b) a copy of this Agreement must be included with each copy of the Program. - . - Contributors may not remove or alter any copyright notices contained within - the Program. - . - Each Contributor must identify itself as the originator of its Contribution, - if any, in a manner that reasonably allows subsequent Recipients to identify - the originator of the Contribution. + 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. + 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, 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 + 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 , + 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. + 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, 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 + 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 @@ -199,47 +245,63 @@ 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. - . - This Agreement is governed by the laws of the State of New York and the - intellectual property laws of the United States of America. No party to - this Agreement will bring a legal action under this Agreement more than - one year after the cause of action arose. Each party waives its rights to - a jury trial in any resulting litigation. + 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. diff -Nru eclipse-platform-runtime-4.9/features/org.eclipse.core.runtime.feature/feature.xml eclipse-platform-runtime-4.10/features/org.eclipse.core.runtime.feature/feature.xml --- eclipse-platform-runtime-4.9/features/org.eclipse.core.runtime.feature/feature.xml 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/features/org.eclipse.core.runtime.feature/feature.xml 2018-11-14 15:10:45.000000000 +0000 @@ -2,7 +2,7 @@ diff -Nru eclipse-platform-runtime-4.9/features/org.eclipse.core.runtime.feature/pom.xml eclipse-platform-runtime-4.10/features/org.eclipse.core.runtime.feature/pom.xml --- eclipse-platform-runtime-4.9/features/org.eclipse.core.runtime.feature/pom.xml 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/features/org.eclipse.core.runtime.feature/pom.xml 2018-11-14 15:10:45.000000000 +0000 @@ -14,11 +14,11 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.9.0-SNAPSHOT + 4.10.0-SNAPSHOT ../../ org.eclipse.core.feature org.eclipse.core.runtime.feature - 1.2.200-SNAPSHOT + 1.2.300-SNAPSHOT eclipse-feature diff -Nru eclipse-platform-runtime-4.9/features/org.eclipse.core.tools-feature/pom.xml eclipse-platform-runtime-4.10/features/org.eclipse.core.tools-feature/pom.xml --- eclipse-platform-runtime-4.9/features/org.eclipse.core.tools-feature/pom.xml 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/features/org.eclipse.core.tools-feature/pom.xml 2018-11-14 15:10:45.000000000 +0000 @@ -14,7 +14,7 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.9.0-SNAPSHOT + 4.10.0-SNAPSHOT ../../ org.eclipse.core.feature diff -Nru eclipse-platform-runtime-4.9/LICENSE eclipse-platform-runtime-4.10/LICENSE --- eclipse-platform-runtime-4.9/LICENSE 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-platform-runtime-4.10/LICENSE 2018-11-14 15:10:45.000000000 +0000 @@ -0,0 +1,277 @@ +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 diff -Nru eclipse-platform-runtime-4.9/NOTICE eclipse-platform-runtime-4.10/NOTICE --- eclipse-platform-runtime-4.9/NOTICE 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-platform-runtime-4.10/NOTICE 2018-11-14 15:10:45.000000000 +0000 @@ -0,0 +1,43 @@ +# 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 diff -Nru eclipse-platform-runtime-4.9/pom.xml eclipse-platform-runtime-4.10/pom.xml --- eclipse-platform-runtime-4.9/pom.xml 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/pom.xml 2018-11-14 15:10:45.000000000 +0000 @@ -16,13 +16,13 @@ org.eclipse eclipse-platform-parent - 4.9.0-SNAPSHOT + 4.10.0-SNAPSHOT ../eclipse-platform-parent eclipse.platform.runtime eclipse.platform.runtime - 4.9.0-SNAPSHOT + 4.10.0-SNAPSHOT pom diff -Nru eclipse-platform-runtime-4.9/tests/org.eclipse.core.contenttype.tests/pom.xml eclipse-platform-runtime-4.10/tests/org.eclipse.core.contenttype.tests/pom.xml --- eclipse-platform-runtime-4.9/tests/org.eclipse.core.contenttype.tests/pom.xml 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/tests/org.eclipse.core.contenttype.tests/pom.xml 2018-11-14 15:10:45.000000000 +0000 @@ -15,7 +15,7 @@ eclipse.platform.runtime.tests eclipse.platform.runtime - 4.9.0-SNAPSHOT + 4.10.0-SNAPSHOT org.eclipse.core org.eclipse.core.contenttype.tests diff -Nru eclipse-platform-runtime-4.9/tests/org.eclipse.core.expressions.tests/META-INF/MANIFEST.MF eclipse-platform-runtime-4.10/tests/org.eclipse.core.expressions.tests/META-INF/MANIFEST.MF --- eclipse-platform-runtime-4.9/tests/org.eclipse.core.expressions.tests/META-INF/MANIFEST.MF 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/tests/org.eclipse.core.expressions.tests/META-INF/MANIFEST.MF 2018-11-14 15:10:45.000000000 +0000 @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.core.expressions.tests; singleton:=true -Bundle-Version: 3.5.200.qualifier +Bundle-Version: 3.5.300.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: diff -Nru eclipse-platform-runtime-4.9/tests/org.eclipse.core.expressions.tests/pom.xml eclipse-platform-runtime-4.10/tests/org.eclipse.core.expressions.tests/pom.xml --- eclipse-platform-runtime-4.9/tests/org.eclipse.core.expressions.tests/pom.xml 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/tests/org.eclipse.core.expressions.tests/pom.xml 2018-11-14 15:10:45.000000000 +0000 @@ -15,11 +15,11 @@ eclipse.platform.runtime.tests eclipse.platform.runtime - 4.9.0-SNAPSHOT + 4.10.0-SNAPSHOT org.eclipse.core org.eclipse.core.expressions.tests - 3.5.200-SNAPSHOT + 3.5.300-SNAPSHOT eclipse-test-plugin diff -Nru eclipse-platform-runtime-4.9/tests/org.eclipse.core.tests.harness/META-INF/MANIFEST.MF eclipse-platform-runtime-4.10/tests/org.eclipse.core.tests.harness/META-INF/MANIFEST.MF --- eclipse-platform-runtime-4.9/tests/org.eclipse.core.tests.harness/META-INF/MANIFEST.MF 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/tests/org.eclipse.core.tests.harness/META-INF/MANIFEST.MF 2018-11-14 15:10:45.000000000 +0000 @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Eclipse Core Tests Harness Bundle-SymbolicName: org.eclipse.core.tests.harness;singleton:=true -Bundle-Version: 3.11.300.qualifier +Bundle-Version: 3.11.400.qualifier Bundle-Vendor: Eclipse.org Export-Package: org.eclipse.core.tests.harness, org.eclipse.core.tests.session, diff -Nru eclipse-platform-runtime-4.9/tests/org.eclipse.core.tests.harness/pom.xml eclipse-platform-runtime-4.10/tests/org.eclipse.core.tests.harness/pom.xml --- eclipse-platform-runtime-4.9/tests/org.eclipse.core.tests.harness/pom.xml 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/tests/org.eclipse.core.tests.harness/pom.xml 2018-11-14 15:10:45.000000000 +0000 @@ -15,10 +15,10 @@ eclipse.platform.runtime.tests eclipse.platform.runtime - 4.9.0-SNAPSHOT + 4.10.0-SNAPSHOT org.eclipse.core org.eclipse.core.tests.harness - 3.11.300-SNAPSHOT + 3.11.400-SNAPSHOT eclipse-plugin diff -Nru eclipse-platform-runtime-4.9/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/EclipseTestHarnessApplication.java eclipse-platform-runtime-4.10/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/EclipseTestHarnessApplication.java --- eclipse-platform-runtime-4.9/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/EclipseTestHarnessApplication.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/EclipseTestHarnessApplication.java 2018-11-14 15:10:45.000000000 +0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2015 IBM Corporation and others. + * Copyright (c) 2000, 2018 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -137,10 +137,10 @@ return null; } Class testClass = testObject.getClass(); - Method method = testClass.getDeclaredMethod("suite", new Class[0]); //$NON-NLS-1$ + Method method = testClass.getDeclaredMethod("suite"); //$NON-NLS-1$ Test suite = null; try { - suite = (Test) method.invoke(testClass, new Object[0]); + suite = (Test) method.invoke(testClass); } catch (InvocationTargetException e) { if (e.getTargetException() instanceof Error) { throw (Error) e.getTargetException(); diff -Nru eclipse-platform-runtime-4.9/tests/org.eclipse.core.tests.runtime/META-INF/MANIFEST.MF eclipse-platform-runtime-4.10/tests/org.eclipse.core.tests.runtime/META-INF/MANIFEST.MF --- eclipse-platform-runtime-4.9/tests/org.eclipse.core.tests.runtime/META-INF/MANIFEST.MF 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/tests/org.eclipse.core.tests.runtime/META-INF/MANIFEST.MF 2018-11-14 15:10:45.000000000 +0000 @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Eclipse Core Tests Runtime Bundle-SymbolicName: org.eclipse.core.tests.runtime; singleton:=true -Bundle-Version: 3.11.400.qualifier +Bundle-Version: 3.11.500.qualifier Bundle-Activator: org.eclipse.core.tests.runtime.RuntimeTestsPlugin Bundle-Vendor: Eclipse.org Export-Package: org.eclipse.core.tests.internal.preferences, diff -Nru eclipse-platform-runtime-4.9/tests/org.eclipse.core.tests.runtime/pom.xml eclipse-platform-runtime-4.10/tests/org.eclipse.core.tests.runtime/pom.xml --- eclipse-platform-runtime-4.9/tests/org.eclipse.core.tests.runtime/pom.xml 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/tests/org.eclipse.core.tests.runtime/pom.xml 2018-11-14 15:10:45.000000000 +0000 @@ -16,11 +16,11 @@ eclipse.platform.runtime.tests eclipse.platform.runtime - 4.9.0-SNAPSHOT + 4.10.0-SNAPSHOT org.eclipse.core org.eclipse.core.tests.runtime - 3.11.400-SNAPSHOT + 3.11.500-SNAPSHOT eclipse-test-plugin true diff -Nru eclipse-platform-runtime-4.9/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubProgressSubclass.java eclipse-platform-runtime-4.10/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubProgressSubclass.java --- eclipse-platform-runtime-4.9/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubProgressSubclass.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubProgressSubclass.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2015 IBM Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.core.tests.runtime; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.SubProgressMonitor; - -/** - * @deprecated to suppress deprecation warnings - */ -public class SubProgressSubclass extends SubProgressMonitor { - - public int internalWorkedCalls = 0; - - public SubProgressSubclass(IProgressMonitor monitor, int ticks, int style) { - super(monitor, ticks, style); - } - - public SubProgressSubclass(IProgressMonitor monitor, int ticks) { - super(monitor, ticks); - } - - @Override - public void internalWorked(double work) { - internalWorkedCalls++; - super.internalWorked(work); - } - -} diff -Nru eclipse-platform-runtime-4.9/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubProgressTest.java eclipse-platform-runtime-4.10/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubProgressTest.java --- eclipse-platform-runtime-4.9/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubProgressTest.java 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubProgressTest.java 2018-11-14 15:10:45.000000000 +0000 @@ -76,40 +76,24 @@ * @param monitor * @param depth */ + @Deprecated public static void callDoneOnChain(IProgressMonitor monitor, int depth) { IProgressMonitor current = monitor; for (int count = 0; count < depth; count++) { current.done(); - if (!(current instanceof SubProgressMonitor)) + if (!(current instanceof SubProgressMonitor)) { return; + } SubProgressMonitor cur = (SubProgressMonitor) current; current = cur.getWrappedProgressMonitor(); } } /** - * Test behaviors that subclasses of SubProgressMonitor will expect from their base class. - * @deprecated to suppress deprecation warnings - */ - public void testCustomSubclass() { - TestProgressMonitor top = new TestProgressMonitor(); - top.beginTask("", 1000); - - SubProgressSubclass customSubclass = new SubProgressSubclass(top, 1000); - customSubclass.beginTask("", 10000); - - for (int count = 0; count < 10000; count++) - customSubclass.worked(1); - - Assert.assertEquals("If there is a custom subclass of SubProgressMonitor, all calls to worked() should delegate to internalWorked", 10000, customSubclass.internalWorkedCalls); - customSubclass.done(); - top.done(); - } - - /** * Tests the style bits in SubProgressMonitor * @deprecated to suppress deprecation warnings */ + @Deprecated public void testStyles() { int[] styles = new int[] {0, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK, SubProgressMonitor.SUPPRESS_SUBTASK_LABEL, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK | SubProgressMonitor.SUPPRESS_SUBTASK_LABEL}; @@ -159,8 +143,9 @@ for (Map.Entry entry : results.entrySet()) { String[] expectedResult = expected.get(entry.getKey()); String[] value = entry.getValue(); - if (compareArray(value, expectedResult)) + if (compareArray(value, expectedResult)) { continue; + } System.out.print("expected.put(\"" + entry.getKey() + "\", new String[] {"); failure = entry.getKey(); @@ -168,17 +153,20 @@ System.out.println(list + "});"); } - if (failure != null) // Now actually throw an assertation if one of the results failed + if (failure != null) { Assert.assertEquals(failure, concatArray(expected.get(failure)), concatArray(results.get(failure))); + } } private boolean compareArray(String[] value, String[] expectedResult) { - if (value.length != expectedResult.length) + if (value.length != expectedResult.length) { return false; + } for (int i = 0; i < expectedResult.length; i++) { String next = expectedResult[i]; - if (!next.equals(value[i])) + if (!next.equals(value[i])) { return false; + } } return true; } @@ -187,8 +175,9 @@ StringBuilder buf = new StringBuilder(); boolean isFirst = true; for (String nextValue : value) { - if (!isFirst) + if (!isFirst) { buf.append(", "); + } isFirst = false; buf.append("\"" + nextValue + "\""); } @@ -212,6 +201,7 @@ * parents in floating point mode) * @deprecated to suppress deprecation warnings */ + @Deprecated public void testConstructorNestingFP() { TestProgressMonitor top = new TestProgressMonitor(); top.beginTask("", 2000); @@ -260,6 +250,7 @@ * in int mode. * @deprecated to suppress deprecation warnings */ + @Deprecated public void testConstructorNestingInt() { TestProgressMonitor top = new TestProgressMonitor(); top.beginTask("", 2000); @@ -306,6 +297,7 @@ * Tests the automatic cleanup when progress monitors are created via their constructor * @deprecated to suppress deprecation warnings */ + @Deprecated public void testParallelChildren() { TestProgressMonitor top = new TestProgressMonitor(); top.beginTask("", 1000); @@ -343,6 +335,7 @@ /** * @deprecated to suppress deprecation warnings */ + @Deprecated public void testCancellation() { TestProgressMonitor root = new TestProgressMonitor(); root.beginTask("", 1000); @@ -405,6 +398,7 @@ * @param depth * @return the innermost SubProgressMonitor */ + @Deprecated private static SubProgressMonitor createSubProgressChain(IProgressMonitor parent, int depth) { SubProgressMonitor current; do { @@ -425,8 +419,9 @@ */ private static void reportWorkInLoop(IProgressMonitor monitor, int loopSize) { monitor.beginTask("", loopSize); - for (int i = 0; i < loopSize; i++) + for (int i = 0; i < loopSize; i++) { monitor.worked(1); + } } /** @@ -438,8 +433,9 @@ */ private static void reportFloatingPointWorkInLoop(IProgressMonitor monitor, int loopSize) { monitor.beginTask("", loopSize); - for (int i = 0; i < loopSize; i++) + for (int i = 0; i < loopSize; i++) { monitor.internalWorked(1.0d); + } } /** @@ -453,6 +449,7 @@ * @param monitor progress monitor (callers are responsible for calling done() if necessary) * @param loopSize total size of the recursion tree */ + @Deprecated public static void reportWorkInBalancedTree(IProgressMonitor monitor, int loopSize) { monitor.beginTask("", 100); int leftBranch = loopSize / 2; @@ -489,6 +486,7 @@ * @param monitor progress monitor (callers are responsible for calling done() if necessary) * @param loopSize total size of the recursion tree */ + @Deprecated public static void createBalancedTree(IProgressMonitor monitor, int loopSize) { monitor.beginTask("", 100); int leftBranch = loopSize / 2; @@ -513,6 +511,7 @@ * * @deprecated to suppress deprecation warnings */ + @Deprecated public static void runTestWorked(IProgressMonitor monitor) { SubProgressMonitor nestedMonitor = createSubProgressChain(monitor, SubProgressTest.CHAIN_DEPTH); reportWorkInLoop(nestedMonitor, SubProgressTest.PROGRESS_SIZE); @@ -525,6 +524,7 @@ * * @deprecated to suppress deprecation warnings */ + @Deprecated public static void runTestInternalWorked(IProgressMonitor monitor) { SubProgressMonitor nestedMonitor = createSubProgressChain(monitor, SubProgressTest.CHAIN_DEPTH); reportFloatingPointWorkInLoop(nestedMonitor, SubProgressTest.PROGRESS_SIZE); @@ -537,6 +537,7 @@ * * @deprecated to suppress deprecation warnings */ + @Deprecated public static void runTestTypicalUsage(IProgressMonitor monitor) { SubProgressMonitor nestedMonitor = createSubProgressChain(monitor, SubProgressTest.CHAIN_DEPTH); reportWorkInBalancedTree(nestedMonitor, SubProgressTest.PROGRESS_SIZE); @@ -554,6 +555,7 @@ * * @deprecated to suppress deprecation warnings */ + @Deprecated public static void runTestCreateTree(IProgressMonitor monitor) { SubProgressMonitor nestedMonitor = createSubProgressChain(monitor, SubProgressTest.CHAIN_DEPTH); createBalancedTree(nestedMonitor, SubProgressTest.PROGRESS_SIZE); @@ -569,6 +571,7 @@ * * @deprecated to suppress deprecation warnings */ + @Deprecated private static void createChildrenUnderParent(IProgressMonitor monitor, int progressSize) { monitor.beginTask("", progressSize); diff -Nru eclipse-platform-runtime-4.9/tests/org.eclipse.e4.core.tests/pom.xml eclipse-platform-runtime-4.10/tests/org.eclipse.e4.core.tests/pom.xml --- eclipse-platform-runtime-4.9/tests/org.eclipse.e4.core.tests/pom.xml 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/tests/org.eclipse.e4.core.tests/pom.xml 2018-11-14 15:10:45.000000000 +0000 @@ -15,7 +15,7 @@ eclipse.platform.runtime.tests eclipse.platform.runtime - 4.9.0-SNAPSHOT + 4.10.0-SNAPSHOT org.eclipse.e4 org.eclipse.e4.core.tests diff -Nru eclipse-platform-runtime-4.9/tests/pom.xml eclipse-platform-runtime-4.10/tests/pom.xml --- eclipse-platform-runtime-4.9/tests/pom.xml 2018-09-06 10:51:21.000000000 +0000 +++ eclipse-platform-runtime-4.10/tests/pom.xml 2018-11-14 15:10:45.000000000 +0000 @@ -15,10 +15,10 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.9.0-SNAPSHOT + 4.10.0-SNAPSHOT eclipse.platform.runtime.tests - 4.9.0-SNAPSHOT + 4.10.0-SNAPSHOT pom ${tests.ignoredWarnings}