This is an automated email from the ASF dual-hosted git repository.
stbischof pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit ee8952a0ae1331e88867566e1e049bb9edb0a7ed
Author: Stefan Bischof <stbisc...@bipolis.org>
AuthorDate: Sat Apr 5 09:56:40 2025 +0200
[fw] use @Override annotation
Signed-off-by: Stefan Bischof <stbisc...@bipolis.org>
---
.../apache/felix/framework/BundleContextImpl.java | 93 ++++++++++++++-------
.../felix/framework/BundleProtectionDomain.java | 24 ++++--
.../apache/felix/framework/BundleRevisionImpl.java | 27 ++++--
.../felix/framework/EntryFilterEnumeration.java | 6 +-
.../felix/framework/ExportedPackageImpl.java | 21 +++--
.../apache/felix/framework/ExtensionManager.java | 30 ++++---
.../felix/framework/FakeURLStreamHandler.java | 3 +-
.../org/apache/felix/framework/FilterImpl.java | 57 ++++++++-----
.../apache/felix/framework/FrameworkFactory.java | 3 +-
.../felix/framework/FrameworkStartLevelImpl.java | 33 +++++---
.../felix/framework/FrameworkWiringImpl.java | 21 +++--
.../java/org/apache/felix/framework/Logger.java | 3 +-
.../apache/felix/framework/PackageAdminImpl.java | 39 ++++++---
.../apache/felix/framework/RequiredBundleImpl.java | 18 ++--
.../felix/framework/ServiceRegistrationImpl.java | 66 ++++++++++-----
.../org/apache/felix/framework/StartLevelImpl.java | 22 +++--
.../apache/felix/framework/StatefulResolver.java | 3 +-
.../org/apache/felix/framework/URLHandlers.java | 6 +-
.../framework/URLHandlersBundleStreamHandler.java | 12 ++-
.../framework/URLHandlersBundleURLConnection.java | 21 +++--
.../framework/URLHandlersContentHandlerProxy.java | 3 +-
.../framework/URLHandlersStreamHandlerProxy.java | 39 ++++++---
.../org/apache/felix/framework/WovenClassImpl.java | 96 ++++++++++++++--------
.../framework/cache/ContentDirectoryContent.java | 33 +++++---
.../felix/framework/cache/DirectoryContent.java | 33 +++++---
.../felix/framework/cache/DirectoryRevision.java | 9 +-
.../apache/felix/framework/cache/JarContent.java | 33 +++++---
.../apache/felix/framework/cache/JarRevision.java | 9 +-
.../framework/capabilityset/SimpleFilter.java | 9 +-
.../framework/resolver/CandidateComparator.java | 3 +-
.../felix/framework/util/CompoundEnumeration.java | 6 +-
.../apache/felix/framework/util/ListenerInfo.java | 9 +-
.../felix/framework/util/MapToDictionary.java | 24 ++++--
.../apache/felix/framework/util/SecureAction.java | 6 +-
.../felix/framework/util/SecurityManagerEx.java | 3 +-
.../apache/felix/framework/util/ShrinkableMap.java | 36 +++++---
.../felix/framework/util/StringComparator.java | 3 +-
.../felix/framework/util/WeakZipFileFactory.java | 3 +-
.../util/manifestparser/NativeLibrary.java | 3 +-
.../framework/wiring/BundleCapabilityImpl.java | 15 ++--
.../framework/wiring/BundleRequirementImpl.java | 18 ++--
.../felix/framework/wiring/BundleWireImpl.java | 21 +++--
.../org/apache/felix/framework/BootLoaderTest.java | 6 +-
.../felix/framework/BundleWiringImplTest.java | 18 ++--
.../apache/felix/framework/ConcurrencyTest.java | 15 ++--
.../framework/ConcurrentBundleUpdateTest.java | 9 +-
.../felix/framework/ConcurrentClassLoaderTest.java | 3 +-
.../CycleDetectionWithWovenClassTest.java | 3 +-
.../felix/framework/EventDispatcherTest.java | 15 ++--
.../felix/framework/ExtensionManagerTest.java | 6 +-
.../framework/ImplicitBootDelegationTest.java | 2 +
.../framework/RequirementsCapabilitiesTest.java | 12 ++-
.../felix/framework/StartStopBundleTest.java | 12 ++-
.../apache/felix/framework/URLHandlersTest.java | 33 +++++---
54 files changed, 705 insertions(+), 351 deletions(-)
diff --git
a/framework/src/main/java/org/apache/felix/framework/BundleContextImpl.java
b/framework/src/main/java/org/apache/felix/framework/BundleContextImpl.java
index dcfbdd5fe3..447182f40f 100644
--- a/framework/src/main/java/org/apache/felix/framework/BundleContextImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/BundleContextImpl.java
@@ -61,7 +61,8 @@ class BundleContextImpl implements BundleContext
m_valid = false;
}
- public String getProperty(String name)
+ @Override
+ public String getProperty(String name)
{
checkValidity();
@@ -89,7 +90,8 @@ class BundleContextImpl implements BundleContext
return m_felix.getProperty(name);
}
- public Bundle getBundle()
+ @Override
+ public Bundle getBundle()
{
checkValidity();
@@ -101,7 +103,8 @@ class BundleContextImpl implements BundleContext
return m_bundle;
}
- public Filter createFilter(String expr)
+ @Override
+ public Filter createFilter(String expr)
throws InvalidSyntaxException
{
checkValidity();
@@ -114,13 +117,15 @@ class BundleContextImpl implements BundleContext
return new FilterImpl(expr);
}
- public Bundle installBundle(String location)
+ @Override
+ public Bundle installBundle(String location)
throws BundleException
{
return installBundle(location, null);
}
- public Bundle installBundle(String location, InputStream is)
+ @Override
+ public Bundle installBundle(String location, InputStream is)
throws BundleException
{
checkValidity();
@@ -150,7 +155,8 @@ class BundleContextImpl implements BundleContext
return result;
}
- public Bundle getBundle(long id)
+ @Override
+ public Bundle getBundle(long id)
{
checkValidity();
@@ -162,7 +168,8 @@ class BundleContextImpl implements BundleContext
return m_felix.getBundle(this, id);
}
- public Bundle getBundle(String location)
+ @Override
+ public Bundle getBundle(String location)
{
checkValidity();
@@ -174,7 +181,8 @@ class BundleContextImpl implements BundleContext
return m_felix.getBundle(location);
}
- public Bundle[] getBundles()
+ @Override
+ public Bundle[] getBundles()
{
checkValidity();
@@ -186,7 +194,8 @@ class BundleContextImpl implements BundleContext
return m_felix.getBundles(this);
}
- public void addBundleListener(BundleListener l)
+ @Override
+ public void addBundleListener(BundleListener l)
{
checkValidity();
@@ -210,7 +219,8 @@ class BundleContextImpl implements BundleContext
m_felix.addBundleListener(m_bundle, l);
}
- public void removeBundleListener(BundleListener l)
+ @Override
+ public void removeBundleListener(BundleListener l)
{
checkValidity();
@@ -233,7 +243,8 @@ class BundleContextImpl implements BundleContext
m_felix.removeBundleListener(m_bundle, l);
}
- public void addServiceListener(ServiceListener l)
+ @Override
+ public void addServiceListener(ServiceListener l)
{
try
{
@@ -245,7 +256,8 @@ class BundleContextImpl implements BundleContext
}
}
- public void addServiceListener(ServiceListener l, String s)
+ @Override
+ public void addServiceListener(ServiceListener l, String s)
throws InvalidSyntaxException
{
checkValidity();
@@ -259,7 +271,8 @@ class BundleContextImpl implements BundleContext
m_felix.addServiceListener(m_bundle, l, s);
}
- public void removeServiceListener(ServiceListener l)
+ @Override
+ public void removeServiceListener(ServiceListener l)
{
checkValidity();
@@ -271,7 +284,8 @@ class BundleContextImpl implements BundleContext
m_felix.removeServiceListener(m_bundle, l);
}
- public void addFrameworkListener(FrameworkListener l)
+ @Override
+ public void addFrameworkListener(FrameworkListener l)
{
checkValidity();
@@ -284,7 +298,8 @@ class BundleContextImpl implements BundleContext
m_felix.addFrameworkListener(m_bundle, l);
}
- public void removeFrameworkListener(FrameworkListener l)
+ @Override
+ public void removeFrameworkListener(FrameworkListener l)
{
checkValidity();
@@ -296,13 +311,15 @@ class BundleContextImpl implements BundleContext
m_felix.removeFrameworkListener(m_bundle, l);
}
- public ServiceRegistration<?> registerService(
+ @Override
+ public ServiceRegistration<?> registerService(
String clazz, Object svcObj, Dictionary<String, ? > dict)
{
return registerService(new String[] { clazz }, svcObj, dict);
}
- public ServiceRegistration<?> registerService(
+ @Override
+ public ServiceRegistration<?> registerService(
String[] clazzes, Object svcObj, Dictionary<String, ? > dict)
{
checkValidity();
@@ -327,14 +344,16 @@ class BundleContextImpl implements BundleContext
return m_felix.registerService(this, clazzes, svcObj, dict);
}
- public <S> ServiceRegistration<S> registerService(
+ @Override
+ public <S> ServiceRegistration<S> registerService(
Class<S> clazz, S svcObj, Dictionary<String, ? > dict)
{
return (ServiceRegistration<S>)
registerService(new String[] { clazz.getName() }, svcObj, dict);
}
- public ServiceReference<?> getServiceReference(String clazz)
+ @Override
+ public ServiceReference<?> getServiceReference(String clazz)
{
checkValidity();
@@ -355,7 +374,8 @@ class BundleContextImpl implements BundleContext
return null;
}
- public <S> ServiceReference<S> getServiceReference(Class<S> clazz)
+ @Override
+ public <S> ServiceReference<S> getServiceReference(Class<S> clazz)
{
return (ServiceReference<S>) getServiceReference(clazz.getName());
}
@@ -386,7 +406,8 @@ class BundleContextImpl implements BundleContext
return bestRef;
}
- public ServiceReference<?>[] getAllServiceReferences(String clazz, String
filter)
+ @Override
+ public ServiceReference<?>[] getAllServiceReferences(String clazz,
String filter)
throws InvalidSyntaxException
{
checkValidity();
@@ -400,7 +421,8 @@ class BundleContextImpl implements BundleContext
}
- public ServiceReference<?>[] getServiceReferences(String clazz, String
filter)
+ @Override
+ public ServiceReference<?>[] getServiceReferences(String clazz, String
filter)
throws InvalidSyntaxException
{
checkValidity();
@@ -414,7 +436,8 @@ class BundleContextImpl implements BundleContext
}
- public <S> Collection<ServiceReference<S>> getServiceReferences(
+ @Override
+ public <S> Collection<ServiceReference<S>> getServiceReferences(
Class<S> clazz, String filter)
throws InvalidSyntaxException
{
@@ -425,7 +448,8 @@ class BundleContextImpl implements BundleContext
: (Collection<ServiceReference<S>>) Arrays.asList(refs);
}
- public <S> S getService(ServiceReference<S> ref)
+ @Override
+ public <S> S getService(ServiceReference<S> ref)
{
checkValidity();
@@ -449,7 +473,8 @@ class BundleContextImpl implements BundleContext
return m_felix.getService(m_bundle, ref, false);
}
- public boolean ungetService(ServiceReference<?> ref)
+ @Override
+ public boolean ungetService(ServiceReference<?> ref)
{
checkValidity();
@@ -462,7 +487,8 @@ class BundleContextImpl implements BundleContext
return m_felix.ungetService(m_bundle, ref, null);
}
- public File getDataFile(String s)
+ @Override
+ public File getDataFile(String s)
{
checkValidity();
@@ -493,7 +519,8 @@ class BundleContextImpl implements BundleContext
/**
* @see org.osgi.framework.BundleContext#registerService(java.lang.Class,
org.osgi.framework.ServiceFactory, java.util.Dictionary)
*/
- public <S> ServiceRegistration<S> registerService(Class<S> clazz,
+ @Override
+ public <S> ServiceRegistration<S> registerService(Class<S> clazz,
ServiceFactory<S> factory, Dictionary<String, ?> properties)
{
return (ServiceRegistration<S>)
@@ -503,7 +530,8 @@ class BundleContextImpl implements BundleContext
/**
* @see
org.osgi.framework.BundleContext#getServiceObjects(org.osgi.framework.ServiceReference)
*/
- public <S> ServiceObjects<S> getServiceObjects(final ServiceReference<S>
ref)
+ @Override
+ public <S> ServiceObjects<S> getServiceObjects(final
ServiceReference<S> ref)
{
checkValidity();
@@ -535,7 +563,8 @@ class BundleContextImpl implements BundleContext
this.m_ref = ref;
}
- public S getService() {
+ @Override
+ public S getService() {
checkValidity();
// CONCURRENCY NOTE: This is a check-then-act situation,
@@ -553,7 +582,8 @@ class BundleContextImpl implements BundleContext
return m_felix.getService(m_bundle, m_ref, true);
}
- public void ungetService(final S srvObj)
+ @Override
+ public void ungetService(final S srvObj)
{
checkValidity();
@@ -564,7 +594,8 @@ class BundleContextImpl implements BundleContext
}
}
- public ServiceReference<S> getServiceReference()
+ @Override
+ public ServiceReference<S> getServiceReference()
{
return m_ref;
}
diff --git
a/framework/src/main/java/org/apache/felix/framework/BundleProtectionDomain.java
b/framework/src/main/java/org/apache/felix/framework/BundleProtectionDomain.java
index 2d319f2007..86c87c4c0c 100644
---
a/framework/src/main/java/org/apache/felix/framework/BundleProtectionDomain.java
+++
b/framework/src/main/java/org/apache/felix/framework/BundleProtectionDomain.java
@@ -108,7 +108,8 @@ public class BundleProtectionDomain extends ProtectionDomain
m_outputBuffer.m_outBuffer = null;
}
- public int read() throws IOException
+ @Override
+ public int read() throws IOException
{
if ((m_output == null) && (m_buffer == null))
{
@@ -211,17 +212,20 @@ public class BundleProtectionDomain extends
ProtectionDomain
{
ByteArrayOutputStream m_outBuffer = null;
- public void write(int b)
+ @Override
+ public void write(int b)
{
m_outBuffer.write(b);
}
- public void write(byte[] buffer) throws IOException
+ @Override
+ public void write(byte[] buffer) throws IOException
{
m_outBuffer.write(buffer);
}
- public void write(byte[] buffer, int offset, int length)
+ @Override
+ public void write(byte[] buffer, int offset, int length)
{
m_outBuffer.write(buffer, offset, length);
}
@@ -410,7 +414,8 @@ public class BundleProtectionDomain extends ProtectionDomain
return m_revision.get();
}
- public boolean implies(Permission permission)
+ @Override
+ public boolean implies(Permission permission)
{
Felix felix = getFramework();
return felix != null && felix.impliesBundlePermission(this,
permission, false);
@@ -452,12 +457,14 @@ public class BundleProtectionDomain extends
ProtectionDomain
return revision != null ? revision.getBundle().getFramework() : null;
}
- public int hashCode()
+ @Override
+ public int hashCode()
{
return m_hashCode;
}
- public boolean equals(Object other)
+ @Override
+ public boolean equals(Object other)
{
if ((other == null) || (other.getClass() !=
BundleProtectionDomain.class))
{
@@ -470,7 +477,8 @@ public class BundleProtectionDomain extends ProtectionDomain
return m_revision.get() == ((BundleProtectionDomain)
other).m_revision.get();
}
- public String toString()
+ @Override
+ public String toString()
{
return m_toString;
}
diff --git
a/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java
b/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java
index 6c59d4321b..3850e39a76 100644
--- a/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java
@@ -182,17 +182,20 @@ public class BundleRevisionImpl implements
BundleRevision, Resource
// BundleRevision methods.
//
- public String getSymbolicName()
+ @Override
+ public String getSymbolicName()
{
return m_symbolicName;
}
- public Version getVersion()
+ @Override
+ public Version getVersion()
{
return m_version;
}
- public List<Capability> getCapabilities(String namespace)
+ @Override
+ public List<Capability> getCapabilities(String namespace)
{
return asCapabilityList(getDeclaredCapabilities(namespace));
}
@@ -202,7 +205,8 @@ public class BundleRevisionImpl implements BundleRevision,
Resource
return reqs;
}
- public List<BundleCapability> getDeclaredCapabilities(String namespace)
+ @Override
+ public List<BundleCapability> getDeclaredCapabilities(String namespace)
{
List<BundleCapability> result = m_declaredCaps;
if (namespace != null)
@@ -219,7 +223,8 @@ public class BundleRevisionImpl implements BundleRevision,
Resource
return result;
}
- public List<Requirement> getRequirements(String namespace)
+ @Override
+ public List<Requirement> getRequirements(String namespace)
{
return asRequirementList(getDeclaredRequirements(namespace));
}
@@ -229,7 +234,8 @@ public class BundleRevisionImpl implements BundleRevision,
Resource
return reqs;
}
- public List<BundleRequirement> getDeclaredRequirements(String namespace)
+ @Override
+ public List<BundleRequirement> getDeclaredRequirements(String namespace)
{
List<BundleRequirement> result = m_declaredReqs;
if (namespace != null)
@@ -246,17 +252,20 @@ public class BundleRevisionImpl implements
BundleRevision, Resource
return result;
}
- public int getTypes()
+ @Override
+ public int getTypes()
{
return (getManifestVersion().equals("2") && m_isFragment) ?
BundleRevision.TYPE_FRAGMENT : 0;
}
- public BundleWiring getWiring()
+ @Override
+ public BundleWiring getWiring()
{
return m_wiring;
}
- public BundleImpl getBundle()
+ @Override
+ public BundleImpl getBundle()
{
return m_bundle;
}
diff --git
a/framework/src/main/java/org/apache/felix/framework/EntryFilterEnumeration.java
b/framework/src/main/java/org/apache/felix/framework/EntryFilterEnumeration.java
index 290de06f97..22f7104a96 100644
---
a/framework/src/main/java/org/apache/felix/framework/EntryFilterEnumeration.java
+++
b/framework/src/main/java/org/apache/felix/framework/EntryFilterEnumeration.java
@@ -87,12 +87,14 @@ class EntryFilterEnumeration implements Enumeration
findNext();
}
- public synchronized boolean hasMoreElements()
+ @Override
+ public synchronized boolean hasMoreElements()
{
return !m_nextEntries.isEmpty();
}
- public synchronized Object nextElement()
+ @Override
+ public synchronized Object nextElement()
{
if (m_nextEntries.isEmpty())
{
diff --git
a/framework/src/main/java/org/apache/felix/framework/ExportedPackageImpl.java
b/framework/src/main/java/org/apache/felix/framework/ExportedPackageImpl.java
index be2b1dbe0c..112ac190c2 100644
---
a/framework/src/main/java/org/apache/felix/framework/ExportedPackageImpl.java
+++
b/framework/src/main/java/org/apache/felix/framework/ExportedPackageImpl.java
@@ -48,7 +48,8 @@ class ExportedPackageImpl implements ExportedPackage
: (Version)
m_export.getAttributes().get(BundleCapabilityImpl.VERSION_ATTR);
}
- public Bundle getExportingBundle()
+ @Override
+ public Bundle getExportingBundle()
{
// If the package is stale, then return null per the spec.
if (m_exportingBundle.isStale())
@@ -58,7 +59,8 @@ class ExportedPackageImpl implements ExportedPackage
return m_exportingBundle;
}
- public Bundle[] getImportingBundles()
+ @Override
+ public Bundle[] getImportingBundles()
{
// If the package is stale, then return null per the spec.
if (m_exportingBundle.isStale())
@@ -69,27 +71,32 @@ class ExportedPackageImpl implements ExportedPackage
return set.toArray(new Bundle[set.size()]);
}
- public String getName()
+ @Override
+ public String getName()
{
return m_pkgName;
}
- public String getSpecificationVersion()
+ @Override
+ public String getSpecificationVersion()
{
return m_version.toString();
}
- public Version getVersion()
+ @Override
+ public Version getVersion()
{
return m_version;
}
- public boolean isRemovalPending()
+ @Override
+ public boolean isRemovalPending()
{
return m_exportingBundle.isRemovalPending();
}
- public String toString()
+ @Override
+ public String toString()
{
return m_pkgName + "; version=" + m_version;
}
diff --git
a/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java
b/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java
index 3fbec1ae07..7534ec33fe 100644
--- a/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java
+++ b/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java
@@ -847,28 +847,33 @@ class ExtensionManager implements Content
return wires;
}
- public void close()
+ @Override
+ public void close()
{
// Do nothing on close, since we have nothing open.
}
- public Enumeration getEntries()
+ @Override
+ public Enumeration getEntries()
{
return new Enumeration()
{
- public boolean hasMoreElements()
+ @Override
+ public boolean hasMoreElements()
{
return false;
}
- public Object nextElement() throws NoSuchElementException
+ @Override
+ public Object nextElement() throws
NoSuchElementException
{
throw new NoSuchElementException();
}
};
}
- public boolean hasEntry(String name)
+ @Override
+ public boolean hasEntry(String name)
{
return false;
}
@@ -879,27 +884,32 @@ class ExtensionManager implements Content
return false;
}
- public byte[] getEntryAsBytes(String name)
+ @Override
+ public byte[] getEntryAsBytes(String name)
{
return null;
}
- public InputStream getEntryAsStream(String name) throws IOException
+ @Override
+ public InputStream getEntryAsStream(String name) throws IOException
{
return null;
}
- public Content getEntryAsContent(String name)
+ @Override
+ public Content getEntryAsContent(String name)
{
return null;
}
- public String getEntryAsNativeLibrary(String name)
+ @Override
+ public String getEntryAsNativeLibrary(String name)
{
return null;
}
- public URL getEntryAsURL(String name)
+ @Override
+ public URL getEntryAsURL(String name)
{
return null;
}
diff --git
a/framework/src/main/java/org/apache/felix/framework/FakeURLStreamHandler.java
b/framework/src/main/java/org/apache/felix/framework/FakeURLStreamHandler.java
index 4f368afb10..f60dbd1754 100644
---
a/framework/src/main/java/org/apache/felix/framework/FakeURLStreamHandler.java
+++
b/framework/src/main/java/org/apache/felix/framework/FakeURLStreamHandler.java
@@ -34,7 +34,8 @@ import java.net.*;
**/
class FakeURLStreamHandler extends URLStreamHandler
{
- protected URLConnection openConnection(URL url) throws IOException
+ @Override
+ protected URLConnection openConnection(URL url) throws IOException
{
throw new IOException("FakeURLStreamHandler can not be used!");
}
diff --git a/framework/src/main/java/org/apache/felix/framework/FilterImpl.java
b/framework/src/main/java/org/apache/felix/framework/FilterImpl.java
index be932dc13d..5ab1a92144 100644
--- a/framework/src/main/java/org/apache/felix/framework/FilterImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/FilterImpl.java
@@ -51,7 +51,8 @@ public class FilterImpl implements Filter
}
}
- public boolean match(ServiceReference sr)
+ @Override
+ public boolean match(ServiceReference sr)
{
if (sr instanceof ServiceReferenceImpl)
{
@@ -63,32 +64,38 @@ public class FilterImpl implements Filter
}
}
- public boolean match(Dictionary<String, ? > dctnr)
+ @Override
+ public boolean match(Dictionary<String, ? > dctnr)
{
return CapabilitySet.matches(new WrapperCapability(dctnr, false),
m_filter);
}
- public boolean matchCase(Dictionary<String, ? > dctnr)
+ @Override
+ public boolean matchCase(Dictionary<String, ? > dctnr)
{
return CapabilitySet.matches(new WrapperCapability(dctnr, true),
m_filter);
}
- public boolean matches(Map<String, ?> map)
+ @Override
+ public boolean matches(Map<String, ?> map)
{
return CapabilitySet.matches(new WrapperCapability(map), m_filter);
}
- public boolean equals(Object o)
+ @Override
+ public boolean equals(Object o)
{
return toString().equals(o.toString());
}
- public int hashCode()
+ @Override
+ public int hashCode()
{
return toString().hashCode();
}
- public String toString()
+ @Override
+ public String toString()
{
return m_filter.toString();
}
@@ -186,27 +193,32 @@ public class FilterImpl implements Filter
}
}
- public int size()
+ @Override
+ public int size()
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public boolean isEmpty()
+ @Override
+ public boolean isEmpty()
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public boolean containsKey(Object o)
+ @Override
+ public boolean containsKey(Object o)
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public boolean containsValue(Object o)
+ @Override
+ public boolean containsValue(Object o)
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public Object get(Object o)
+ @Override
+ public Object get(Object o)
{
if (m_dict != null)
{
@@ -219,37 +231,44 @@ public class FilterImpl implements Filter
return null;
}
- public Object put(Object k, Object v)
+ @Override
+ public Object put(Object k, Object v)
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public Object remove(Object o)
+ @Override
+ public Object remove(Object o)
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public void putAll(Map map)
+ @Override
+ public void putAll(Map map)
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public void clear()
+ @Override
+ public void clear()
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public Set<Object> keySet()
+ @Override
+ public Set<Object> keySet()
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public Collection<Object> values()
+ @Override
+ public Collection<Object> values()
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public Set<Entry<Object, Object>> entrySet()
+ @Override
+ public Set<Entry<Object, Object>> entrySet()
{
return Collections.EMPTY_SET;
}
diff --git
a/framework/src/main/java/org/apache/felix/framework/FrameworkFactory.java
b/framework/src/main/java/org/apache/felix/framework/FrameworkFactory.java
index 938845f631..6529c8168c 100644
--- a/framework/src/main/java/org/apache/felix/framework/FrameworkFactory.java
+++ b/framework/src/main/java/org/apache/felix/framework/FrameworkFactory.java
@@ -25,7 +25,8 @@ import org.osgi.framework.launch.Framework;
public class FrameworkFactory implements
org.osgi.framework.launch.FrameworkFactory,
org.osgi.framework.connect.ConnectFrameworkFactory
{
- public Framework newFramework(Map configuration)
+ @Override
+ public Framework newFramework(Map configuration)
{
return new Felix(configuration);
}
diff --git
a/framework/src/main/java/org/apache/felix/framework/FrameworkStartLevelImpl.java
b/framework/src/main/java/org/apache/felix/framework/FrameworkStartLevelImpl.java
index 53a8d7e318..083ac36e02 100644
---
a/framework/src/main/java/org/apache/felix/framework/FrameworkStartLevelImpl.java
+++
b/framework/src/main/java/org/apache/felix/framework/FrameworkStartLevelImpl.java
@@ -93,17 +93,20 @@ class FrameworkStartLevelImpl implements
FrameworkStartLevel, Runnable
}
}
- public Bundle getBundle()
+ @Override
+ public Bundle getBundle()
{
return m_felix;
}
- public int getStartLevel()
+ @Override
+ public int getStartLevel()
{
return m_felix.getActiveStartLevel();
}
- public void setStartLevel(int startlevel, FrameworkListener... listeners)
+ @Override
+ public void setStartLevel(int startlevel, FrameworkListener...
listeners)
{
Object sm = System.getSecurityManager();
@@ -166,12 +169,14 @@ class FrameworkStartLevelImpl implements
FrameworkStartLevel, Runnable
}
}
- public int getInitialBundleStartLevel()
+ @Override
+ public int getInitialBundleStartLevel()
{
return m_felix.getInitialBundleStartLevel();
}
- public void setInitialBundleStartLevel(int startlevel)
+ @Override
+ public void setInitialBundleStartLevel(int startlevel)
{
Object sm = System.getSecurityManager();
@@ -197,17 +202,20 @@ class FrameworkStartLevelImpl implements
FrameworkStartLevel, Runnable
m_bundle = bundle;
}
- public Bundle getBundle()
+ @Override
+ public Bundle getBundle()
{
return m_bundle;
}
- public int getStartLevel()
+ @Override
+ public int getStartLevel()
{
return m_felix.getBundleStartLevel(m_bundle);
}
- public void setStartLevel(int startlevel)
+ @Override
+ public void setStartLevel(int startlevel)
{
Object sm = System.getSecurityManager();
@@ -239,18 +247,21 @@ class FrameworkStartLevelImpl implements
FrameworkStartLevel, Runnable
}
}
- public boolean isPersistentlyStarted()
+ @Override
+ public boolean isPersistentlyStarted()
{
return m_felix.isBundlePersistentlyStarted(m_bundle);
}
- public boolean isActivationPolicyUsed()
+ @Override
+ public boolean isActivationPolicyUsed()
{
return m_felix.isBundleActivationPolicyUsed(m_bundle);
}
}
- public void run()
+ @Override
+ public void run()
{
// This thread loops forever, thus it should
// be a daemon thread.
diff --git
a/framework/src/main/java/org/apache/felix/framework/FrameworkWiringImpl.java
b/framework/src/main/java/org/apache/felix/framework/FrameworkWiringImpl.java
index 44b0d51a17..80848fde9b 100644
---
a/framework/src/main/java/org/apache/felix/framework/FrameworkWiringImpl.java
+++
b/framework/src/main/java/org/apache/felix/framework/FrameworkWiringImpl.java
@@ -80,12 +80,14 @@ class FrameworkWiringImpl implements FrameworkWiring,
Runnable
}
}
- public Bundle getBundle()
+ @Override
+ public Bundle getBundle()
{
return m_felix;
}
- public void refreshBundles(Collection<Bundle> bundles,
FrameworkListener... listeners)
+ @Override
+ public void refreshBundles(Collection<Bundle> bundles,
FrameworkListener... listeners)
{
Object sm = System.getSecurityManager();
@@ -111,7 +113,8 @@ class FrameworkWiringImpl implements FrameworkWiring,
Runnable
}
}
- public boolean resolveBundles(Collection<Bundle> bundles)
+ @Override
+ public boolean resolveBundles(Collection<Bundle> bundles)
{
Object sm = System.getSecurityManager();
@@ -129,12 +132,14 @@ class FrameworkWiringImpl implements FrameworkWiring,
Runnable
return m_felix.resolveBundles(bundles);
}
- public Collection<Bundle> getRemovalPendingBundles()
+ @Override
+ public Collection<Bundle> getRemovalPendingBundles()
{
return m_felix.getRemovalPendingBundles();
}
- public Collection<Bundle> getDependencyClosure(Collection<Bundle> targets)
+ @Override
+ public Collection<Bundle> getDependencyClosure(Collection<Bundle>
targets)
{
return m_felix.getDependencyClosure(targets);
}
@@ -144,7 +149,8 @@ class FrameworkWiringImpl implements FrameworkWiring,
Runnable
* asynchronously; this is the run() method for the package
* refreshing thread.
**/
- public void run()
+ @Override
+ public void run()
{
// This thread loops forever, thus it should
// be a daemon thread.
@@ -195,7 +201,8 @@ class FrameworkWiringImpl implements FrameworkWiring,
Runnable
/**
* @see
org.osgi.framework.wiring.FrameworkWiring#findProviders(org.osgi.resource.Requirement)
*/
- public Collection<BundleCapability> findProviders(final Requirement
requirement)
+ @Override
+ public Collection<BundleCapability> findProviders(final Requirement
requirement)
{
return m_felix.findProviders(requirement);
}
diff --git a/framework/src/main/java/org/apache/felix/framework/Logger.java
b/framework/src/main/java/org/apache/felix/framework/Logger.java
index 944590b154..5d638a97e6 100644
--- a/framework/src/main/java/org/apache/felix/framework/Logger.java
+++ b/framework/src/main/java/org/apache/felix/framework/Logger.java
@@ -124,7 +124,8 @@ public class Logger extends org.apache.felix.resolver.Logger
doLog(level, s.toString(), throwable);
}
- protected void doLog(int level, String msg, Throwable throwable)
+ @Override
+ protected void doLog(int level, String msg, Throwable throwable)
{
if (m_logger != null)
{
diff --git
a/framework/src/main/java/org/apache/felix/framework/PackageAdminImpl.java
b/framework/src/main/java/org/apache/felix/framework/PackageAdminImpl.java
index f77b382565..84e593013c 100644
--- a/framework/src/main/java/org/apache/felix/framework/PackageAdminImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/PackageAdminImpl.java
@@ -36,7 +36,8 @@ import org.osgi.service.packageadmin.RequiredBundle;
public class PackageAdminImpl implements PackageAdmin
{
private static final Comparator COMPARATOR = new Comparator() {
- public int compare(Object o1, Object o2)
+ @Override
+ public int compare(Object o1, Object o2)
{
// Reverse arguments to sort in descending order.
return ((ExportedPackage) o2).getVersion().compareTo(
@@ -58,7 +59,8 @@ public class PackageAdminImpl implements PackageAdmin
* @param clazz the class for which to determine its associated bundle.
* @return the bundle associated with the specified class, otherwise null.
**/
- public Bundle getBundle(Class clazz)
+ @Override
+ public Bundle getBundle(Class clazz)
{
return m_felix.getBundle(clazz);
}
@@ -73,7 +75,8 @@ public class PackageAdminImpl implements PackageAdmin
* @param versionRange the target version range.
* @return an array of matching bundles sorted in descending version order.
**/
- public Bundle[] getBundles(String symbolicName, String versionRange)
+ @Override
+ public Bundle[] getBundles(String symbolicName, String versionRange)
{
VersionRange vr = (versionRange == null) ? null : new
VersionRange(versionRange);
Bundle[] bundles = m_felix.getBundles();
@@ -96,7 +99,8 @@ public class PackageAdminImpl implements PackageAdmin
}
bundles = (Bundle[]) list.toArray(new Bundle[list.size()]);
Arrays.sort(bundles,new Comparator() {
- public int compare(Object o1, Object o2)
+ @Override
+ public int compare(Object o1, Object o2)
{
Version v1 = ((Bundle)
o1).adapt(BundleRevision.class).getVersion();
Version v2 = ((Bundle)
o2).adapt(BundleRevision.class).getVersion();
@@ -107,7 +111,8 @@ public class PackageAdminImpl implements PackageAdmin
return bundles;
}
- public int getBundleType(Bundle bundle)
+ @Override
+ public int getBundleType(Bundle bundle)
{
Map headerMap = bundle.adapt(BundleRevisionImpl.class).getHeaders();
if (headerMap.containsKey(Constants.FRAGMENT_HOST))
@@ -125,7 +130,8 @@ public class PackageAdminImpl implements PackageAdmin
* @param name the name of the exported package to find.
* @return the exported package or null if no matching package was found.
**/
- public ExportedPackage getExportedPackage(String name)
+ @Override
+ public ExportedPackage getExportedPackage(String name)
{
// Get all versions of the exported package.
ExportedPackage[] pkgs = m_felix.getExportedPackages(name);
@@ -140,7 +146,8 @@ public class PackageAdminImpl implements PackageAdmin
return pkgs[0];
}
- public ExportedPackage[] getExportedPackages(String name)
+ @Override
+ public ExportedPackage[] getExportedPackages(String name)
{
ExportedPackage[] pkgs = m_felix.getExportedPackages(name);
return ((pkgs == null) || pkgs.length == 0) ? null : pkgs;
@@ -153,13 +160,15 @@ public class PackageAdminImpl implements PackageAdmin
* @return an array of packages exported by the bundle or null if the
* bundle does not export any packages.
**/
- public ExportedPackage[] getExportedPackages(Bundle bundle)
+ @Override
+ public ExportedPackage[] getExportedPackages(Bundle bundle)
{
ExportedPackage[] pkgs = m_felix.getExportedPackages(bundle);
return ((pkgs == null) || pkgs.length == 0) ? null : pkgs;
}
- public Bundle[] getFragments(Bundle bundle)
+ @Override
+ public Bundle[] getFragments(Bundle bundle)
{
// If the bundle is not a fragment, then return its fragments.
if ((getBundleType(bundle) & BUNDLE_TYPE_FRAGMENT) == 0)
@@ -191,7 +200,8 @@ public class PackageAdminImpl implements PackageAdmin
return null;
}
- public Bundle[] getHosts(Bundle bundle)
+ @Override
+ public Bundle[] getHosts(Bundle bundle)
{
// If the bundle is a fragment, return its hosts
if ((getBundleType(bundle) & BUNDLE_TYPE_FRAGMENT) != 0)
@@ -226,7 +236,8 @@ public class PackageAdminImpl implements PackageAdmin
return null;
}
- public RequiredBundle[] getRequiredBundles(String symbolicName)
+ @Override
+ public RequiredBundle[] getRequiredBundles(String symbolicName)
{
List list = new ArrayList();
for (Bundle bundle : m_felix.getBundles())
@@ -249,7 +260,8 @@ public class PackageAdminImpl implements PackageAdmin
* @param bundles array of bundles to refresh or <tt>null</tt> to refresh
* any bundles in need of refreshing.
**/
- public void refreshPackages(Bundle[] bundles)
+ @Override
+ public void refreshPackages(Bundle[] bundles)
throws SecurityException
{
List<Bundle> list = (bundles == null)
@@ -258,7 +270,8 @@ public class PackageAdminImpl implements PackageAdmin
m_felix.adapt(FrameworkWiring.class).refreshBundles(list);
}
- public boolean resolveBundles(Bundle[] bundles)
+ @Override
+ public boolean resolveBundles(Bundle[] bundles)
{
List<Bundle> list = (bundles == null)
? null
diff --git
a/framework/src/main/java/org/apache/felix/framework/RequiredBundleImpl.java
b/framework/src/main/java/org/apache/felix/framework/RequiredBundleImpl.java
index 855223b07b..a2312b3864 100644
--- a/framework/src/main/java/org/apache/felix/framework/RequiredBundleImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/RequiredBundleImpl.java
@@ -36,17 +36,20 @@ class RequiredBundleImpl implements RequiredBundle
m_bundle = bundle;
}
- public String getSymbolicName()
+ @Override
+ public String getSymbolicName()
{
return m_bundle.getSymbolicName();
}
- public Bundle getBundle()
+ @Override
+ public Bundle getBundle()
{
return m_bundle;
}
- public Bundle[] getRequiringBundles()
+ @Override
+ public Bundle[] getRequiringBundles()
{
// If the package is stale, then return null per the spec.
if (m_bundle.isStale())
@@ -57,17 +60,20 @@ class RequiredBundleImpl implements RequiredBundle
return set.toArray(new Bundle[set.size()]);
}
- public Version getVersion()
+ @Override
+ public Version getVersion()
{
return m_bundle.getVersion();
}
- public boolean isRemovalPending()
+ @Override
+ public boolean isRemovalPending()
{
return m_bundle.isRemovalPending();
}
- public String toString()
+ @Override
+ public String toString()
{
if (m_toString == null)
{
diff --git
a/framework/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java
b/framework/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java
index 6b7c3e08a1..6dff959f19 100644
---
a/framework/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java
+++
b/framework/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java
@@ -102,7 +102,8 @@ class ServiceRegistrationImpl implements ServiceRegistration
m_svcObj = null;
}
- public synchronized ServiceReference getReference()
+ @Override
+ public synchronized ServiceReference getReference()
{
// Make sure registration is valid.
if (!isValid())
@@ -113,7 +114,8 @@ class ServiceRegistrationImpl implements ServiceRegistration
return m_ref;
}
- public void setProperties(Dictionary dict)
+ @Override
+ public void setProperties(Dictionary dict)
{
Map oldProps;
synchronized (this)
@@ -133,7 +135,8 @@ class ServiceRegistrationImpl implements ServiceRegistration
m_registry.servicePropertiesModified(this, new
MapToDictionary(oldProps));
}
- public void unregister()
+ @Override
+ public void unregister()
{
synchronized (this)
{
@@ -408,7 +411,8 @@ class ServiceRegistrationImpl implements ServiceRegistration
m_svcObj = svcObj;
}
- public Object run() throws Exception
+ @Override
+ public Object run() throws Exception
{
if (m_svcObj == null)
{
@@ -479,24 +483,28 @@ class ServiceRegistrationImpl implements
ServiceRegistration
// ServiceReference methods.
//
- public Object getProperty(String s)
+ @Override
+ public Object getProperty(String s)
{
return ServiceRegistrationImpl.this.getProperty(s);
}
- public String[] getPropertyKeys()
+ @Override
+ public String[] getPropertyKeys()
{
return ServiceRegistrationImpl.this.getPropertyKeys();
}
- public Bundle getBundle()
+ @Override
+ public Bundle getBundle()
{
// The spec says that this should return null if
// the service is unregistered.
return (isValid()) ? m_bundle : null;
}
- public Bundle[] getUsingBundles()
+ @Override
+ public Bundle[] getUsingBundles()
{
return ServiceRegistrationImpl.this.getUsingBundles();
}
@@ -516,7 +524,8 @@ class ServiceRegistrationImpl implements ServiceRegistration
return oc;
}
- public boolean isAssignableTo(Bundle requester, String className)
+ @Override
+ public boolean isAssignableTo(Bundle requester, String
className)
{
// Always return true if the requester is the same as the provider.
if (requester == m_bundle)
@@ -659,7 +668,8 @@ class ServiceRegistrationImpl implements ServiceRegistration
return allow;
}
- public int compareTo(Object reference)
+ @Override
+ public int compareTo(Object reference)
{
ServiceReference other = (ServiceReference) reference;
@@ -717,62 +727,74 @@ class ServiceRegistrationImpl implements
ServiceRegistration
private class ServiceReferenceMap implements Map
{
- public int size()
+ @Override
+ public int size()
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public boolean isEmpty()
+ @Override
+ public boolean isEmpty()
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public boolean containsKey(Object o)
+ @Override
+ public boolean containsKey(Object o)
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public boolean containsValue(Object o)
+ @Override
+ public boolean containsValue(Object o)
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public Object get(Object o)
+ @Override
+ public Object get(Object o)
{
return ServiceRegistrationImpl.this.getProperty((String) o);
}
- public Object put(Object k, Object v)
+ @Override
+ public Object put(Object k, Object v)
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public Object remove(Object o)
+ @Override
+ public Object remove(Object o)
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public void putAll(Map map)
+ @Override
+ public void putAll(Map map)
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public void clear()
+ @Override
+ public void clear()
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public Set<Object> keySet()
+ @Override
+ public Set<Object> keySet()
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public Collection<Object> values()
+ @Override
+ public Collection<Object> values()
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public Set<Entry<Object, Object>> entrySet()
+ @Override
+ public Set<Entry<Object, Object>> entrySet()
{
return Collections.EMPTY_SET;
}
diff --git
a/framework/src/main/java/org/apache/felix/framework/StartLevelImpl.java
b/framework/src/main/java/org/apache/felix/framework/StartLevelImpl.java
index 274ef7e825..adbd0d0621 100644
--- a/framework/src/main/java/org/apache/felix/framework/StartLevelImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/StartLevelImpl.java
@@ -40,7 +40,8 @@ public class StartLevelImpl implements StartLevel
/* (non-Javadoc)
* @see org.osgi.service.startlevel.StartLevel#getStartLevel()
**/
- public int getStartLevel()
+ @Override
+ public int getStartLevel()
{
return m_felix.adapt(FrameworkStartLevel.class).getStartLevel();
}
@@ -48,7 +49,8 @@ public class StartLevelImpl implements StartLevel
/* (non-Javadoc)
* @see org.osgi.service.startlevel.StartLevel#setStartLevel(int)
**/
- public void setStartLevel(int startlevel)
+ @Override
+ public void setStartLevel(int startlevel)
{
m_felix.adapt(FrameworkStartLevel.class).setStartLevel(startlevel);
}
@@ -56,7 +58,8 @@ public class StartLevelImpl implements StartLevel
/* (non-Javadoc)
* @see
org.osgi.service.startlevel.StartLevel#getBundleStartLevel(org.osgi.framework.Bundle)
**/
- public int getBundleStartLevel(Bundle bundle)
+ @Override
+ public int getBundleStartLevel(Bundle bundle)
{
return bundle.adapt(BundleStartLevel.class).getStartLevel();
}
@@ -64,7 +67,8 @@ public class StartLevelImpl implements StartLevel
/* (non-Javadoc)
* @see
org.osgi.service.startlevel.StartLevel#setBundleStartLevel(org.osgi.framework.Bundle,
int)
**/
- public void setBundleStartLevel(Bundle bundle, int startlevel)
+ @Override
+ public void setBundleStartLevel(Bundle bundle, int startlevel)
{
bundle.adapt(BundleStartLevel.class).setStartLevel(startlevel);
}
@@ -72,7 +76,8 @@ public class StartLevelImpl implements StartLevel
/* (non-Javadoc)
* @see org.osgi.service.startlevel.StartLevel#getInitialBundleStartLevel()
**/
- public int getInitialBundleStartLevel()
+ @Override
+ public int getInitialBundleStartLevel()
{
return
m_felix.adapt(FrameworkStartLevel.class).getInitialBundleStartLevel();
}
@@ -80,7 +85,8 @@ public class StartLevelImpl implements StartLevel
/* (non-Javadoc)
* @see
org.osgi.service.startlevel.StartLevel#setInitialBundleStartLevel(int)
**/
- public void setInitialBundleStartLevel(int startlevel)
+ @Override
+ public void setInitialBundleStartLevel(int startlevel)
{
m_felix.adapt(FrameworkStartLevel.class).setInitialBundleStartLevel(startlevel);
}
@@ -88,7 +94,8 @@ public class StartLevelImpl implements StartLevel
/* (non-Javadoc)
* @see
org.osgi.service.startlevel.StartLevel#isBundlePersistentlyStarted(org.osgi.framework.Bundle)
**/
- public boolean isBundlePersistentlyStarted(Bundle bundle)
+ @Override
+ public boolean isBundlePersistentlyStarted(Bundle bundle)
{
return bundle.adapt(BundleStartLevel.class).isPersistentlyStarted();
}
@@ -96,6 +103,7 @@ public class StartLevelImpl implements StartLevel
/* (non-Javadoc)
* @see
org.osgi.service.startlevel.StartLevel#isBundleActivationPolicyUsed(org.osgi.framework.Bundle)
**/
+ @Override
public boolean isBundleActivationPolicyUsed(Bundle bundle)
{
return bundle.adapt(BundleStartLevel.class).isActivationPolicyUsed();
diff --git
a/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java
b/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java
index f586696c7c..746286b740 100644
--- a/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java
+++ b/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java
@@ -138,7 +138,8 @@ class StatefulResolver
{
return new Executor()
{
- public void execute(Runnable command)
+ @Override
+ public void execute(Runnable command)
{
command.run();
}
diff --git
a/framework/src/main/java/org/apache/felix/framework/URLHandlers.java
b/framework/src/main/java/org/apache/felix/framework/URLHandlers.java
index 86bbd411ec..74049d0c2e 100644
--- a/framework/src/main/java/org/apache/felix/framework/URLHandlers.java
+++ b/framework/src/main/java/org/apache/felix/framework/URLHandlers.java
@@ -520,7 +520,8 @@ class URLHandlers implements URLStreamHandlerFactory,
ContentHandlerFactory
* @param protocol the protocol for which a stream handler should be
returned.
* @return a stream handler proxy for the specified protocol.
**/
- public URLStreamHandler createURLStreamHandler(String protocol)
+ @Override
+ public URLStreamHandler createURLStreamHandler(String protocol)
{
// See if there is a cached stream handler.
// IMPLEMENTATION NOTE: Caching is not strictly necessary for
@@ -577,7 +578,8 @@ class URLHandlers implements URLStreamHandlerFactory,
ContentHandlerFactory
* @param mimeType the mime type for which a content handler should be
returned.
* @return a content handler proxy for the specified mime type.
**/
- public ContentHandler createContentHandler(String mimeType)
+ @Override
+ public ContentHandler createContentHandler(String mimeType)
{
// See if there is a cached stream handler.
// IMPLEMENTATION NOTE: Caching is not strictly necessary for
diff --git
a/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleStreamHandler.java
b/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleStreamHandler.java
index b8801b8fc1..a48a2bb971 100644
---
a/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleStreamHandler.java
+++
b/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleStreamHandler.java
@@ -46,7 +46,8 @@ class URLHandlersBundleStreamHandler extends URLStreamHandler
m_action = action;
}
- protected URLConnection openConnection(URL url) throws IOException
+ @Override
+ protected URLConnection openConnection(URL url) throws IOException
{
if (!"felix".equals(url.getAuthority()))
{
@@ -86,7 +87,8 @@ class URLHandlersBundleStreamHandler extends URLStreamHandler
throw new IOException("No framework context found");
}
- protected void parseURL(URL u, String spec, int start, int limit)
+ @Override
+ protected void parseURL(URL u, String spec, int start, int limit)
{
super.parseURL(u, spec, start, limit);
@@ -96,7 +98,8 @@ class URLHandlersBundleStreamHandler extends URLStreamHandler
}
}
- protected String toExternalForm(URL u)
+ @Override
+ protected String toExternalForm(URL u)
{
StringBuilder result = new StringBuilder();
result.append(u.getProtocol());
@@ -121,7 +124,8 @@ class URLHandlersBundleStreamHandler extends
URLStreamHandler
return result.toString();
}
- protected java.net.InetAddress getHostAddress(URL u)
+ @Override
+ protected java.net.InetAddress getHostAddress(URL u)
{
return null;
}
diff --git
a/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java
b/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java
index 164d4d2005..9fb578826c 100644
---
a/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java
+++
b/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java
@@ -160,7 +160,8 @@ class URLHandlersBundleURLConnection extends URLConnection
m_path = path;
}
- public synchronized void connect() throws IOException
+ @Override
+ public synchronized void connect() throws IOException
{
if (!connected)
{
@@ -177,7 +178,8 @@ class URLHandlersBundleURLConnection extends URLConnection
}
}
- public InputStream getInputStream()
+ @Override
+ public InputStream getInputStream()
throws IOException
{
connect();
@@ -185,12 +187,14 @@ class URLHandlersBundleURLConnection extends URLConnection
return m_is;
}
- public int getContentLength()
+ @Override
+ public int getContentLength()
{
return (int) getContentLengthLong();
}
- public long getContentLengthLong()
+ @Override
+ public long getContentLengthLong()
{
try
{
@@ -204,7 +208,8 @@ class URLHandlersBundleURLConnection extends URLConnection
return m_contentLength;
}
- public long getLastModified()
+ @Override
+ public long getLastModified()
{
try
{
@@ -225,7 +230,8 @@ class URLHandlersBundleURLConnection extends URLConnection
}
}
- public String getContentType()
+ @Override
+ public String getContentType()
{
try
{
@@ -239,7 +245,8 @@ class URLHandlersBundleURLConnection extends URLConnection
return m_contentType;
}
- public Permission getPermission()
+ @Override
+ public Permission getPermission()
{
// TODO: SECURITY - This should probably return a FilePermission
// to access the bundle JAR file, but we don't have the
diff --git
a/framework/src/main/java/org/apache/felix/framework/URLHandlersContentHandlerProxy.java
b/framework/src/main/java/org/apache/felix/framework/URLHandlersContentHandlerProxy.java
index 5407489c70..13f934deaa 100644
---
a/framework/src/main/java/org/apache/felix/framework/URLHandlersContentHandlerProxy.java
+++
b/framework/src/main/java/org/apache/felix/framework/URLHandlersContentHandlerProxy.java
@@ -86,7 +86,8 @@ class URLHandlersContentHandlerProxy extends ContentHandler
// ContentHandler interface method.
//
- public Object getContent(URLConnection urlc) throws IOException
+ @Override
+ public Object getContent(URLConnection urlc) throws IOException
{
ContentHandler svc = getContentHandlerService();
if (svc == null)
diff --git
a/framework/src/main/java/org/apache/felix/framework/URLHandlersStreamHandlerProxy.java
b/framework/src/main/java/org/apache/felix/framework/URLHandlersStreamHandlerProxy.java
index 3ecc2ea2e5..680616178d 100644
---
a/framework/src/main/java/org/apache/felix/framework/URLHandlersStreamHandlerProxy.java
+++
b/framework/src/main/java/org/apache/felix/framework/URLHandlersStreamHandlerProxy.java
@@ -139,7 +139,8 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
//
// URLStreamHandler interface methods.
//
- protected boolean equals(URL url1, URL url2)
+ @Override
+ protected boolean equals(URL url1, URL url2)
{
Object svc = getStreamHandlerService();
if (svc == null)
@@ -161,7 +162,8 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
}
}
- protected int getDefaultPort()
+ @Override
+ protected int getDefaultPort()
{
Object svc = getStreamHandlerService();
if (svc == null)
@@ -182,7 +184,8 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
}
}
- protected InetAddress getHostAddress(URL url)
+ @Override
+ protected InetAddress getHostAddress(URL url)
{
Object svc = getStreamHandlerService();
if (svc == null)
@@ -204,7 +207,8 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
}
}
- protected int hashCode(URL url)
+ @Override
+ protected int hashCode(URL url)
{
Object svc = getStreamHandlerService();
if (svc == null)
@@ -226,7 +230,8 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
}
}
- protected boolean hostsEqual(URL url1, URL url2)
+ @Override
+ protected boolean hostsEqual(URL url1, URL url2)
{
Object svc = getStreamHandlerService();
if (svc == null)
@@ -248,7 +253,8 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
}
}
- protected URLConnection openConnection(URL url) throws IOException
+ @Override
+ protected URLConnection openConnection(URL url) throws IOException
{
Object svc = getStreamHandlerService();
if (svc == null)
@@ -301,7 +307,8 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
}
}
- protected URLConnection openConnection(URL url, java.net.Proxy proxy)
throws IOException
+ @Override
+ protected URLConnection openConnection(URL url, java.net.Proxy proxy)
throws IOException
{
Object svc = getStreamHandlerService();
if (svc == null)
@@ -353,7 +360,8 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
// method. This can happen do to some difference between gnu/classpath and
sun jvms
// For more see inside the method.
private static final ThreadLocal m_loopCheck = new ThreadLocal();
- protected void parseURL(URL url, String spec, int start, int limit)
+ @Override
+ protected void parseURL(URL url, String spec, int start, int limit)
{
Object svc = getStreamHandlerService();
if (svc == null)
@@ -422,7 +430,8 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
}
}
- protected boolean sameFile(URL url1, URL url2)
+ @Override
+ protected boolean sameFile(URL url1, URL url2)
{
Object svc = getStreamHandlerService();
if (svc == null)
@@ -445,20 +454,23 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
}
}
- public void setURL(
+ @Override
+ public void setURL(
URL url, String protocol, String host, int port, String authority,
String userInfo, String path, String query, String ref)
{
super.setURL(url, protocol, host, port, authority, userInfo, path,
query, ref);
}
- public void setURL(
+ @Override
+ public void setURL(
URL url, String protocol, String host, int port, String file, String
ref)
{
super.setURL(url, protocol, host, port, file, ref);
}
- protected String toExternalForm(URL url)
+ @Override
+ protected String toExternalForm(URL url)
{
return toExternalForm(url, getStreamHandlerService());
}
@@ -611,7 +623,8 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
}
}
- public Object invoke(Object obj, Method method, Object[] params)
+ @Override
+ public Object invoke(Object obj, Method method, Object[] params)
throws Throwable
{
Class[] types = method.getParameterTypes();
diff --git
a/framework/src/main/java/org/apache/felix/framework/WovenClassImpl.java
b/framework/src/main/java/org/apache/felix/framework/WovenClassImpl.java
index d59aca3bd7..57ba72385a 100644
--- a/framework/src/main/java/org/apache/felix/framework/WovenClassImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/WovenClassImpl.java
@@ -68,7 +68,8 @@ class WovenClassImpl implements WovenClass, List<String>
m_definedClass = definedClass;
}
- public synchronized byte[] getBytes()
+ @Override
+ public synchronized byte[] getBytes()
{
SecurityManager sm = System.getSecurityManager();
if (sm != null)
@@ -85,7 +86,8 @@ class WovenClassImpl implements WovenClass, List<String>
return bytes;
}
- public synchronized void setBytes(byte[] bytes)
+ @Override
+ public synchronized void setBytes(byte[] bytes)
{
SecurityManager sm = System.getSecurityManager();
if (sm != null)
@@ -108,33 +110,39 @@ class WovenClassImpl implements WovenClass, List<String>
return m_imports;
}
- public synchronized List<String> getDynamicImports()
+ @Override
+ public synchronized List<String> getDynamicImports()
{
return this;
}
- public synchronized boolean isWeavingComplete()
+ @Override
+ public synchronized boolean isWeavingComplete()
{
return m_isComplete;
}
- public String getClassName()
+ @Override
+ public String getClassName()
{
return m_className;
}
- public ProtectionDomain getProtectionDomain()
+ @Override
+ public ProtectionDomain getProtectionDomain()
{
return ((BundleImpl) m_wiring.getRevision().getBundle())
.getProtectionDomain();
}
- public synchronized Class<?> getDefinedClass()
+ @Override
+ public synchronized Class<?> getDefinedClass()
{
return m_definedClass;
}
- public BundleWiring getBundleWiring()
+ @Override
+ public BundleWiring getBundleWiring()
{
return m_wiring;
}
@@ -146,37 +154,44 @@ class WovenClassImpl implements WovenClass, List<String>
// but since it will only ever be used for this purpose it didn't
// appear to make much sense to introduce another type for it.
- public synchronized int size()
+ @Override
+ public synchronized int size()
{
return m_imports.size();
}
- public synchronized boolean isEmpty()
+ @Override
+ public synchronized boolean isEmpty()
{
return m_imports.isEmpty();
}
- public synchronized boolean contains(Object o)
+ @Override
+ public synchronized boolean contains(Object o)
{
return m_imports.contains(o);
}
- public synchronized Iterator<String> iterator()
+ @Override
+ public synchronized Iterator<String> iterator()
{
return m_imports.iterator();
}
- public synchronized Object[] toArray()
+ @Override
+ public synchronized Object[] toArray()
{
return m_imports.toArray();
}
- public synchronized <T> T[] toArray(T[] ts)
+ @Override
+ public synchronized <T> T[] toArray(T[] ts)
{
return m_imports.toArray(ts);
}
- public synchronized boolean add(String s)
+ @Override
+ public synchronized boolean add(String s)
{
SecurityManager sm = System.getSecurityManager();
if (sm != null)
@@ -211,7 +226,8 @@ class WovenClassImpl implements WovenClass, List<String>
}
}
- public synchronized boolean remove(Object o)
+ @Override
+ public synchronized boolean remove(Object o)
{
SecurityManager sm = System.getSecurityManager();
if (sm != null)
@@ -222,12 +238,14 @@ class WovenClassImpl implements WovenClass, List<String>
return m_imports.remove(o);
}
- public synchronized boolean containsAll(Collection<?> collection)
+ @Override
+ public synchronized boolean containsAll(Collection<?> collection)
{
return m_imports.containsAll(collection);
}
- public synchronized boolean addAll(Collection<? extends String> collection)
+ @Override
+ public synchronized boolean addAll(Collection<? extends String>
collection)
{
SecurityManager sm = System.getSecurityManager();
if (sm != null)
@@ -251,7 +269,8 @@ class WovenClassImpl implements WovenClass, List<String>
return m_imports.addAll(collection);
}
- public synchronized boolean addAll(int i,
+ @Override
+ public synchronized boolean addAll(int i,
Collection<? extends String> collection)
{
SecurityManager sm = System.getSecurityManager();
@@ -276,7 +295,8 @@ class WovenClassImpl implements WovenClass, List<String>
return m_imports.addAll(i, collection);
}
- public synchronized boolean removeAll(Collection<?> collection)
+ @Override
+ public synchronized boolean removeAll(Collection<?> collection)
{
SecurityManager sm = System.getSecurityManager();
if (sm != null)
@@ -287,7 +307,8 @@ class WovenClassImpl implements WovenClass, List<String>
return m_imports.removeAll(collection);
}
- public synchronized boolean retainAll(Collection<?> collection)
+ @Override
+ public synchronized boolean retainAll(Collection<?> collection)
{
SecurityManager sm = System.getSecurityManager();
if (sm != null)
@@ -298,7 +319,8 @@ class WovenClassImpl implements WovenClass, List<String>
return m_imports.retainAll(collection);
}
- public synchronized void clear()
+ @Override
+ public synchronized void clear()
{
SecurityManager sm = System.getSecurityManager();
if (sm != null)
@@ -309,12 +331,14 @@ class WovenClassImpl implements WovenClass, List<String>
m_imports.clear();
}
- public synchronized String get(int i)
+ @Override
+ public synchronized String get(int i)
{
return m_imports.get(i);
}
- public synchronized String set(int i, String s)
+ @Override
+ public synchronized String set(int i, String s)
{
SecurityManager sm = System.getSecurityManager();
if (sm != null)
@@ -335,7 +359,8 @@ class WovenClassImpl implements WovenClass, List<String>
return m_imports.set(i, s);
}
- public synchronized void add(int i, String s)
+ @Override
+ public synchronized void add(int i, String s)
{
SecurityManager sm = System.getSecurityManager();
if (sm != null)
@@ -357,7 +382,8 @@ class WovenClassImpl implements WovenClass, List<String>
m_imports.add(i, s);
}
- public synchronized String remove(int i)
+ @Override
+ public synchronized String remove(int i)
{
SecurityManager sm = System.getSecurityManager();
if (sm != null)
@@ -368,27 +394,32 @@ class WovenClassImpl implements WovenClass, List<String>
return m_imports.remove(i);
}
- public synchronized int indexOf(Object o)
+ @Override
+ public synchronized int indexOf(Object o)
{
return m_imports.indexOf(o);
}
- public synchronized int lastIndexOf(Object o)
+ @Override
+ public synchronized int lastIndexOf(Object o)
{
return m_imports.lastIndexOf(o);
}
- public synchronized ListIterator<String> listIterator()
+ @Override
+ public synchronized ListIterator<String> listIterator()
{
return m_imports.listIterator();
}
- public synchronized ListIterator<String> listIterator(int i)
+ @Override
+ public synchronized ListIterator<String> listIterator(int i)
{
return m_imports.listIterator(i);
}
- public synchronized List<String> subList(int i, int i1)
+ @Override
+ public synchronized List<String> subList(int i, int i1)
{
return m_imports.subList(i, i1);
}
@@ -409,7 +440,8 @@ class WovenClassImpl implements WovenClass, List<String>
*
* @see org.osgi.framework.hooks.weaving.WovenClass#getState()
*/
- public synchronized int getState()
+ @Override
+ public synchronized int getState()
{
return m_state;
}
diff --git
a/framework/src/main/java/org/apache/felix/framework/cache/ContentDirectoryContent.java
b/framework/src/main/java/org/apache/felix/framework/cache/ContentDirectoryContent.java
index 167327089a..4a62b73821 100644
---
a/framework/src/main/java/org/apache/felix/framework/cache/ContentDirectoryContent.java
+++
b/framework/src/main/java/org/apache/felix/framework/cache/ContentDirectoryContent.java
@@ -37,7 +37,8 @@ public class ContentDirectoryContent implements Content
? path + "/" : path;
}
- public void close()
+ @Override
+ public void close()
{
// We do not actually close the associated content
// from which we are filtering our directory because
@@ -45,7 +46,8 @@ public class ContentDirectoryContent implements Content
// the owner of that content.
}
- public boolean hasEntry(String name) throws IllegalStateException
+ @Override
+ public boolean hasEntry(String name) throws IllegalStateException
{
name = getName(name);
@@ -60,20 +62,23 @@ public class ContentDirectoryContent implements Content
return m_content.isDirectory(m_rootPath + name);
}
- public Enumeration<String> getEntries()
+ @Override
+ public Enumeration<String> getEntries()
{
Enumeration<String> result = new
EntriesEnumeration(m_content.getEntries(), m_rootPath);
return result.hasMoreElements() ? result : null;
}
- public byte[] getEntryAsBytes(String name) throws IllegalStateException
+ @Override
+ public byte[] getEntryAsBytes(String name) throws IllegalStateException
{
name = getName(name);
return m_content.getEntryAsBytes(m_rootPath + name);
}
- public InputStream getEntryAsStream(String name)
+ @Override
+ public InputStream getEntryAsStream(String name)
throws IllegalStateException, IOException
{
name = getName(name);
@@ -89,7 +94,8 @@ public class ContentDirectoryContent implements Content
return name;
}
- public URL getEntryAsURL(String name)
+ @Override
+ public URL getEntryAsURL(String name)
{
return m_content.getEntryAsURL(m_rootPath + name);
}
@@ -102,21 +108,24 @@ public class ContentDirectoryContent implements Content
return m_content.getContentTime(m_rootPath + name);
}
- public Content getEntryAsContent(String name)
+ @Override
+ public Content getEntryAsContent(String name)
{
name = getName(name);
return m_content.getEntryAsContent(m_rootPath + name);
}
- public String getEntryAsNativeLibrary(String name)
+ @Override
+ public String getEntryAsNativeLibrary(String name)
{
name = getName(name);
return m_content.getEntryAsNativeLibrary(m_rootPath + name);
}
- public String toString()
+ @Override
+ public String toString()
{
return "CONTENT DIR " + m_rootPath + " (" + m_content + ")";
}
@@ -134,12 +143,14 @@ public class ContentDirectoryContent implements Content
m_nextEntry = findNextEntry();
}
- public synchronized boolean hasMoreElements()
+ @Override
+ public synchronized boolean hasMoreElements()
{
return (m_nextEntry != null);
}
- public synchronized Object nextElement()
+ @Override
+ public synchronized Object nextElement()
{
if (m_nextEntry == null)
{
diff --git
a/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java
b/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java
index 73ad522b1c..b5187d131d 100644
---
a/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java
+++
b/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java
@@ -76,12 +76,14 @@ public class DirectoryContent implements Content
return m_dir;
}
- public void close()
+ @Override
+ public void close()
{
// Nothing to clean up.
}
- public boolean hasEntry(String name) throws IllegalStateException
+ @Override
+ public boolean hasEntry(String name) throws IllegalStateException
{
name = getName(name);
@@ -122,7 +124,8 @@ public class DirectoryContent implements Content
return BundleCache.getSecureAction().isFileDirectory(file);
}
- public Enumeration<String> getEntries()
+ @Override
+ public Enumeration<String> getEntries()
{
// Wrap entries enumeration to filter non-matching entries.
Enumeration<String> e = new EntriesEnumeration(m_dir);
@@ -131,7 +134,8 @@ public class DirectoryContent implements Content
return (e.hasMoreElements()) ? e : null;
}
- public byte[] getEntryAsBytes(String name) throws IllegalStateException
+ @Override
+ public byte[] getEntryAsBytes(String name) throws IllegalStateException
{
name = getName(name);
@@ -152,7 +156,8 @@ public class DirectoryContent implements Content
}
}
- public InputStream getEntryAsStream(String name)
+ @Override
+ public InputStream getEntryAsStream(String name)
throws IllegalStateException, IOException
{
name = getName(name);
@@ -195,7 +200,8 @@ public class DirectoryContent implements Content
return result;
}
- public URL getEntryAsURL(String name)
+ @Override
+ public URL getEntryAsURL(String name)
{
name = getName(name);
@@ -231,7 +237,8 @@ public class DirectoryContent implements Content
return BundleCache.getSecureAction().getLastModified(file);
}
- public Content getEntryAsContent(String entryName)
+ @Override
+ public Content getEntryAsContent(String entryName)
{
// If the entry name refers to the content itself, then
// just return it immediately.
@@ -288,7 +295,8 @@ public class DirectoryContent implements Content
}
// TODO: SECURITY - This will need to consider security.
- public String getEntryAsNativeLibrary(String entryName)
+ @Override
+ public String getEntryAsNativeLibrary(String entryName)
{
// Return result.
String result = null;
@@ -398,7 +406,8 @@ public class DirectoryContent implements Content
return result;
}
- public String toString()
+ @Override
+ public String toString()
{
return "DIRECTORY " + m_dir;
}
@@ -415,12 +424,14 @@ public class DirectoryContent implements Content
m_children = listFilesRecursive(m_dir);
}
- public synchronized boolean hasMoreElements()
+ @Override
+ public synchronized boolean hasMoreElements()
{
return (m_children != null) && (m_counter < m_children.length);
}
- public synchronized Object nextElement()
+ @Override
+ public synchronized Object nextElement()
{
if ((m_children == null) || (m_counter >= m_children.length))
{
diff --git
a/framework/src/main/java/org/apache/felix/framework/cache/DirectoryRevision.java
b/framework/src/main/java/org/apache/felix/framework/cache/DirectoryRevision.java
index f6d01a959d..5f191b8f37 100644
---
a/framework/src/main/java/org/apache/felix/framework/cache/DirectoryRevision.java
+++
b/framework/src/main/java/org/apache/felix/framework/cache/DirectoryRevision.java
@@ -67,20 +67,23 @@ class DirectoryRevision extends BundleArchiveRevision
}
}
- public Map<String, Object> getManifestHeader()
+ @Override
+ public Map<String, Object> getManifestHeader()
throws Exception
{
File manifest = new File(m_refDir, "META-INF/MANIFEST.MF");
return BundleCache.getSecureAction().isFile(manifest) ?
BundleCache.getMainAttributes(new StringMap(),
BundleCache.getSecureAction().getInputStream(manifest), manifest.length()) :
null;
}
- public Content getContent() throws Exception
+ @Override
+ public Content getContent() throws Exception
{
return new DirectoryContent(getLogger(), getConfig(), m_zipFactory,
this, getRevisionRootDir(), m_refDir);
}
- protected void close() throws Exception
+ @Override
+ protected void close() throws Exception
{
// Nothing to close since we don't maintain any state outside
// of the revision directory, which will be automatically deleted
diff --git
a/framework/src/main/java/org/apache/felix/framework/cache/JarContent.java
b/framework/src/main/java/org/apache/felix/framework/cache/JarContent.java
index fd1dda0aa5..19b76819e2 100644
--- a/framework/src/main/java/org/apache/felix/framework/cache/JarContent.java
+++ b/framework/src/main/java/org/apache/felix/framework/cache/JarContent.java
@@ -79,12 +79,14 @@ public class JarContent implements Content
m_isZipFileOwner = (zipFile == null);
}
- protected void finalize()
+ @Override
+ protected void finalize()
{
close();
}
- public void close()
+ @Override
+ public void close()
{
try
{
@@ -101,7 +103,8 @@ public class JarContent implements Content
}
}
- public boolean hasEntry(String name)
+ @Override
+ public boolean hasEntry(String name)
{
try
{
@@ -128,7 +131,8 @@ public class JarContent implements Content
}
}
- public Enumeration<String> getEntries()
+ @Override
+ public Enumeration<String> getEntries()
{
// Wrap entries enumeration to filter non-matching entries.
Enumeration<String> e = m_zipFile.names();
@@ -137,7 +141,8 @@ public class JarContent implements Content
return (e.hasMoreElements()) ? e : null;
}
- public byte[] getEntryAsBytes(String name) throws IllegalStateException
+ @Override
+ public byte[] getEntryAsBytes(String name) throws IllegalStateException
{
// Get the embedded resource.
try
@@ -160,7 +165,8 @@ public class JarContent implements Content
}
}
- public InputStream getEntryAsStream(String name)
+ @Override
+ public InputStream getEntryAsStream(String name)
throws IllegalStateException, IOException
{
// Get the embedded resource.
@@ -187,7 +193,8 @@ public class JarContent implements Content
return is;
}
- public URL getEntryAsURL(String name)
+ @Override
+ public URL getEntryAsURL(String name)
{
if (hasEntry(name))
{
@@ -220,7 +227,8 @@ public class JarContent implements Content
}
}
- public Content getEntryAsContent(String entryName)
+ @Override
+ public Content getEntryAsContent(String entryName)
{
// If the entry name refers to the content itself, then
// just return it immediately.
@@ -303,7 +311,8 @@ public class JarContent implements Content
}
// TODO: SECURITY - This will need to consider security.
- public String getEntryAsNativeLibrary(String entryName)
+ @Override
+ public String getEntryAsNativeLibrary(String entryName)
{
// Return result.
String result = null;
@@ -413,7 +422,8 @@ public class JarContent implements Content
return result;
}
- public String toString()
+ @Override
+ public String toString()
{
return "JAR " + m_file.getPath();
}
@@ -432,7 +442,8 @@ public class JarContent implements Content
m_in = in;
}
- public void run()
+ @Override
+ public void run()
{
try
{
diff --git
a/framework/src/main/java/org/apache/felix/framework/cache/JarRevision.java
b/framework/src/main/java/org/apache/felix/framework/cache/JarRevision.java
index 4ff4e84210..a0ebab3065 100644
--- a/framework/src/main/java/org/apache/felix/framework/cache/JarRevision.java
+++ b/framework/src/main/java/org/apache/felix/framework/cache/JarRevision.java
@@ -95,7 +95,8 @@ class JarRevision extends BundleArchiveRevision
}
}
- public Map<String, Object> getManifestHeader() throws Exception
+ @Override
+ public Map<String, Object> getManifestHeader() throws Exception
{
// Read and parse headers into a case insensitive map of manifest
attributes and return it.
ZipEntry manifestEntry = m_zipFile.getEntry("META-INF/MANIFEST.MF");
@@ -105,13 +106,15 @@ class JarRevision extends BundleArchiveRevision
return manifest;
}
- public Content getContent() throws Exception
+ @Override
+ public Content getContent() throws Exception
{
return new JarContent(getLogger(), getConfig(), m_zipFactory,
this, getRevisionRootDir(), m_bundleFile, m_zipFile);
}
- protected void close() throws Exception
+ @Override
+ protected void close() throws Exception
{
m_zipFile.close();
}
diff --git
a/framework/src/main/java/org/apache/felix/framework/capabilityset/SimpleFilter.java
b/framework/src/main/java/org/apache/felix/framework/capabilityset/SimpleFilter.java
index 439b7307a3..5c77d52fe8 100644
---
a/framework/src/main/java/org/apache/felix/framework/capabilityset/SimpleFilter.java
+++
b/framework/src/main/java/org/apache/felix/framework/capabilityset/SimpleFilter.java
@@ -50,7 +50,8 @@ public class SimpleFilter
m_op = op;
}
- public boolean equals(Object o)
+ @Override
+ public boolean equals(Object o)
{
if (o instanceof SimpleFilter)
{
@@ -62,7 +63,8 @@ public class SimpleFilter
return false;
}
- public int hashCode()
+ @Override
+ public int hashCode()
{
return m_op + Objects.hashCode(m_name) + Objects.hashCode(m_value);
}
@@ -82,7 +84,8 @@ public class SimpleFilter
return m_op;
}
- public String toString()
+ @Override
+ public String toString()
{
String s = null;
switch (m_op)
diff --git
a/framework/src/main/java/org/apache/felix/framework/resolver/CandidateComparator.java
b/framework/src/main/java/org/apache/felix/framework/resolver/CandidateComparator.java
index a6117f1727..3136fce34c 100644
---
a/framework/src/main/java/org/apache/felix/framework/resolver/CandidateComparator.java
+++
b/framework/src/main/java/org/apache/felix/framework/resolver/CandidateComparator.java
@@ -29,7 +29,8 @@ import org.osgi.resource.Capability;
public class CandidateComparator implements Comparator<Capability>
{
- public int compare(Capability cap1, Capability cap2)
+ @Override
+ public int compare(Capability cap1, Capability cap2)
{
// First check resolved state, since resolved capabilities have
priority
// over unresolved ones. Compare in reverse order since we want to sort
diff --git
a/framework/src/main/java/org/apache/felix/framework/util/CompoundEnumeration.java
b/framework/src/main/java/org/apache/felix/framework/util/CompoundEnumeration.java
index 8ea8ffba8d..6ea4c8064e 100644
---
a/framework/src/main/java/org/apache/felix/framework/util/CompoundEnumeration.java
+++
b/framework/src/main/java/org/apache/felix/framework/util/CompoundEnumeration.java
@@ -31,7 +31,8 @@ public class CompoundEnumeration implements Enumeration
m_enums = enums;
}
- public boolean hasMoreElements()
+ @Override
+ public boolean hasMoreElements()
{
// if the current enum is null that means this enum is finished
if (currentEnumeration() == null)
@@ -75,7 +76,8 @@ public class CompoundEnumeration implements Enumeration
return null;
}
- public Object nextElement()
+ @Override
+ public Object nextElement()
{
// ask for the next element of the current enum.
if (currentEnumeration() != null)
diff --git
a/framework/src/main/java/org/apache/felix/framework/util/ListenerInfo.java
b/framework/src/main/java/org/apache/felix/framework/util/ListenerInfo.java
index b7ad8aece9..61c4378b3b 100644
--- a/framework/src/main/java/org/apache/felix/framework/util/ListenerInfo.java
+++ b/framework/src/main/java/org/apache/felix/framework/util/ListenerInfo.java
@@ -67,7 +67,8 @@ public class ListenerInfo implements ListenerHook.ListenerInfo
return m_bundle;
}
- public BundleContext getBundleContext()
+ @Override
+ public BundleContext getBundleContext()
{
return m_context;
}
@@ -87,7 +88,8 @@ public class ListenerInfo implements ListenerHook.ListenerInfo
return m_filter;
}
- public String getFilter()
+ @Override
+ public String getFilter()
{
if (m_filter != null)
{
@@ -101,7 +103,8 @@ public class ListenerInfo implements
ListenerHook.ListenerInfo
return m_acc;
}
- public boolean isRemoved()
+ @Override
+ public boolean isRemoved()
{
return m_removed;
}
diff --git
a/framework/src/main/java/org/apache/felix/framework/util/MapToDictionary.java
b/framework/src/main/java/org/apache/felix/framework/util/MapToDictionary.java
index 7b955c0f6e..f8c848e8a0 100644
---
a/framework/src/main/java/org/apache/felix/framework/util/MapToDictionary.java
+++
b/framework/src/main/java/org/apache/felix/framework/util/MapToDictionary.java
@@ -41,42 +41,50 @@ public class MapToDictionary extends Dictionary
m_map = map;
}
- public Enumeration elements()
+ @Override
+ public Enumeration elements()
{
return Collections.enumeration(m_map.values());
}
- public Object get(Object key)
+ @Override
+ public Object get(Object key)
{
return m_map.get(key);
}
- public boolean isEmpty()
+ @Override
+ public boolean isEmpty()
{
return m_map.isEmpty();
}
- public Enumeration keys()
+ @Override
+ public Enumeration keys()
{
return Collections.enumeration(m_map.keySet());
}
- public Object put(Object key, Object value)
+ @Override
+ public Object put(Object key, Object value)
{
throw new UnsupportedOperationException();
}
- public Object remove(Object key)
+ @Override
+ public Object remove(Object key)
{
throw new UnsupportedOperationException();
}
- public int size()
+ @Override
+ public int size()
{
return m_map.size();
}
- public String toString()
+ @Override
+ public String toString()
{
return m_map.toString();
}
diff --git
a/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
b/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
index 5bfb5357af..2cf558d602 100644
--- a/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
+++ b/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
@@ -112,7 +112,8 @@ public class SecureAction
private static final ThreadLocal m_actions = new ThreadLocal()
{
- public Object initialValue()
+ @Override
+ public Object initialValue()
{
return new Actions();
}
@@ -1909,7 +1910,8 @@ public class SecureAction
m_arg6 = null;
}
- public Object run() throws Exception
+ @Override
+ public Object run() throws Exception
{
int action = m_action;
Object arg1 = m_arg1;
diff --git
a/framework/src/main/java/org/apache/felix/framework/util/SecurityManagerEx.java
b/framework/src/main/java/org/apache/felix/framework/util/SecurityManagerEx.java
index 77264719a7..b15addcce1 100644
---
a/framework/src/main/java/org/apache/felix/framework/util/SecurityManagerEx.java
+++
b/framework/src/main/java/org/apache/felix/framework/util/SecurityManagerEx.java
@@ -29,7 +29,8 @@ public class SecurityManagerEx extends SecurityManager
// In Android apparently getClassContext returns null - we work around
this by returning an empty array in that case.
private static final Class[] EMPTY_CLASSES = new Class[0];
- public Class[] getClassContext()
+ @Override
+ public Class[] getClassContext()
{
Class[] result = super.getClassContext();
return result != null ? result : EMPTY_CLASSES;
diff --git
a/framework/src/main/java/org/apache/felix/framework/util/ShrinkableMap.java
b/framework/src/main/java/org/apache/felix/framework/util/ShrinkableMap.java
index 1a54db1c01..93ecce3865 100644
--- a/framework/src/main/java/org/apache/felix/framework/util/ShrinkableMap.java
+++ b/framework/src/main/java/org/apache/felix/framework/util/ShrinkableMap.java
@@ -31,62 +31,74 @@ public class ShrinkableMap<K, V> implements Map<K, V>
m_delegate = delegate;
}
- public int size()
+ @Override
+ public int size()
{
return m_delegate.size();
}
- public boolean isEmpty()
+ @Override
+ public boolean isEmpty()
{
return m_delegate.isEmpty();
}
- public boolean containsKey(Object o)
+ @Override
+ public boolean containsKey(Object o)
{
return m_delegate.containsKey(o);
}
- public boolean containsValue(Object o)
+ @Override
+ public boolean containsValue(Object o)
{
return m_delegate.containsValue(o);
}
- public V get(Object o)
+ @Override
+ public V get(Object o)
{
return m_delegate.get(o);
}
- public V put(K k, V v)
+ @Override
+ public V put(K k, V v)
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public V remove(Object o)
+ @Override
+ public V remove(Object o)
{
return m_delegate.remove(o);
}
- public void putAll(Map<? extends K, ? extends V> map)
+ @Override
+ public void putAll(Map<? extends K, ? extends V> map)
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public void clear()
+ @Override
+ public void clear()
{
m_delegate.clear();
}
- public Set<K> keySet()
+ @Override
+ public Set<K> keySet()
{
return m_delegate.keySet();
}
- public Collection<V> values()
+ @Override
+ public Collection<V> values()
{
return m_delegate.values();
}
- public Set<Entry<K, V>> entrySet()
+ @Override
+ public Set<Entry<K, V>> entrySet()
{
return m_delegate.entrySet();
}
diff --git
a/framework/src/main/java/org/apache/felix/framework/util/StringComparator.java
b/framework/src/main/java/org/apache/felix/framework/util/StringComparator.java
index fb2f6e1f0e..29277ce0e9 100644
---
a/framework/src/main/java/org/apache/felix/framework/util/StringComparator.java
+++
b/framework/src/main/java/org/apache/felix/framework/util/StringComparator.java
@@ -25,7 +25,8 @@ public class StringComparator implements Comparator<String>
public static final StringComparator COMPARATOR = new StringComparator();
- public int compare(String s1, String s2)
+ @Override
+ public int compare(String s1, String s2)
{
int n1 = s1.length();
int n2 = s2.length();
diff --git
a/framework/src/main/java/org/apache/felix/framework/util/WeakZipFileFactory.java
b/framework/src/main/java/org/apache/felix/framework/util/WeakZipFileFactory.java
index 46eea60fa6..ec6a7a383c 100644
---
a/framework/src/main/java/org/apache/felix/framework/util/WeakZipFileFactory.java
+++
b/framework/src/main/java/org/apache/felix/framework/util/WeakZipFileFactory.java
@@ -643,7 +643,8 @@ public class WeakZipFileFactory
}
}
- public int read() throws IOException
+ @Override
+ public int read() throws IOException
{
ensureInputStreamIsValid();
try
diff --git
a/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibrary.java
b/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibrary.java
index 5960b03a8b..9b07548b0f 100644
---
a/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibrary.java
+++
b/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibrary.java
@@ -137,7 +137,8 @@ public class NativeLibrary
return matched;
}
- public String toString()
+ @Override
+ public String toString()
{
if (m_libraryFile != null)
{
diff --git
a/framework/src/main/java/org/apache/felix/framework/wiring/BundleCapabilityImpl.java
b/framework/src/main/java/org/apache/felix/framework/wiring/BundleCapabilityImpl.java
index 362e4b411d..ff20f5bbe2 100644
---
a/framework/src/main/java/org/apache/felix/framework/wiring/BundleCapabilityImpl.java
+++
b/framework/src/main/java/org/apache/felix/framework/wiring/BundleCapabilityImpl.java
@@ -113,27 +113,32 @@ public class BundleCapabilityImpl implements
BundleCapability
m_mandatory = mandatory;
}
- public BundleRevision getResource()
+ @Override
+ public BundleRevision getResource()
{
return m_revision;
}
- public BundleRevision getRevision()
+ @Override
+ public BundleRevision getRevision()
{
return m_revision;
}
- public String getNamespace()
+ @Override
+ public String getNamespace()
{
return m_namespace;
}
- public Map<String, String> getDirectives()
+ @Override
+ public Map<String, String> getDirectives()
{
return m_dirs;
}
- public Map<String, Object> getAttributes()
+ @Override
+ public Map<String, Object> getAttributes()
{
return m_attrs;
}
diff --git
a/framework/src/main/java/org/apache/felix/framework/wiring/BundleRequirementImpl.java
b/framework/src/main/java/org/apache/felix/framework/wiring/BundleRequirementImpl.java
index a8a111913a..8011055c58 100644
---
a/framework/src/main/java/org/apache/felix/framework/wiring/BundleRequirementImpl.java
+++
b/framework/src/main/java/org/apache/felix/framework/wiring/BundleRequirementImpl.java
@@ -87,32 +87,38 @@ public class BundleRequirementImpl implements
BundleRequirement
this(revision, namespace, dirs, Collections.emptyMap(),
SimpleFilter.convert(attrs));
}
- public String getNamespace()
+ @Override
+ public String getNamespace()
{
return m_namespace;
}
- public Map<String, String> getDirectives()
+ @Override
+ public Map<String, String> getDirectives()
{
return m_dirs;
}
- public Map<String, Object> getAttributes()
+ @Override
+ public Map<String, Object> getAttributes()
{
return m_attrs;
}
- public BundleRevision getResource()
+ @Override
+ public BundleRevision getResource()
{
return m_revision;
}
- public BundleRevision getRevision()
+ @Override
+ public BundleRevision getRevision()
{
return m_revision;
}
- public boolean matches(BundleCapability cap)
+ @Override
+ public boolean matches(BundleCapability cap)
{
return CapabilitySet.matches(cap, getFilter());
}
diff --git
a/framework/src/main/java/org/apache/felix/framework/wiring/BundleWireImpl.java
b/framework/src/main/java/org/apache/felix/framework/wiring/BundleWireImpl.java
index 89259432d2..8de6fd0b28 100644
---
a/framework/src/main/java/org/apache/felix/framework/wiring/BundleWireImpl.java
+++
b/framework/src/main/java/org/apache/felix/framework/wiring/BundleWireImpl.java
@@ -40,37 +40,44 @@ public class BundleWireImpl implements BundleWire
m_cap = cap;
}
- public BundleRevision getRequirer()
+ @Override
+ public BundleRevision getRequirer()
{
return m_requirer;
}
- public BundleWiring getRequirerWiring()
+ @Override
+ public BundleWiring getRequirerWiring()
{
return m_requirer.getWiring();
}
- public BundleRequirement getRequirement()
+ @Override
+ public BundleRequirement getRequirement()
{
return m_req;
}
- public BundleRevision getProvider()
+ @Override
+ public BundleRevision getProvider()
{
return m_provider;
}
- public BundleWiring getProviderWiring()
+ @Override
+ public BundleWiring getProviderWiring()
{
return m_provider.getWiring();
}
- public BundleCapability getCapability()
+ @Override
+ public BundleCapability getCapability()
{
return m_cap;
}
- public String toString()
+ @Override
+ public String toString()
{
return m_req
+ " -> "
diff --git
a/framework/src/test/java/org/apache/felix/framework/BootLoaderTest.java
b/framework/src/test/java/org/apache/felix/framework/BootLoaderTest.java
index b4c85f4154..31b619cf90 100644
--- a/framework/src/test/java/org/apache/felix/framework/BootLoaderTest.java
+++ b/framework/src/test/java/org/apache/felix/framework/BootLoaderTest.java
@@ -55,7 +55,8 @@ class BootLoaderTest
Map bundle2Classloader = new HashMap()
{
- public Object get(Object o)
+ @Override
+ public Object get(Object o)
{
queriedFor.add(o);
return myClassloader;
@@ -99,7 +100,8 @@ class BootLoaderTest
public static final class CL extends ClassLoader
{
- protected Class findClass(String name) throws ClassNotFoundException
+ @Override
+ protected Class findClass(String name) throws
ClassNotFoundException
{
if (name.equals("boot.test.Test"))
{
diff --git
a/framework/src/test/java/org/apache/felix/framework/BundleWiringImplTest.java
b/framework/src/test/java/org/apache/felix/framework/BundleWiringImplTest.java
index beba3cf35a..8b546a41a7 100644
---
a/framework/src/test/java/org/apache/felix/framework/BundleWiringImplTest.java
+++
b/framework/src/test/java/org/apache/felix/framework/BundleWiringImplTest.java
@@ -708,7 +708,8 @@ public class BundleWiringImplTest
final AtomicInteger loaded = new AtomicInteger();
new Thread() {
- public void run() {
+ @Override
+ public void run() {
try
{
loaded.set(bundleClassLoader.findClass(testClassName2) !=
null ? 1 : 2);
@@ -728,7 +729,8 @@ public class BundleWiringImplTest
final AtomicInteger loaded2 = new AtomicInteger();
new Thread() {
- public void run() {
+ @Override
+ public void run() {
try
{
loaded2.set(bundleClassLoader.findClass(testClassName3) !=
null ? 1 : 2);
@@ -751,7 +753,8 @@ public class BundleWiringImplTest
loaded2.set(0);
Thread tester = new Thread() {
- public void run() {
+ @Override
+ public void run() {
try
{
loaded2.set(bundleClassLoader.findClass(testClassName2) !=
null ? 1 : 2);
@@ -905,7 +908,8 @@ public class BundleWiringImplTest
final AtomicInteger loaded = new AtomicInteger();
new Thread() {
- public void run() {
+ @Override
+ public void run() {
try
{
loaded.set(bundleClassLoader.findClass(testClassName2) !=
null ? 1 : 2);
@@ -925,7 +929,8 @@ public class BundleWiringImplTest
final AtomicInteger loaded2 = new AtomicInteger();
new Thread() {
- public void run() {
+ @Override
+ public void run() {
try
{
loaded2.set(bundleClassLoader.findClass(testClassName3) !=
null ? 1 : 2);
@@ -946,7 +951,8 @@ public class BundleWiringImplTest
final AtomicInteger loaded3 = new AtomicInteger();
Thread tester = new Thread() {
- public void run() {
+ @Override
+ public void run() {
try
{
loaded3.set(bundleClassLoader.findClass(testClassName2) !=
null ? 1 : 2);
diff --git
a/framework/src/test/java/org/apache/felix/framework/ConcurrencyTest.java
b/framework/src/test/java/org/apache/felix/framework/ConcurrencyTest.java
index e8ba85108e..3fe5004881 100644
--- a/framework/src/test/java/org/apache/felix/framework/ConcurrencyTest.java
+++ b/framework/src/test/java/org/apache/felix/framework/ConcurrencyTest.java
@@ -188,7 +188,8 @@ public class ConcurrencyTest
m_registration.unregister();
}
- public Component addingService(ServiceReference<Component> reference)
+ @Override
+ public Component addingService(ServiceReference<Component>
reference)
{
Component service = m_ctx.getService(reference);
String id = (String) reference.getProperty("id");
@@ -204,11 +205,13 @@ public class ConcurrencyTest
return service;
}
- public void modifiedService(ServiceReference<Component> reference,
Component service)
+ @Override
+ public void modifiedService(ServiceReference<Component>
reference, Component service)
{
}
- public void removedService(ServiceReference<Component> reference,
Component service)
+ @Override
+ public void removedService(ServiceReference<Component>
reference, Component service)
{
try
{
@@ -248,7 +251,8 @@ public class ConcurrencyTest
m_thread.interrupt();
}
- public void run()
+ @Override
+ public void run()
{
// Creates all components. Each nth components will depends on the
// nth+1 component. The last component does not depend on another
one.
@@ -292,7 +296,8 @@ public class ConcurrencyTest
final Component component = components.get(i);
TPOOL.execute(new Runnable()
{
- public void run()
+ @Override
+ public void run()
{
try
{
diff --git
a/framework/src/test/java/org/apache/felix/framework/ConcurrentBundleUpdateTest.java
b/framework/src/test/java/org/apache/felix/framework/ConcurrentBundleUpdateTest.java
index 5a6369bfd2..43b4858ad9 100644
---
a/framework/src/test/java/org/apache/felix/framework/ConcurrentBundleUpdateTest.java
+++
b/framework/src/test/java/org/apache/felix/framework/ConcurrentBundleUpdateTest.java
@@ -99,7 +99,8 @@ class ConcurrentBundleUpdateTest
felix.getBundleContext().addBundleListener(listenerStarting);
new Thread()
{
- public void run()
+ @Override
+ public void run()
{
try
{
@@ -121,7 +122,8 @@ class ConcurrentBundleUpdateTest
new Thread()
{
- public void run()
+ @Override
+ public void run()
{
try
{
@@ -257,7 +259,8 @@ class ConcurrentBundleUpdateTest
felix.getBundleContext().addBundleListener(listenerStarting);
new Thread()
{
- public void run()
+ @Override
+ public void run()
{
try
{
diff --git
a/framework/src/test/java/org/apache/felix/framework/ConcurrentClassLoaderTest.java
b/framework/src/test/java/org/apache/felix/framework/ConcurrentClassLoaderTest.java
index 3b6853f119..f5130130e5 100644
---
a/framework/src/test/java/org/apache/felix/framework/ConcurrentClassLoaderTest.java
+++
b/framework/src/test/java/org/apache/felix/framework/ConcurrentClassLoaderTest.java
@@ -65,7 +65,8 @@ class ConcurrentClassLoaderTest
for (int i = 0; i < CONCURRENCY_LEVEL; i++) {
new Thread()
{
- public void run()
+ @Override
+ public void run()
{
try {
latch.countDown();
diff --git
a/framework/src/test/java/org/apache/felix/framework/CycleDetectionWithWovenClassTest.java
b/framework/src/test/java/org/apache/felix/framework/CycleDetectionWithWovenClassTest.java
index 2e54742c40..2d9251797e 100644
---
a/framework/src/test/java/org/apache/felix/framework/CycleDetectionWithWovenClassTest.java
+++
b/framework/src/test/java/org/apache/felix/framework/CycleDetectionWithWovenClassTest.java
@@ -119,7 +119,8 @@ class CycleDetectionWithWovenClassTest {
}
- public void run() {
+ @Override
+ public void run() {
try
{
((Callable<Boolean>)
context.getBundle().loadClass("org.apache.felix.framework.CycleDetectionWithWovenClassTest$Hook").newInstance()).call();
diff --git
a/framework/src/test/java/org/apache/felix/framework/EventDispatcherTest.java
b/framework/src/test/java/org/apache/felix/framework/EventDispatcherTest.java
index bf9bddea70..76e67f8b0c 100644
---
a/framework/src/test/java/org/apache/felix/framework/EventDispatcherTest.java
+++
b/framework/src/test/java/org/apache/felix/framework/EventDispatcherTest.java
@@ -45,14 +45,16 @@ class EventDispatcherTest
final Set calledHooks = new HashSet();
final EventHook eh1 = new EventHook()
{
- public void event(ServiceEvent event, Collection contexts)
+ @Override
+ public void event(ServiceEvent event, Collection
contexts)
{
calledHooks.add(this);
}
};
final EventHook eh2 = new EventHook()
{
- public void event(ServiceEvent event, Collection contexts)
+ @Override
+ public void event(ServiceEvent event, Collection
contexts)
{
calledHooks.add(this);
for (Iterator it = contexts.iterator(); it.hasNext();)
@@ -82,7 +84,8 @@ class EventDispatcherTest
final List fired = Collections.synchronizedList(new ArrayList());
ServiceListener sl1 = new ServiceListener()
{
- public void serviceChanged(ServiceEvent arg0)
+ @Override
+ public void serviceChanged(ServiceEvent arg0)
{
fired.add(this);
}
@@ -91,7 +94,8 @@ class EventDispatcherTest
ServiceListener sl2 = new ServiceListener()
{
- public void serviceChanged(ServiceEvent arg0)
+ @Override
+ public void serviceChanged(ServiceEvent arg0)
{
fired.add(this);
}
@@ -100,7 +104,8 @@ class EventDispatcherTest
ServiceListener sl3 = new ServiceListener()
{
- public void serviceChanged(ServiceEvent arg0)
+ @Override
+ public void serviceChanged(ServiceEvent arg0)
{
fired.add(this);
}
diff --git
a/framework/src/test/java/org/apache/felix/framework/ExtensionManagerTest.java
b/framework/src/test/java/org/apache/felix/framework/ExtensionManagerTest.java
index 89a35cb82c..5d94c041ad 100644
---
a/framework/src/test/java/org/apache/felix/framework/ExtensionManagerTest.java
+++
b/framework/src/test/java/org/apache/felix/framework/ExtensionManagerTest.java
@@ -255,11 +255,13 @@ class ExtensionManagerTest {
private static StringBuilder activatorCalls = new StringBuilder();
public static class TestActivator implements BundleActivator {
- public void start(BundleContext context) throws Exception {
+ @Override
+ public void start(BundleContext context) throws Exception {
activatorCalls.append("start");
}
- public void stop(BundleContext context) throws Exception {
+ @Override
+ public void stop(BundleContext context) throws Exception {
activatorCalls.append("stop");
}
}
diff --git
a/framework/src/test/java/org/apache/felix/framework/ImplicitBootDelegationTest.java
b/framework/src/test/java/org/apache/felix/framework/ImplicitBootDelegationTest.java
index 984ccdf79c..0d02b48642 100644
---
a/framework/src/test/java/org/apache/felix/framework/ImplicitBootDelegationTest.java
+++
b/framework/src/test/java/org/apache/felix/framework/ImplicitBootDelegationTest.java
@@ -154,6 +154,7 @@ class ImplicitBootDelegationTest {
}
+ @Override
public void run() {
Object service =
context.getService(context.getServiceReference(
"org.apache.felix.framework.ImplicitBootDelegationTest$TestClass"));
@@ -245,6 +246,7 @@ class ImplicitBootDelegationTest {
public void stop(BundleContext context) throws Exception {
}
+ @Override
public void run()
{
new TestClass();
diff --git
a/framework/src/test/java/org/apache/felix/framework/RequirementsCapabilitiesTest.java
b/framework/src/test/java/org/apache/felix/framework/RequirementsCapabilitiesTest.java
index 84d5fd2eff..14de6fc6c3 100644
---
a/framework/src/test/java/org/apache/felix/framework/RequirementsCapabilitiesTest.java
+++
b/framework/src/test/java/org/apache/felix/framework/RequirementsCapabilitiesTest.java
@@ -262,22 +262,26 @@ class RequirementsCapabilitiesTest
directives = dirs;
}
- public String getNamespace()
+ @Override
+ public String getNamespace()
{
return namespace;
}
- public Map<String, Object> getAttributes()
+ @Override
+ public Map<String, Object> getAttributes()
{
return attributes;
}
- public Map<String, String> getDirectives()
+ @Override
+ public Map<String, String> getDirectives()
{
return directives;
}
- public Resource getResource()
+ @Override
+ public Resource getResource()
{
return null;
}
diff --git
a/framework/src/test/java/org/apache/felix/framework/StartStopBundleTest.java
b/framework/src/test/java/org/apache/felix/framework/StartStopBundleTest.java
index c112a8b62c..e77a95cdc6 100644
---
a/framework/src/test/java/org/apache/felix/framework/StartStopBundleTest.java
+++
b/framework/src/test/java/org/apache/felix/framework/StartStopBundleTest.java
@@ -77,7 +77,8 @@ public class StartStopBundleTest
new Thread()
{
- public void run()
+ @Override
+ public void run()
{
try
{
@@ -101,7 +102,8 @@ public class StartStopBundleTest
new Thread()
{
- public void run()
+ @Override
+ public void run()
{
try
{
@@ -162,12 +164,14 @@ public class StartStopBundleTest
}
public static class TestBundleActivator implements BundleActivator
{
- public void start(BundleContext context) throws Exception
+ @Override
+ public void start(BundleContext context) throws Exception
{
Thread.sleep(DELAY);
}
- public void stop(BundleContext context) throws Exception
+ @Override
+ public void stop(BundleContext context) throws Exception
{
Thread.sleep(DELAY);
}
diff --git
a/framework/src/test/java/org/apache/felix/framework/URLHandlersTest.java
b/framework/src/test/java/org/apache/felix/framework/URLHandlersTest.java
index 9010fe2c71..7afc88e60b 100644
--- a/framework/src/test/java/org/apache/felix/framework/URLHandlersTest.java
+++ b/framework/src/test/java/org/apache/felix/framework/URLHandlersTest.java
@@ -241,53 +241,63 @@ public class URLHandlersTest
private volatile ServiceRegistration m_reg = null;
- public URLConnection openConnection(URL u) throws IOException
+ @Override
+ public URLConnection openConnection(URL u) throws IOException
{
return new UC(u);//throw new UnsupportedOperationException("Not
supported yet.");
}
- public void parseURL(URLStreamHandlerSetter realHandler, URL u, String
spec, int start, int limit)
+ @Override
+ public void parseURL(URLStreamHandlerSetter realHandler, URL u,
String spec, int start, int limit)
{
realHandler.setURL(u, spec, spec, start, spec, spec, spec, spec,
spec);
//throw new UnsupportedOperationException("Not supported yet.");
}
- public String toExternalForm(URL u)
+ @Override
+ public String toExternalForm(URL u)
{
return u.toString();//throw new UnsupportedOperationException("Not
supported yet.");
}
- public boolean equals(URL u1, URL u2)
+ @Override
+ public boolean equals(URL u1, URL u2)
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public int getDefaultPort()
+ @Override
+ public int getDefaultPort()
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public InetAddress getHostAddress(URL u)
+ @Override
+ public InetAddress getHostAddress(URL u)
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public int hashCode(URL u)
+ @Override
+ public int hashCode(URL u)
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public boolean hostsEqual(URL u1, URL u2)
+ @Override
+ public boolean hostsEqual(URL u1, URL u2)
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public boolean sameFile(URL u1, URL u2)
+ @Override
+ public boolean sameFile(URL u1, URL u2)
{
throw new UnsupportedOperationException("Not supported yet.");
}
- public void start(final BundleContext context) throws Exception
+ @Override
+ public void start(final BundleContext context) throws Exception
{
try
{
@@ -464,7 +474,8 @@ public class URLHandlersTest
return f;
}
- public void stop(BundleContext context) throws Exception
+ @Override
+ public void stop(BundleContext context) throws Exception
{
if (m_reg != null)
{
