diff options
Diffstat (limited to 'bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url')
8 files changed, 27 insertions, 27 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 077ade007..f6d2fbb6b 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 @@ -35,7 +35,7 @@ import org.osgi.util.tracker.ServiceTracker; * The ContentHandlerFactory is registered with the JVM to provide content handlers * to requestors. The ContentHandlerFactory will first look for built-in content handlers. * If a built in handler exists, this factory will return null. Otherwise, this ContentHandlerFactory - * will search the service registry for a maching Content-Handler and, if found, return a + * will search the service registry for a maching Content-Handler and, if found, return a * proxy for that content handler. */ public class ContentHandlerFactoryImpl extends MultiplexingFactory implements java.net.ContentHandlerFactory { @@ -88,7 +88,7 @@ public class ContentHandlerFactoryImpl extends MultiplexingFactory implements ja try { clazz = URLStreamHandlerFactoryImpl.secureAction.loadSystemClass(name.toString()); if (clazz != null) { - return (null); //this class exists, it is a built in handler, let the JVM handle it + return (null); //this class exists, it is a built in handler, let the JVM handle it } } catch (ClassNotFoundException ex) { //keep looking 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 0c2051d8e..f182360e7 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 @@ -7,7 +7,7 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -25,7 +25,7 @@ import org.osgi.util.tracker.ServiceTrackerCustomizer; /** * The ContentHandlerProxy is a ContentHandler that acts as a proxy for registered ContentHandlers. * When a ContentHandler is requested from the ContentHandlerFactory and it exists in the service - * registry, a ContentHandlerProxy is created which will pass all the requests from the requestor to + * registry, a ContentHandlerProxy is created which will pass all the requests from the requestor to * the real ContentHandler. We can't return the real ContentHandler from the ContentHandlerFactory * because the JVM caches ContentHandlers and therefore would not support a dynamic environment of * ContentHandlers being registered and unregistered. @@ -47,7 +47,7 @@ public class ContentHandlerProxy extends ContentHandler implements ServiceTracke this.context = context; this.contentType = contentType; - // In case the reference == null, the proxy is constructed with DefaultContentHandler for a Content Handler + // In case the reference == null, the proxy is constructed with DefaultContentHandler for a Content Handler // until a real ContentHandler for this mime-type is registered setNewHandler(reference, getRank(reference)); @@ -105,7 +105,7 @@ public class ContentHandlerProxy extends ContentHandler implements ServiceTracke int newrank = getRank(reference); if (reference == contentHandlerServiceReference) { if (newrank < ranking) { - // The ContentHandler we are currently using has dropped it's ranking below a ContentHandler + // The ContentHandler we are currently using has dropped it's ranking below a ContentHandler // registered for the same protocol. We need to swap out ContentHandlers. // this should get us the highest ranked service, if available ServiceReference<ContentHandler> newReference = contentHandlerServiceTracker.getServiceReference(); diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/EquinoxFactoryManager.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/EquinoxFactoryManager.java index 569112435..7c55f0e41 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/EquinoxFactoryManager.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/EquinoxFactoryManager.java @@ -65,7 +65,7 @@ public class EquinoxFactoryManager { Object lock = getURLStreamHandlerFactoryLock(); synchronized (lock) { URLStreamHandlerFactory factory = (URLStreamHandlerFactory) factoryField.get(null); - // doing a null check here just in case, but it would be really strange if it was null, + // doing a null check here just in case, but it would be really strange if it was null, // because we failed to set the factory normally!! if (factory != null) { try { @@ -134,7 +134,7 @@ public class EquinoxFactoryManager { throw new Exception("Could not find ContentHandlerFactory field"); //$NON-NLS-1$ synchronized (URLConnection.class) { java.net.ContentHandlerFactory factory = (java.net.ContentHandlerFactory) factoryField.get(null); - // doing a null check here just in case, but it would be really strange if it was null, + // doing a null check here just in case, but it would be really strange if it was null, // because we failed to set the factory normally!! if (factory != null) { @@ -148,7 +148,7 @@ public class EquinoxFactoryManager { factory = chf; } } - // null out the field so that we can successfully call setContentHandlerFactory + // null out the field so that we can successfully call setContentHandlerFactory factoryField.set(null, null); // always attempt to clear the handlers cache // This allows an optimization for the single framework use-case @@ -221,7 +221,7 @@ public class EquinoxFactoryManager { Method unregister = factory.getClass().getMethod("unregister", new Class[] {Object.class}); //$NON-NLS-1$ unregister.invoke(factory, new Object[] {contentHandlerFactory}); } - // null out the field so that we can successfully call setContentHandlerFactory + // null out the field so that we can successfully call setContentHandlerFactory factoryField.set(null, null); // always attempt to clear the handlers cache // This allows an optomization for the single framework use-case 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 87ea74c33..08f6a6ff1 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 @@ -7,7 +7,7 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * *******************************************************************************/ package org.eclipse.osgi.internal.url; 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 ec38d9bed..0470a7af8 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 @@ -7,7 +7,7 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * *******************************************************************************/ package org.eclipse.osgi.internal.url; @@ -31,7 +31,7 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; /* - * An abstract class for handler factory impls (Stream and Content) that can + * An abstract class for handler factory impls (Stream and Content) that can * handle environments running multiple osgi frameworks with the same VM. */ public abstract class MultiplexingFactory { @@ -159,7 +159,7 @@ public abstract class MultiplexingFactory { Object successor = released.remove(0); try { Class<?> clazz = successor.getClass(); - Method register = clazz.getMethod("register", new Class[] {Object.class}); //$NON-NLS-1$ + Method register = clazz.getMethod("register", new Class[] {Object.class}); //$NON-NLS-1$ for (Object r : released) { register.invoke(successor, new Object[] {r}); } 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 474a7e942..6e828d6b7 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 @@ -23,7 +23,7 @@ import org.osgi.service.url.URLStreamHandlerSetter; * The NullURLStreamService is created when a registered URLStreamHandler service * with an associated URLStreamHandlerProxy becomes unregistered. The associated * URLStreamHandlerProxy must still handle all future requests for the now unregistered - * scheme (the JVM caches URLStreamHandlers making up impossible to "unregister" them). + * scheme (the JVM caches URLStreamHandlers making up impossible to "unregister" them). * When requests come in for an unregistered URLStreamHandlerService, the * NullURLStreamHandlerService is used in it's place. */ 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 d74f030b9..ddad3ba34 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 @@ -74,7 +74,7 @@ public class URLStreamHandlerFactoryImpl extends MultiplexingFactory implements try { clazz = secureAction.loadSystemClass(name.toString()); if (clazz != null) - return clazz; //this class exists, it is a built in handler + return clazz; //this class exists, it is a built in handler } catch (ClassNotFoundException ex) { // keep looking } 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 7cb6567a3..eb585627b 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 @@ -7,7 +7,7 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -25,17 +25,17 @@ import org.osgi.util.tracker.ServiceTracker; import org.osgi.util.tracker.ServiceTrackerCustomizer; /** - * The URLStreamHandlerProxy is a URLStreamHandler that acts as a proxy for registered - * URLStreamHandlerServices. When a URLStreamHandler is requested from the URLStreamHandlerFactory - * and it exists in the service registry, a URLStreamHandlerProxy is created which will pass all the - * requests from the requestor to the real URLStreamHandlerService. We can't return the real - * URLStreamHandlerService from the URLStreamHandlerFactory because the JVM caches URLStreamHandlers - * and therefore would not support a dynamic environment of URLStreamHandlerServices being registered + * The URLStreamHandlerProxy is a URLStreamHandler that acts as a proxy for registered + * URLStreamHandlerServices. When a URLStreamHandler is requested from the URLStreamHandlerFactory + * and it exists in the service registry, a URLStreamHandlerProxy is created which will pass all the + * requests from the requestor to the real URLStreamHandlerService. We can't return the real + * URLStreamHandlerService from the URLStreamHandlerFactory because the JVM caches URLStreamHandlers + * and therefore would not support a dynamic environment of URLStreamHandlerServices being registered * and unregistered. */ public class URLStreamHandlerProxy extends URLStreamHandler implements ServiceTrackerCustomizer<URLStreamHandlerService, ServiceReference<URLStreamHandlerService>> { - // TODO lots of type-based names + // TODO lots of type-based names protected URLStreamHandlerService realHandlerService; protected URLStreamHandlerSetter urlSetter; @@ -159,8 +159,8 @@ public class URLStreamHandlerProxy extends URLStreamHandler implements ServiceTr @Override public void setURL(URL url, String protocol, String host, int port, String file, String ref) { - //using non-deprecated URLStreamHandler.setURL method. - //setURL(URL u, String protocol, String host, int port, String authority, String userInfo, String file, String query, String ref) + //using non-deprecated URLStreamHandler.setURL method. + //setURL(URL u, String protocol, String host, int port, String authority, String userInfo, String file, String query, String ref) super.setURL(url, protocol, host, port, null, null, file, null, ref); } @@ -201,7 +201,7 @@ public class URLStreamHandlerProxy extends URLStreamHandler implements ServiceTr int newRank = getRank(reference); if (reference == urlStreamServiceReference) { if (newRank < ranking) { - // The URLHandler we are currently using has dropped it's ranking below a URLHandler registered + // The URLHandler we are currently using has dropped it's ranking below a URLHandler registered // for the same protocol. We need to swap out URLHandlers. // this should get us the highest ranked service, if available ServiceReference<URLStreamHandlerService> newReference = urlStreamHandlerServiceTracker.getServiceReference(); |