Add @Override AnnotationI20190516-1800I20190516-1405I20190516-1335I20190516-1250I20190516-1200I20190516-1055

Change-Id: I4ef764e744192dc3564ad053e8984e891aadfe44
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>

9 files changed, 49 insertions, 0 deletions

diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerFactoryImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerFactoryImpl.java
index 0105f2dd9..c1166cba7 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerFactoryImpl.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerFactoryImpl.java
@@ -64,6 +64,7 @@ public class ContentHandlerFactoryImpl extends MultiplexingFactory implements ja
 	 * @see java.net.ContentHandlerFactory#createContentHandler(String)
 	 */
 	//TODO method is too long... consider reducing indentation (returning quickly) and moving complex steps to private methods
+	@Override
 	public ContentHandler createContentHandler(String contentType) {
 		//first, we check to see if there exists a built in content handler for
 		//this content type.  we can not overwrite built in ContentHandlers
@@ -158,10 +159,12 @@ public class ContentHandlerFactoryImpl extends MultiplexingFactory implements ja
 		}
 	}
 
+	@Override
 	public Object getParentFactory() {
 		return parentFactory;
 	}
 
+	@Override
 	public void setParentFactory(Object parentFactory) {
 		if (this.parentFactory == null) // only allow it to be set once
 			this.parentFactory = (java.net.ContentHandlerFactory) parentFactory;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerProxy.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerProxy.java
index 768cdfc81..8b8b18bc7 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerProxy.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerProxy.java
@@ -71,6 +71,7 @@ public class ContentHandlerProxy extends ContentHandler implements ServiceTracke
 	/**
 	 * @see org.osgi.util.tracker.ServiceTrackerCustomizer#addingService(ServiceReference)
 	 */
+	@Override
 	public ServiceReference<ContentHandler> addingService(ServiceReference<ContentHandler> reference) {
 		//check to see if our contentType is being registered by another service
 		Object prop = reference.getProperty(URLConstants.URL_CONTENT_MIMETYPE);
@@ -99,6 +100,7 @@ public class ContentHandlerProxy extends ContentHandler implements ServiceTracke
 	 * @see org.osgi.util.tracker.ServiceTrackerCustomizer#modifiedService(ServiceReference, Object)
 	 */
 
+	@Override
 	public void modifiedService(ServiceReference<ContentHandler> reference, ServiceReference<ContentHandler> service) {
 		int newrank = getRank(reference);
 		if (reference == contentHandlerServiceReference) {
@@ -121,6 +123,7 @@ public class ContentHandlerProxy extends ContentHandler implements ServiceTracke
 	/**
 	 * @see org.osgi.util.tracker.ServiceTrackerCustomizer#removedService(ServiceReference, Object)
 	 */
+	@Override
 	public void removedService(ServiceReference<ContentHandler> reference, ServiceReference<ContentHandler> service) {
 		//check to see if our URLStreamHandler was unregistered.
 		if (reference != contentHandlerServiceReference)
@@ -136,6 +139,7 @@ public class ContentHandlerProxy extends ContentHandler implements ServiceTracke
 	 * @see java.net.ContentHandler#getContent(URLConnection)
 	 */
 
+	@Override
 	public Object getContent(URLConnection uConn) throws IOException {
 		return realHandler.getContent(uConn);
 	}
@@ -152,6 +156,7 @@ public class ContentHandlerProxy extends ContentHandler implements ServiceTracke
 		/**
 		 * @see java.net.ContentHandler#getContent(URLConnection)
 		 */
+		@Override
 		public Object getContent(URLConnection uConn) throws IOException {
 			return uConn.getInputStream();
 		}
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingContentHandler.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingContentHandler.java
index 7ee72500c..87ea74c33 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingContentHandler.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingContentHandler.java
@@ -25,6 +25,7 @@ public class MultiplexingContentHandler extends ContentHandler {
 		this.factory = factory;
 	}
 
+	@Override
 	public Object getContent(URLConnection uConn) throws IOException {
 		ContentHandler handler = factory.findAuthorizedContentHandler(contentType);
 		if (handler != null)
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingFactory.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingFactory.java
index 50e8444ea..ae6084145 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingFactory.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingFactory.java
@@ -71,6 +71,7 @@ public abstract class MultiplexingFactory {
 
 	// used to get access to the protected SecurityManager#getClassContext method
 	static class InternalSecurityManager extends SecurityManager {
+		@Override
 		public Class<?>[] getClassContext() {
 			return super.getClassContext();
 		}
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingURLStreamHandler.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingURLStreamHandler.java
index 2c00720a3..4ce1cb433 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingURLStreamHandler.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingURLStreamHandler.java
@@ -95,6 +95,7 @@ public class MultiplexingURLStreamHandler extends URLStreamHandler {
 		initializeMethods(factory);
 	}
 
+	@Override
 	protected URLConnection openConnection(URL url) throws IOException {
 		URLStreamHandler handler = findAuthorizedURLStreamHandler(protocol);
 		if (handler != null) {
@@ -130,6 +131,7 @@ public class MultiplexingURLStreamHandler extends URLStreamHandler {
 		throw new MalformedURLException();
 	}
 
+	@Override
 	protected boolean equals(URL url1, URL url2) {
 		URLStreamHandler handler = findAuthorizedURLStreamHandler(protocol);
 		if (handler != null) {
@@ -145,6 +147,7 @@ public class MultiplexingURLStreamHandler extends URLStreamHandler {
 		throw new IllegalStateException();
 	}
 
+	@Override
 	protected int getDefaultPort() {
 		URLStreamHandler handler = findAuthorizedURLStreamHandler(protocol);
 		if (handler != null) {
@@ -160,6 +163,7 @@ public class MultiplexingURLStreamHandler extends URLStreamHandler {
 		throw new IllegalStateException();
 	}
 
+	@Override
 	protected InetAddress getHostAddress(URL url) {
 		URLStreamHandler handler = findAuthorizedURLStreamHandler(protocol);
 		if (handler != null) {
@@ -175,6 +179,7 @@ public class MultiplexingURLStreamHandler extends URLStreamHandler {
 		throw new IllegalStateException();
 	}
 
+	@Override
 	protected int hashCode(URL url) {
 		URLStreamHandler handler = findAuthorizedURLStreamHandler(protocol);
 		if (handler != null) {
@@ -190,6 +195,7 @@ public class MultiplexingURLStreamHandler extends URLStreamHandler {
 		throw new IllegalStateException();
 	}
 
+	@Override
 	protected boolean hostsEqual(URL url1, URL url2) {
 		URLStreamHandler handler = findAuthorizedURLStreamHandler(protocol);
 		if (handler != null) {
@@ -205,6 +211,7 @@ public class MultiplexingURLStreamHandler extends URLStreamHandler {
 		throw new IllegalStateException();
 	}
 
+	@Override
 	protected void parseURL(URL arg0, String arg1, int arg2, int arg3) {
 		URLStreamHandler handler = factory.findAuthorizedURLStreamHandler(protocol);
 		if (handler != null) {
@@ -223,6 +230,7 @@ public class MultiplexingURLStreamHandler extends URLStreamHandler {
 		throw new IllegalStateException();
 	}
 
+	@Override
 	protected boolean sameFile(URL url1, URL url2) {
 		URLStreamHandler handler = findAuthorizedURLStreamHandler(protocol);
 		if (handler != null) {
@@ -238,6 +246,7 @@ public class MultiplexingURLStreamHandler extends URLStreamHandler {
 		throw new IllegalStateException();
 	}
 
+	@Override
 	protected void setURL(URL arg0, String arg1, String arg2, int arg3, String arg4, String arg5, String arg6, String arg7, String arg8) {
 		URLStreamHandler handler = findAuthorizedURLStreamHandler(protocol);
 		if (handler != null) {
@@ -256,6 +265,7 @@ public class MultiplexingURLStreamHandler extends URLStreamHandler {
 		throw new IllegalStateException();
 	}
 
+	@Override
 	protected String toExternalForm(URL url) {
 		URLStreamHandler handler = findAuthorizedURLStreamHandler(protocol);
 		if (handler != null) {
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/NullURLStreamHandlerService.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/NullURLStreamHandlerService.java
index 20e84e934..474a7e942 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/NullURLStreamHandlerService.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/NullURLStreamHandlerService.java
@@ -30,30 +30,37 @@ import org.osgi.service.url.URLStreamHandlerSetter;
 
 public class NullURLStreamHandlerService implements URLStreamHandlerService {
 
+	@Override
 	public URLConnection openConnection(URL u) throws IOException {
 		throw new MalformedURLException();
 	}
 
+	@Override
 	public boolean equals(URL url1, URL url2) {
 		throw new IllegalStateException();
 	}
 
+	@Override
 	public int getDefaultPort() {
 		throw new IllegalStateException();
 	}
 
+	@Override
 	public InetAddress getHostAddress(URL url) {
 		throw new IllegalStateException();
 	}
 
+	@Override
 	public int hashCode(URL url) {
 		throw new IllegalStateException();
 	}
 
+	@Override
 	public boolean hostsEqual(URL url1, URL url2) {
 		throw new IllegalStateException();
 	}
 
+	@Override
 	public boolean sameFile(URL url1, URL url2) {
 		throw new IllegalStateException();
 	}
@@ -66,10 +73,12 @@ public class NullURLStreamHandlerService implements URLStreamHandlerService {
 		throw new IllegalStateException();
 	}
 
+	@Override
 	public String toExternalForm(URL url) {
 		throw new IllegalStateException();
 	}
 
+	@Override
 	public void parseURL(URLStreamHandlerSetter realHandler, URL u, String spec, int start, int limit) {
 		throw new IllegalStateException();
 	}
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerFactoryImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerFactoryImpl.java
index 0fb9bc382..1131d7e98 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerFactoryImpl.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerFactoryImpl.java
@@ -89,6 +89,7 @@ public class URLStreamHandlerFactoryImpl extends MultiplexingFactory implements
 	 * @param protocol The desired protocol
 	 * @return a URLStreamHandler for the specific protocol.
 	 */
+	@Override
 	public URLStreamHandler createURLStreamHandler(String protocol) {
 		// Check if we are recursing
 		if (isRecursive(protocol))
@@ -201,10 +202,12 @@ public class URLStreamHandlerFactoryImpl extends MultiplexingFactory implements
 		}
 	}
 
+	@Override
 	public Object getParentFactory() {
 		return parentFactory;
 	}
 
+	@Override
 	public void setParentFactory(Object parentFactory) {
 		if (this.parentFactory == null) // only allow it to be set once
 			this.parentFactory = (URLStreamHandlerFactory) parentFactory;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerProxy.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerProxy.java
index ea9e1c8ca..f8efc54b3 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerProxy.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerProxy.java
@@ -78,6 +78,7 @@ public class URLStreamHandlerProxy extends URLStreamHandler implements ServiceTr
 	/**
 	 * @see java.net.URLStreamHandler#equals(URL, URL)
 	 */
+	@Override
 	protected boolean equals(URL url1, URL url2) {
 		return realHandlerService.equals(url1, url2);
 	}
@@ -85,6 +86,7 @@ public class URLStreamHandlerProxy extends URLStreamHandler implements ServiceTr
 	/**
 	 * @see java.net.URLStreamHandler#getDefaultPort()
 	 */
+	@Override
 	protected int getDefaultPort() {
 		return realHandlerService.getDefaultPort();
 	}
@@ -92,6 +94,7 @@ public class URLStreamHandlerProxy extends URLStreamHandler implements ServiceTr
 	/**
 	 * @see java.net.URLStreamHandler#getHostAddress(URL)
 	 */
+	@Override
 	protected InetAddress getHostAddress(URL url) {
 		return realHandlerService.getHostAddress(url);
 	}
@@ -99,6 +102,7 @@ public class URLStreamHandlerProxy extends URLStreamHandler implements ServiceTr
 	/**
 	 * @see java.net.URLStreamHandler#hashCode(URL)
 	 */
+	@Override
 	protected int hashCode(URL url) {
 		return realHandlerService.hashCode(url);
 	}
@@ -106,6 +110,7 @@ public class URLStreamHandlerProxy extends URLStreamHandler implements ServiceTr
 	/**
 	 * @see java.net.URLStreamHandler#hostsEqual(URL, URL)
 	 */
+	@Override
 	protected boolean hostsEqual(URL url1, URL url2) {
 		return realHandlerService.hostsEqual(url1, url2);
 	}
@@ -113,6 +118,7 @@ public class URLStreamHandlerProxy extends URLStreamHandler implements ServiceTr
 	/**
 	 * @see java.net.URLStreamHandler#openConnection(URL)
 	 */
+	@Override
 	protected URLConnection openConnection(URL url) throws IOException {
 		return realHandlerService.openConnection(url);
 	}
@@ -120,6 +126,7 @@ public class URLStreamHandlerProxy extends URLStreamHandler implements ServiceTr
 	/**
 	 * @see java.net.URLStreamHandler#parseURL(URL, String, int, int)
 	 */
+	@Override
 	protected void parseURL(URL url, String str, int start, int end) {
 		realHandlerService.parseURL(urlSetter, url, str, start, end);
 	}
@@ -127,6 +134,7 @@ public class URLStreamHandlerProxy extends URLStreamHandler implements ServiceTr
 	/**
 	 * @see java.net.URLStreamHandler#sameFile(URL, URL)
 	 */
+	@Override
 	protected boolean sameFile(URL url1, URL url2) {
 		return realHandlerService.sameFile(url1, url2);
 	}
@@ -134,6 +142,7 @@ public class URLStreamHandlerProxy extends URLStreamHandler implements ServiceTr
 	/**
 	 * @see java.net.URLStreamHandler#toExternalForm(URL)
 	 */
+	@Override
 	protected String toExternalForm(URL url) {
 		return realHandlerService.toExternalForm(url);
 	}
@@ -141,11 +150,13 @@ public class URLStreamHandlerProxy extends URLStreamHandler implements ServiceTr
 	/**
 	 * @see java.net.URLStreamHandler#setURL(URL, String, String, int, String, String, String, String, String)
 	 */
+	@Override
 	public void setURL(URL u, String protocol, String host, int port, String authority, String userInfo, String file, String query, String ref) {
 		super.setURL(u, protocol, host, port, authority, userInfo, file, query, ref);
 	}
 
 	@SuppressWarnings("deprecation")
+	@Override
 	public void setURL(URL url, String protocol, String host, int port, String file, String ref) {
 
 		//using non-deprecated URLStreamHandler.setURL method. 
@@ -156,6 +167,7 @@ public class URLStreamHandlerProxy extends URLStreamHandler implements ServiceTr
 	/**
 	 * @see org.osgi.util.tracker.ServiceTrackerCustomizer#addingService(ServiceReference)
 	 */
+	@Override
 	public ServiceReference<URLStreamHandlerService> addingService(ServiceReference<URLStreamHandlerService> reference) {
 		//check to see if our protocol is being registered by another service
 		Object prop = reference.getProperty(URLConstants.URL_HANDLER_PROTOCOL);
@@ -184,6 +196,7 @@ public class URLStreamHandlerProxy extends URLStreamHandler implements ServiceTr
 	 * @see org.osgi.util.tracker.ServiceTrackerCustomizer#modifiedService(ServiceReference, Object)
 	 */
 	// check to see if the ranking has changed.  If so, re-select a new URLHandler
+	@Override
 	public void modifiedService(ServiceReference<URLStreamHandlerService> reference, ServiceReference<URLStreamHandlerService> service) {
 		int newRank = getRank(reference);
 		if (reference == urlStreamServiceReference) {
@@ -206,6 +219,7 @@ public class URLStreamHandlerProxy extends URLStreamHandler implements ServiceTr
 	/**
 	 * @see org.osgi.util.tracker.ServiceTrackerCustomizer#removedService(ServiceReference, Object)
 	 */
+	@Override
 	public void removedService(ServiceReference<URLStreamHandlerService> reference, ServiceReference<URLStreamHandlerService> service) {
 		// check to see if our URLStreamHandler was unregistered.
 		if (reference != urlStreamServiceReference)
@@ -224,6 +238,7 @@ public class URLStreamHandlerProxy extends URLStreamHandler implements ServiceTr
 		return (property instanceof Integer) ? ((Integer) property).intValue() : 0;
 	}
 
+	@Override
 	protected URLConnection openConnection(URL u, Proxy p) throws IOException {
 		try {
 			Method openConn = realHandlerService.getClass().getMethod("openConnection", new Class[] {URL.class, Proxy.class}); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerSetter.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerSetter.java
index 792f004f3..263a39c49 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerSetter.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerSetter.java
@@ -28,6 +28,7 @@ public class URLStreamHandlerSetter implements org.osgi.service.url.URLStreamHan
 	 * @see org.osgi.service.url.URLStreamHandlerSetter#setURL(URL, String, String, int, String, String)
 	 * @deprecated
 	 */
+	@Override
 	public void setURL(URL url, String protocol, String host, int port, String file, String ref) {
 		handlerProxy.setURL(url, protocol, host, port, file, ref);
 	}
@@ -35,6 +36,7 @@ public class URLStreamHandlerSetter implements org.osgi.service.url.URLStreamHan
 	/**
 	 * @see org.osgi.service.url.URLStreamHandlerSetter#setURL(URL, String, String, int, String, String, String, String, String)
 	 */
+	@Override
 	public void setURL(URL url, String protocol, String host, int port, String authority, String userInfo, String path, String query, String ref) {
 		handlerProxy.setURL(url, protocol, host, port, authority, userInfo, path, query, ref);
 	}