diff options
author | Thomas Watson | 2020-03-10 15:41:00 +0000 |
---|---|---|
committer | Thomas Watson | 2020-03-10 15:41:00 +0000 |
commit | bf506346ff2c91a60986226f0f26f5c2e7866548 (patch) | |
tree | 57f704deb1b17d891aad0da0c1c5d4bdf5098dad | |
parent | c7ec01ea86f16e1890a162c699ae5f11f3542e34 (diff) | |
parent | dabb1b38eaf020bb0f97ea331a3f6c5e5aefe565 (diff) | |
download | rt.equinox.framework-bf506346ff2c91a60986226f0f26f5c2e7866548.tar.gz rt.equinox.framework-bf506346ff2c91a60986226f0f26f5c2e7866548.tar.xz rt.equinox.framework-bf506346ff2c91a60986226f0f26f5c2e7866548.zip |
Merge branch 'master' into osgiR8
20 files changed, 74 insertions, 78 deletions
diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml index 044232318..2feaa9c11 100644 --- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml +++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>launcher-binary-parent</artifactId> <groupId>org.eclipse.equinox.framework</groupId> - <version>4.15.0-SNAPSHOT</version> + <version>4.16.0-SNAPSHOT</version> <relativePath>../../launcher-binary-parent</relativePath> </parent> <groupId>org.eclipse.equinox</groupId> diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/pom.xml index 0f969d483..e89ac9e80 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/pom.xml +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>launcher-binary-parent</artifactId> <groupId>org.eclipse.equinox.framework</groupId> - <version>4.15.0-SNAPSHOT</version> + <version>4.16.0-SNAPSHOT</version> <relativePath>../../launcher-binary-parent</relativePath> </parent> <groupId>org.eclipse.equinox</groupId> diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml index db68f7a1e..f2955a641 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>launcher-binary-parent</artifactId> <groupId>org.eclipse.equinox.framework</groupId> - <version>4.15.0-SNAPSHOT</version> + <version>4.16.0-SNAPSHOT</version> <relativePath>../../launcher-binary-parent</relativePath> </parent> <groupId>org.eclipse.equinox</groupId> diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml index 703f65d22..cf0ac172a 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>launcher-binary-parent</artifactId> <groupId>org.eclipse.equinox.framework</groupId> - <version>4.15.0-SNAPSHOT</version> + <version>4.16.0-SNAPSHOT</version> <relativePath>../../launcher-binary-parent</relativePath> </parent> <groupId>org.eclipse.equinox</groupId> diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml index e3f6cad60..c13943f56 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>launcher-binary-parent</artifactId> <groupId>org.eclipse.equinox.framework</groupId> - <version>4.15.0-SNAPSHOT</version> + <version>4.16.0-SNAPSHOT</version> <relativePath>../../launcher-binary-parent</relativePath> </parent> <groupId>org.eclipse.equinox</groupId> diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml index 712824db4..cda97f3aa 100644 --- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml +++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>launcher-binary-parent</artifactId> <groupId>org.eclipse.equinox.framework</groupId> - <version>4.15.0-SNAPSHOT</version> + <version>4.16.0-SNAPSHOT</version> <relativePath>../../launcher-binary-parent</relativePath> </parent> <groupId>org.eclipse.equinox</groupId> diff --git a/bundles/org.eclipse.equinox.launcher/pom.xml b/bundles/org.eclipse.equinox.launcher/pom.xml index 549a87f53..84535ec30 100644 --- a/bundles/org.eclipse.equinox.launcher/pom.xml +++ b/bundles/org.eclipse.equinox.launcher/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>rt.equinox.framework</artifactId> <groupId>org.eclipse.equinox.framework</groupId> - <version>4.15.0-SNAPSHOT</version> + <version>4.16.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.equinox</groupId> diff --git a/bundles/org.eclipse.osgi.compatibility.state/pom.xml b/bundles/org.eclipse.osgi.compatibility.state/pom.xml index 6c960e3a6..6ea46d1b3 100644 --- a/bundles/org.eclipse.osgi.compatibility.state/pom.xml +++ b/bundles/org.eclipse.osgi.compatibility.state/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>rt.equinox.framework</artifactId> <groupId>org.eclipse.equinox.framework</groupId> - <version>4.15.0-SNAPSHOT</version> + <version>4.16.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.osgi</groupId> diff --git a/bundles/org.eclipse.osgi.services/pom.xml b/bundles/org.eclipse.osgi.services/pom.xml index 7124a703a..62e8280c3 100644 --- a/bundles/org.eclipse.osgi.services/pom.xml +++ b/bundles/org.eclipse.osgi.services/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>rt.equinox.framework</artifactId> <groupId>org.eclipse.equinox.framework</groupId> - <version>4.15.0-SNAPSHOT</version> + <version>4.16.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.osgi</groupId> diff --git a/bundles/org.eclipse.osgi.tests/pom.xml b/bundles/org.eclipse.osgi.tests/pom.xml index c9afff211..fcc58f3e4 100644 --- a/bundles/org.eclipse.osgi.tests/pom.xml +++ b/bundles/org.eclipse.osgi.tests/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>rt.equinox.framework</artifactId> <groupId>org.eclipse.equinox.framework</groupId> - <version>4.15.0-SNAPSHOT</version> + <version>4.16.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.osgi</groupId> diff --git a/bundles/org.eclipse.osgi.util/pom.xml b/bundles/org.eclipse.osgi.util/pom.xml index cb4892be1..d2e126ba1 100644 --- a/bundles/org.eclipse.osgi.util/pom.xml +++ b/bundles/org.eclipse.osgi.util/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>rt.equinox.framework</artifactId> <groupId>org.eclipse.equinox.framework</groupId> - <version>4.15.0-SNAPSHOT</version> + <version>4.16.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.osgi</groupId> diff --git a/bundles/org.eclipse.osgi/pom.xml b/bundles/org.eclipse.osgi/pom.xml index 8a9d25307..b75f512e2 100644 --- a/bundles/org.eclipse.osgi/pom.xml +++ b/bundles/org.eclipse.osgi/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>rt.equinox.framework</artifactId> <groupId>org.eclipse.equinox.framework</groupId> - <version>4.15.0-SNAPSHOT</version> + <version>4.16.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.osgi</groupId> diff --git a/bundles/org.eclipse.osgi/supplement/pom.xml b/bundles/org.eclipse.osgi/supplement/pom.xml index 08414e5ec..b6588fe49 100644 --- a/bundles/org.eclipse.osgi/supplement/pom.xml +++ b/bundles/org.eclipse.osgi/supplement/pom.xml @@ -15,7 +15,7 @@ <parent> <artifactId>rt.equinox.framework</artifactId> <groupId>org.eclipse.equinox.framework</groupId> - <version>4.15.0-SNAPSHOT</version> + <version>4.16.0-SNAPSHOT</version> <relativePath>../../../</relativePath> </parent> diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/CopyOnWriteIdentityMap.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/CopyOnWriteIdentityMap.java index 321aaaca8..4dfa81b22 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/CopyOnWriteIdentityMap.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/CopyOnWriteIdentityMap.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2016 IBM Corporation and others. + * Copyright (c) 2003, 2020 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -14,7 +14,16 @@ package org.eclipse.osgi.framework.eventmgr; -import java.util.*; +import static java.util.Objects.requireNonNull; + +import java.util.AbstractCollection; +import java.util.AbstractSet; +import java.util.Collection; +import java.util.ConcurrentModificationException; +import java.util.Iterator; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; /** * A copy-on-write identity map. Write operations result in copying the underlying data so that @@ -61,22 +70,20 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { /* These methods modify the map and are synchronized. */ /** - * Add a key, value pair to the map. - * If the key object is already in the map, then its value is replaced with the new value. - * Keys are compared using identity. + * Add a key, value pair to the map. If the key object is already in the map, + * then its value is replaced with the new value. Keys are compared using + * identity. * - * @param key The key object to be added to the list. - * @param value The value object to be associated with the key. - * This may be null. + * @param key The key object to be added to the list. + * @param value The value object to be associated with the key. This may be + * null. * @return <code>null</code> if the specified key was newly added to the map. - * Otherwise the previous value of the key. - * @throws IllegalArgumentException If key is null. + * Otherwise the previous value of the key. + * @throws NullPointerException If key is null. */ @Override public synchronized V put(K key, V value) { - if (key == null) { - throw new IllegalArgumentException(); - } + requireNonNull(key); int size = entries.length; for (int i = 0; i < size; i++) { @@ -183,19 +190,17 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { } /** - * Remove a key from the map and returns the value associated with the key. - * Key objects are compared using identity. + * Remove a key from the map and returns the value associated with the key. Key + * objects are compared using identity. * * @param key The key object to be removed from the map. - * @return <code>null</code> if the key was not in the list. - * Otherwise, the value associated with the key. - * @throws IllegalArgumentException If key is null. + * @return <code>null</code> if the key was not in the list. Otherwise, the + * value associated with the key. + * @throws NullPointerException If key is null. */ @Override public synchronized V remove(Object key) { - if (key == null) { - throw new IllegalArgumentException(); - } + requireNonNull(key); int size = entries.length; for (int i = 0; i < size; i++) { @@ -278,18 +283,16 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { } /** - * Return the value object for the specified key. - * Keys are compared using identity. + * Return the value object for the specified key. Keys are compared using + * identity. * * @param key The key object. * @return The value object for the specified key. - * @throws IllegalArgumentException If key is null. + * @throws NullPointerException If key is null. */ @Override public V get(Object key) { - if (key == null) { - throw new IllegalArgumentException(); - } + requireNonNull(key); for (Entry<K, V> entry : entries()) { if (entry.key == key) { @@ -300,18 +303,16 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { } /** - * Check if the map contains the specified key. - * Keys are compared using identity. + * Check if the map contains the specified key. Keys are compared using + * identity. * * @param key The key object. * @return <code>true</code> if the specified key is in the map. - * @throws IllegalArgumentException If key is null. + * @throws NullPointerException If key is null. */ @Override public boolean containsKey(Object key) { - if (key == null) { - throw new IllegalArgumentException(); - } + requireNonNull(key); for (Entry<K, V> entry : entries()) { if (entry.key == key) { @@ -389,11 +390,13 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { /** * Constructor for map entry. - * @param key Key object in entry. Used for uniqueness. + * + * @param key Key object in entry. Used for uniqueness. * @param value Value object stored with key object. + * @throws NullPointerException If key is null. */ Entry(final K key, final V value) { - this.key = key; + this.key = requireNonNull(key); this.value = value; } @@ -494,9 +497,7 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { @Override public boolean remove(Object o) { - if (o == null) { - throw new IllegalArgumentException(); - } + requireNonNull(o); synchronized (Snapshot.this) { int size = entries.length; @@ -550,9 +551,7 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { @Override public boolean remove(Object o) { - if (o == null) { - throw new IllegalArgumentException(); - } + requireNonNull(o); synchronized (Snapshot.this) { int size = entries.length; @@ -606,9 +605,7 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { @Override public boolean remove(Object o) { - if (o == null) { - throw new IllegalArgumentException(); - } + requireNonNull(o); synchronized (Snapshot.this) { int size = entries.length; diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventListeners.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventListeners.java index 9779cd95b..65d4794e6 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventListeners.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventListeners.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2017 IBM Corporation and others. + * Copyright (c) 2003, 2020 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -49,26 +49,25 @@ public class EventListeners<K, V> { } /** - * Add a listener to the list. - * If a listener object is already in the list, then it is replaced. - * This method calls the put method. + * Add a listener to the list. If a listener object is already in the list, then + * it is replaced. This method calls the put method. * - * @param listener This is the listener object to be added to the list. - * @param listenerObject This is an optional listener-specific object. - * This object will be passed to the EventDispatcher along with the listener - * when the listener is to be called. This may be null - * @throws IllegalArgumentException If listener is null. + * @param listener This is the listener object to be added to the list. + * @param listenerObject This is an optional listener-specific object. This + * object will be passed to the EventDispatcher along with + * the listener when the listener is to be called. This + * may be null + * @throws NullPointerException If listener is null. */ public void addListener(K listener, V listenerObject) { list.put(listener, listenerObject); } /** - * Remove a listener from the list. - * This method calls the remove method. + * Remove a listener from the list. This method calls the remove method. * * @param listener This is the listener object to be removed from the list. - * @throws IllegalArgumentException If listener is null. + * @throws NullPointerException If listener is null. */ public void removeListener(K listener) { list.remove(listener); diff --git a/features/org.eclipse.equinox.executable.feature/bin/cocoa/macosx/x86_64/Eclipse.app/Contents/Info.plist b/features/org.eclipse.equinox.executable.feature/bin/cocoa/macosx/x86_64/Eclipse.app/Contents/Info.plist index 9f62ca75e..92f7a2d63 100644 --- a/features/org.eclipse.equinox.executable.feature/bin/cocoa/macosx/x86_64/Eclipse.app/Contents/Info.plist +++ b/features/org.eclipse.equinox.executable.feature/bin/cocoa/macosx/x86_64/Eclipse.app/Contents/Info.plist @@ -6,7 +6,7 @@ <key>CFBundleExecutable</key> <string>eclipse</string> <key>CFBundleGetInfoString</key> - <string>Eclipse 4.15 for Mac OS X, Copyright IBM Corp. and others 2002, 2019. All rights reserved.</string> + <string>Eclipse 4.16 for Mac OS X, Copyright IBM Corp. and others 2002, 2020. All rights reserved.</string> <key>CFBundleIconFile</key> <string>Eclipse.icns</string> <key>CFBundleIdentifier</key> @@ -18,11 +18,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>4.15</string> + <string>4.16</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>4.15</string> + <string>4.16</string> <key>NSHighResolutionCapable</key> <true/> <key>CFBundleDevelopmentRegion</key> diff --git a/features/org.eclipse.equinox.executable.feature/feature.xml b/features/org.eclipse.equinox.executable.feature/feature.xml index 713154fa0..aaa8a63f7 100755 --- a/features/org.eclipse.equinox.executable.feature/feature.xml +++ b/features/org.eclipse.equinox.executable.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.equinox.executable" label="%featureName" - version="3.8.700.qualifier" + version="3.8.800.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="0.0.0"> diff --git a/features/org.eclipse.equinox.executable.feature/pom.xml b/features/org.eclipse.equinox.executable.feature/pom.xml index cbf4df897..569b29f19 100644 --- a/features/org.eclipse.equinox.executable.feature/pom.xml +++ b/features/org.eclipse.equinox.executable.feature/pom.xml @@ -14,12 +14,12 @@ <parent> <artifactId>rt.equinox.framework</artifactId> <groupId>org.eclipse.equinox.framework</groupId> - <version>4.15.0-SNAPSHOT</version> + <version>4.16.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.equinox.feature</groupId> <artifactId>org.eclipse.equinox.executable</artifactId> - <version>3.8.700-SNAPSHOT</version> + <version>3.8.800-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build> diff --git a/launcher-binary-parent/pom.xml b/launcher-binary-parent/pom.xml index 96bd7997b..f478b48c5 100644 --- a/launcher-binary-parent/pom.xml +++ b/launcher-binary-parent/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.eclipse.equinox.framework</groupId> <artifactId>rt.equinox.framework</artifactId> - <version>4.15.0-SNAPSHOT</version> + <version>4.16.0-SNAPSHOT</version> </parent> <artifactId>launcher-binary-parent</artifactId> @@ -15,13 +15,13 @@ <parent> <groupId>org.eclipse</groupId> <artifactId>eclipse-platform-parent</artifactId> - <version>4.15.0-SNAPSHOT</version> + <version>4.16.0-SNAPSHOT</version> <relativePath>../eclipse-platform-parent</relativePath> </parent> <groupId>org.eclipse.equinox.framework</groupId> <artifactId>rt.equinox.framework</artifactId> - <version>4.15.0-SNAPSHOT</version> + <version>4.16.0-SNAPSHOT</version> <packaging>pom</packaging> <properties> |