diff options
Diffstat (limited to 'bundles/org.eclipse.osgi/supplement')
16 files changed, 80 insertions, 0 deletions
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogEntry.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogEntry.java index f38347680..b87daeb1f 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogEntry.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogEntry.java @@ -31,6 +31,7 @@ public interface ExtendedLogEntry extends LogEntry { * <code>LogEntry</code> object;<code>null</code> if no logger name is * associated with this <code>LogEntry</code> object. */ + @Override String getLoggerName(); /** diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogService.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogService.java index 05e707747..698088f9c 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogService.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogService.java @@ -30,6 +30,7 @@ public interface ExtendedLogService extends LogService, Logger { * @param loggerName The logger name. * @return <code>Logger</code> associated with the logger name. */ + @Override public Logger getLogger(String loggerName); /** diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/LogPermission.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/LogPermission.java index 05cba89c2..70ce208ef 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/LogPermission.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/LogPermission.java @@ -46,22 +46,27 @@ public class LogPermission extends Permission { throw new IllegalArgumentException("actions must be * or log"); //$NON-NLS-1$ } + @Override public boolean equals(Object obj) { return obj instanceof LogPermission; } + @Override public String getActions() { return LOG; } + @Override public int hashCode() { return LogPermission.class.hashCode(); } + @Override public boolean implies(Permission permission) { return permission instanceof LogPermission; } + @Override public PermissionCollection newPermissionCollection() { return new LogPermissionCollection(); } diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/LogPermissionCollection.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/LogPermissionCollection.java index 04cb91038..f9e2fb0fe 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/LogPermissionCollection.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/LogPermissionCollection.java @@ -28,6 +28,7 @@ public final class LogPermissionCollection extends PermissionCollection { private static final long serialVersionUID = -1955409691185916778L; LogPermission logPermission; + @Override public void add(Permission permission) { if (!(permission instanceof LogPermission)) throw new IllegalArgumentException("invalid permission: " + permission); //$NON-NLS-1$ @@ -37,14 +38,17 @@ public final class LogPermissionCollection extends PermissionCollection { logPermission = (LogPermission) permission; } + @Override public Enumeration<Permission> elements() { return new Enumeration<Permission>() { private boolean hasMore = (logPermission != null); + @Override public boolean hasMoreElements() { return hasMore; } + @Override public Permission nextElement() { if (hasMore) { hasMore = false; @@ -55,6 +59,7 @@ public final class LogPermissionCollection extends PermissionCollection { }; } + @Override public boolean implies(Permission permission) { return logPermission != null && logPermission.implies(permission); } diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/Logger.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/Logger.java index 3f0242b8c..e03633f68 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/Logger.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/Logger.java @@ -83,5 +83,6 @@ public interface Logger extends org.osgi.service.log.Logger { * <code>Logger</code> object;<code>null</code> if no name is * associated. */ + @Override public String getName(); } diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/console/ConsoleSession.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/console/ConsoleSession.java index cacac7761..cdfedce04 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/console/ConsoleSession.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/console/ConsoleSession.java @@ -82,6 +82,7 @@ public abstract class ConsoleSession implements ServiceFactory<Object> { /** * @noreference This method is not intended to be referenced by clients. */ + @Override public final Object getService(Bundle bundle, ServiceRegistration<Object> registration) { if (sessionRegistration == null) sessionRegistration = registration; @@ -91,6 +92,7 @@ public abstract class ConsoleSession implements ServiceFactory<Object> { /** * @noreference This method is not intended to be referenced by clients. */ + @Override public final void ungetService(Bundle bundle, ServiceRegistration<Object> registration, Object service) { // do nothing } 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 49296fb12..f58ab624e 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 @@ -72,6 +72,7 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { * Otherwise the previous value of the key. * @throws IllegalArgumentException If key is null. */ + @Override public synchronized V put(K key, V value) { if (key == null) { throw new IllegalArgumentException(); @@ -108,6 +109,7 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { * * @param source The map whose entries are to be added to this map. */ + @Override public void putAll(Map<? extends K, ? extends V> source) { int sourceSize = source.size(); if (sourceSize == 0) { @@ -189,6 +191,7 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { * Otherwise, the value associated with the key. * @throws IllegalArgumentException If key is null. */ + @Override public synchronized V remove(Object key) { if (key == null) { throw new IllegalArgumentException(); @@ -229,6 +232,7 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { * Remove all entries from the map. * */ + @Override public synchronized void clear() { entries = empty(); } @@ -258,6 +262,7 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { * * @return <code>true</code> if the list is empty. */ + @Override public boolean isEmpty() { return size() == 0; } @@ -267,6 +272,7 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { * * @return The number of entries in the map. */ + @Override public int size() { return entries().length; } @@ -279,6 +285,7 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { * @return The value object for the specified key. * @throws IllegalArgumentException If key is null. */ + @Override public V get(Object key) { if (key == null) { throw new IllegalArgumentException(); @@ -301,6 +308,7 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { * @return <code>true</code> if the specified key is in the map. * @throws IllegalArgumentException If key is null. */ + @Override public boolean containsKey(Object key) { if (key == null) { throw new IllegalArgumentException(); @@ -322,6 +330,7 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { * @param value The value object. * @return <code>true</code> if the specified value is in the map. */ + @Override public boolean containsValue(Object value) { Entry<K, V>[] e = entries(); for (int i = 0; i < e.length; i++) { @@ -339,6 +348,7 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { * @return A Set of Map.Entry for each entry in this map. * The entries returned by the set cannot be modified. */ + @Override public Set<Map.Entry<K, V>> entrySet() { return new Snapshot<>(entries()).entrySet(); } @@ -349,6 +359,7 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { * * @return A Set of the key objects in this map */ + @Override public Set<K> keySet() { return new Snapshot<>(entries()).keySet(); } @@ -359,6 +370,7 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { * * @return A Collection of the value objects in this map. */ + @Override public Collection<V> values() { return new Snapshot<>(entries()).values(); } @@ -388,26 +400,32 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { this.value = value; } + @Override public K getKey() { return key; } + @Override public V getValue() { return value; } + @Override public V setValue(V value) { throw new UnsupportedOperationException(); // entries cannot be modified. } + @Override public String toString() { return key + "=" + value; //$NON-NLS-1$ } + @Override public int hashCode() { return System.identityHashCode(key) ^ System.identityHashCode(value); } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -467,14 +485,17 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { super(); } + @Override public Iterator<Map.Entry<K, V>> iterator() { return new EntryIterator(); } + @Override public int size() { return entries().length; } + @Override public boolean remove(Object o) { if (o == null) { throw new IllegalArgumentException(); @@ -492,6 +513,7 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { return false; } + @Override public void clear() { clearEntries(); } @@ -505,6 +527,7 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { super(); } + @Override public Map.Entry<K, V> next() { return nextEntry(); } @@ -518,14 +541,17 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { super(); } + @Override public Iterator<K> iterator() { return new KeyIterator(); } + @Override public int size() { return entries().length; } + @Override public boolean remove(Object o) { if (o == null) { throw new IllegalArgumentException(); @@ -543,6 +569,7 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { return false; } + @Override public void clear() { clearEntries(); } @@ -556,6 +583,7 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { super(); } + @Override public K next() { return nextEntry().key; } @@ -569,14 +597,17 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { super(); } + @Override public Iterator<V> iterator() { return new ValueIterator(); } + @Override public int size() { return entries().length; } + @Override public boolean remove(Object o) { if (o == null) { throw new IllegalArgumentException(); @@ -594,6 +625,7 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { return false; } + @Override public void clear() { clearEntries(); } @@ -607,6 +639,7 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { super(); } + @Override public V next() { return nextEntry().value; } @@ -624,6 +657,7 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { cursor = 0; } + @Override public final boolean hasNext() { return cursor < length; } @@ -639,6 +673,7 @@ public class CopyOnWriteIdentityMap<K, V> implements Map<K, V> { return e[cursor++]; } + @Override public final void remove() { if (length != entries().length) { throw new ConcurrentModificationException(); diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventManager.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventManager.java index 22982e794..e35f244bc 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventManager.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventManager.java @@ -196,6 +196,7 @@ public class EventManager { if (thread == null) { /* if there is no thread, then create a new one */ thread = AccessController.doPrivileged(new PrivilegedAction<EventThread<K, V, E>>() { + @Override public EventThread<K, V, E> run() { EventThread<K, V, E> t = new EventThread<>(threadGroup, threadName); return t; @@ -333,6 +334,7 @@ public class EventManager { * This method pulls events from * the queue and dispatches them. */ + @Override public void run() { try { while (true) { diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileInputStream.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileInputStream.java index 86b371e74..2c514dc94 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileInputStream.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileInputStream.java @@ -110,6 +110,7 @@ public class ReliableFileInputStream extends FilterInputStream { * * @exception java.io.IOException If an error occurs closing the file. */ + @Override public synchronized void close() throws IOException { if (reliable != null) { try { @@ -125,6 +126,7 @@ public class ReliableFileInputStream extends FilterInputStream { * Override default FilterInputStream method. * @see FilterInputStream#read(byte[], int, int) */ + @Override public synchronized int read(byte b[], int off, int len) throws IOException { if (readPos >= length) { return -1; @@ -144,6 +146,7 @@ public class ReliableFileInputStream extends FilterInputStream { * Override default FilterInputStream method. * @see FilterInputStream#read(byte[]) */ + @Override public synchronized int read(byte b[]) throws IOException { return read(b, 0, b.length); } @@ -152,6 +155,7 @@ public class ReliableFileInputStream extends FilterInputStream { * Override default FilterInputStream method. * @see FilterInputStream#read() */ + @Override public synchronized int read() throws IOException { if (readPos >= length) { return -1; @@ -169,6 +173,7 @@ public class ReliableFileInputStream extends FilterInputStream { * @throws IOException * @see FilterInputStream#available() */ + @Override public synchronized int available() throws IOException { if (readPos < length) // just in case return (int) (length - readPos); @@ -179,6 +184,7 @@ public class ReliableFileInputStream extends FilterInputStream { * Override default skip method. * @see FilterInputStream#skip(long) */ + @Override public synchronized long skip(long n) throws IOException { long len = super.skip(n); if (readPos + len > length) @@ -191,6 +197,7 @@ public class ReliableFileInputStream extends FilterInputStream { * Override default markSupported method. * @see FilterInputStream#markSupported() */ + @Override public boolean markSupported() { return false; } @@ -199,6 +206,7 @@ public class ReliableFileInputStream extends FilterInputStream { * Override default mark method. * @see FilterInputStream#mark(int) */ + @Override public void mark(int readlimit) { //ignore } @@ -207,6 +215,7 @@ public class ReliableFileInputStream extends FilterInputStream { * Override default reset method. * @see FilterInputStream#reset() */ + @Override public void reset() throws IOException { throw new IOException("reset not supported."); //$NON-NLS-1$ } diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileOutputStream.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileOutputStream.java index cbdf7284b..42f4771a3 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileOutputStream.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileOutputStream.java @@ -114,6 +114,7 @@ public class ReliableFileOutputStream extends FilterOutputStream { * * @exception java.io.IOException If an error occurs closing the file. */ + @Override public synchronized void close() throws IOException { closeIntermediateFile(); reliable.closeOutputFile(crc); @@ -147,6 +148,7 @@ public class ReliableFileOutputStream extends FilterOutputStream { * Override default FilterOutputStream method. * @see FilterOutputStream#write(byte[]) */ + @Override public void write(byte[] b) throws IOException { this.write(b, 0, b.length); } @@ -155,6 +157,7 @@ public class ReliableFileOutputStream extends FilterOutputStream { * Override default FilterOutputStream method. * @see FilterOutputStream#write(byte[], int, int) */ + @Override public void write(byte[] b, int off, int len) throws IOException { out.write(b, off, len); crc.update(b, off, len); @@ -164,6 +167,7 @@ public class ReliableFileOutputStream extends FilterOutputStream { * Override default FilterOutputStream method. * @see FilterOutputStream#write(int) */ + @Override public void write(int b) throws IOException { out.write(b); crc.update((byte) b); diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker.java index bc0e0b84f..217ad8ca0 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker.java @@ -29,16 +29,19 @@ public interface Locker { /** * @throws IOException */ + @Override public boolean lock() throws IOException { // locking always successful return true; } + @Override public boolean isLocked() { // this lock is never locked return false; } + @Override public void release() { // nothing to release } diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaIo.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaIo.java index 572730ddd..a1c4d5b5b 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaIo.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaIo.java @@ -26,6 +26,7 @@ public class Locker_JavaIo implements Locker { this.lockFile = lockFile; } + @Override public synchronized boolean lock() throws IOException { //if the lock file already exists, try to delete, //assume failure means another eclipse has it open @@ -47,6 +48,7 @@ public class Locker_JavaIo implements Locker { return true; } + @Override public synchronized void release() { try { if (lockRAF != null) { @@ -60,6 +62,7 @@ public class Locker_JavaIo implements Locker { lockFile.delete(); } + @Override public synchronized boolean isLocked() throws IOException { if (lockRAF != null) return true; diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaNio.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaNio.java index a881bd79c..9ce70d018 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaNio.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaNio.java @@ -35,6 +35,7 @@ public class Locker_JavaNio implements Locker { this.debug = debug; } + @Override public synchronized boolean lock() throws IOException { raFile = new RandomAccessFile(lockFile, "rw"); //$NON-NLS-1$ try { @@ -62,6 +63,7 @@ public class Locker_JavaNio implements Locker { return false; } + @Override public synchronized void release() { if (fileLock != null) { try { @@ -81,6 +83,7 @@ public class Locker_JavaNio implements Locker { } } + @Override public synchronized boolean isLocked() throws IOException { if (fileLock != null) return true; diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/ManagedOutputStream.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/ManagedOutputStream.java index a270694a4..c4454e6be 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/ManagedOutputStream.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/ManagedOutputStream.java @@ -51,6 +51,7 @@ public final class ManagedOutputStream extends FilterOutputStream { * of the managed output streams in the set are closed successfully. * @see FilterOutputStream#close() */ + @Override public void close() throws IOException { manager.closeOutputStream(this); } @@ -99,6 +100,7 @@ public final class ManagedOutputStream extends FilterOutputStream { * Override this method to prevent single byte writes to the output stream * which is done by the default implementation of FilteredOutputStream */ + @Override public void write(byte[] bytes, int off, int len) throws IOException { out.write(bytes, off, len); } diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java index fed59f10b..3c3af9fbc 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java @@ -583,6 +583,7 @@ public class ManifestElement { return result; } + @Override public String toString() { Enumeration<String> attrKeys = getKeys(); Enumeration<String> directiveKeys = getDirectiveKeys(); diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/NLS.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/NLS.java index 6660e46f0..58c1ca975 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/NLS.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/NLS.java @@ -65,6 +65,7 @@ public abstract class NLS { private static final String PROP_WARNINGS = "osgi.nls.warnings"; //$NON-NLS-1$ private static final String IGNORE = "ignore"; //$NON-NLS-1$ private static final boolean ignoreWarnings = AccessController.doPrivileged(new PrivilegedAction<Boolean>() { + @Override public Boolean run() { return IGNORE.equals(System.getProperty(PROP_WARNINGS)); } @@ -152,6 +153,7 @@ public abstract class NLS { return; } AccessController.doPrivileged(new PrivilegedAction<Void>() { + @Override public Void run() { load(baseName, clazz); return null; @@ -411,6 +413,7 @@ public abstract class NLS { /* (non-Javadoc) * @see java.util.Hashtable#put(java.lang.Object, java.lang.Object) */ + @Override public synchronized Object put(Object key, Object value) { Object fieldObject = fields.put(key, ASSIGNED); // if already assigned, there is nothing to do |